Con 3871 link term and condition from footer (#2199)

* Terms And Conditions Footer Link * Terms And Conditions Link * Update HtmlHelperExtensions.cs * Update UI Nuget Co-authored-by: Paul Howes <[email protected]>
SkillsFundingAgency · Aug 31, 2021 · 4b8ab1a · 4b8ab1a
1 parent b14a909
commit 4b8ab1a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 5 deletions.
diff --git a/src/SFA.DAS.EAS.Web/Startup.cs b/src/SFA.DAS.EAS.Web/Startup.cs
@@ -71,6 +71,7 @@ public void Configuration(IAppBuilder app)
             JwtSecurityTokenHandler.InboundClaimTypeMap = new Dictionary<string, string>();
             UserLinksViewModel.ChangePasswordLink = $"{constants.ChangePasswordLink()}{urlHelper.Encode("https://" + config.DashboardUrl + "/service/password/change")}";
             UserLinksViewModel.ChangeEmailLink = $"{constants.ChangeEmailLink()}{urlHelper.Encode("https://" + config.DashboardUrl + "/service/email/change")}";
+            UserLinksViewModel.TermsAndConditionsLink = constants.TermsAndConditionsLink();
         }
 
         private static Func<X509Certificate2> GetSigningCertificate(bool useCertificate)
@@ -149,5 +150,6 @@ public Constants(IdentityServerConfiguration configuration)
         public string RequiresVerification() => _baseUrl + "requires_verification";
         public string TokenEndpoint() => $"{_configuration.BaseAddress}{_configuration.TokenEndpoint}";
         public string UserInfoEndpoint() => $"{_configuration.BaseAddress}{_configuration.UserInfoEndpoint}";
+        public string TermsAndConditionsLink() => $"{_configuration.BaseAddress.Replace("/identity", "")}{_configuration.TermsAndConditionsLink}";
     }
 }
diff --git a/src/SFA.DAS.EAS.Web/ViewModels/UserLinksViewModel.cs b/src/SFA.DAS.EAS.Web/ViewModels/UserLinksViewModel.cs
@@ -4,5 +4,6 @@ public static class UserLinksViewModel
     {
         public static string ChangePasswordLink { get; set; }
         public static string ChangeEmailLink { get; set; }
+        public static string TermsAndConditionsLink { get; set; }
     }
 }
diff --git a/src/SFA.DAS.EAS.Web/Views/Shared/_Layout.cshtml b/src/SFA.DAS.EAS.Web/Views/Shared/_Layout.cshtml
@@ -199,6 +199,7 @@
                         <li><a href="@Url.Action("Help", "Home")" target="_blank">Help</a></li>
                         <li><a href="https://www.smartsurvey.co.uk/s/apprenticeshipservicefeedback/" target="_blank">Feedback</a></li>
                         <li><a href="@Url.Action("Privacy", "Home")">Privacy and cookies</a></li>
+                        <li> <a  target="_blank"  href="@UserLinksViewModel.TermsAndConditionsLink">Terms and conditions</a></li>
                         <li>Built by the <a href="http://gov.uk/esfa" target="_blank">Education and Skills Funding Agency</a></li>
                     </ul>
                     <div class="open-government-licence">

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Extensions/HtmlHelperExtensions.cs b/src/SFA.DAS.EmployerAccounts.Web/Extensions/HtmlHelperExtensions.cs
@@ -129,7 +129,8 @@ public static IFooterViewModel GetFooterViewModel(this HtmlHelper html, bool use
 
             return new FooterViewModel(new FooterConfiguration
             {
-                ManageApprenticeshipsBaseUrl = configuration.EmployerAccountsBaseUrl
+                ManageApprenticeshipsBaseUrl = configuration.EmployerAccountsBaseUrl,
+                AuthenticationAuthorityUrl = configuration.Identity.BaseAddress
             },
             new UserContext
             {

diff --git a/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj b/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj
@@ -138,7 +138,7 @@
       <Version>1.0.16</Version>
     </PackageReference>
     <PackageReference Include="SFA.DAS.MA.Shared.UI">
-      <Version>1.1.66</Version>
+      <Version>1.1.72</Version>
     </PackageReference>
     <PackageReference Include="SFA.DAS.NLog.Logger" Version="1.2.1" />
     <PackageReference Include="SFA.DAS.NLog.Targets.Redis" Version="1.2.1" />
@@ -942,4 +942,4 @@
   </Target>
   <Target Name="AfterBuild">
   </Target> -->
-</Project>
+</Project>
diff --git a/...FA.DAS.EmployerApprenticeshipsService.Domain/Configuration/IdentityServerConfiguration.cs b/...FA.DAS.EmployerApprenticeshipsService.Domain/Configuration/IdentityServerConfiguration.cs
@@ -17,5 +17,6 @@ public class IdentityServerConfiguration
         public string ChangeEmailLink { get; set; }
         public string RegisterLink { get; set; }
         public string AccountActivationUrl { get; set; }
+        public string TermsAndConditionsLink { get; set; }
     }
 }
diff --git a/src/SFA.DAS.EmployerFinance.Web/SFA.DAS.EmployerFinance.Web.csproj b/src/SFA.DAS.EmployerFinance.Web/SFA.DAS.EmployerFinance.Web.csproj
@@ -97,7 +97,7 @@
       <Version>1.0.5</Version>
     </PackageReference>
     <PackageReference Include="SFA.DAS.MA.Shared.UI">
-      <Version>1.1.66</Version>
+      <Version>1.1.72</Version>
     </PackageReference>
     <PackageReference Include="SFA.DAS.NLog.Logger" Version="1.2.1" />
     <PackageReference Include="SFA.DAS.NLog.Targets.Redis" Version="1.2.1" />
@@ -683,4 +683,4 @@
   </Target>
   <Target Name="AfterBuild">
   </Target> -->
-</Project>
+</Project>