Removed /

SkillsFundingAgency · Oct 8, 2021 · 459b582 · 459b582
1 parent b192b51
commit 459b582
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Extensions/HtmlHelperExtensions.cs b/src/SFA.DAS.EmployerAccounts.Web/Extensions/HtmlHelperExtensions.cs
@@ -85,6 +85,7 @@ public static string GetZenDeskCobrowsingSnippetKey(this HtmlHelper html)
         public static IHeaderViewModel GetHeaderViewModel(this HtmlHelper html, bool useLegacyStyles = false)
         {
             var configuration = DependencyResolver.Current.GetService<EmployerAccountsConfiguration>();
+            var employerAccountsBaseUrl = configuration.EmployerAccountsBaseUrl + (configuration.EmployerAccountsBaseUrl.EndsWith("/") ? "" : "/");
 
             var headerModel = new HeaderViewModel(new HeaderConfiguration
             {
@@ -96,9 +97,9 @@ public static IHeaderViewModel GetHeaderViewModel(this HtmlHelper html, bool use
                 AuthenticationAuthorityUrl = configuration.Identity.BaseAddress,
                 ClientId = configuration.Identity.ClientId,
                 EmployerRecruitBaseUrl = configuration.EmployerRecruitBaseUrl,
-                SignOutUrl = new Uri($"{configuration.EmployerAccountsBaseUrl}/service/signOut"),
-                ChangeEmailReturnUrl = new System.Uri(configuration.EmployerAccountsBaseUrl + "/service/email/change"),
-                ChangePasswordReturnUrl = new System.Uri(configuration.EmployerAccountsBaseUrl + "/service/password/change")
+                SignOutUrl = new Uri($"{employerAccountsBaseUrl}service/signOut"),
+                ChangeEmailReturnUrl = new Uri($"{employerAccountsBaseUrl}service/email/change"),
+                ChangePasswordReturnUrl = new Uri($"{employerAccountsBaseUrl}service/password/change")
             },
             new UserContext
             {

diff --git a/src/SFA.DAS.EmployerFinance.Web/Extensions/HtmlHelperExtensions.cs b/src/SFA.DAS.EmployerFinance.Web/Extensions/HtmlHelperExtensions.cs
@@ -53,7 +53,7 @@ public static string GetZenDeskCobrowsingSnippetKey(this HtmlHelper html)
         public static IHeaderViewModel GetHeaderViewModel(this HtmlHelper html, bool useLegacyStyles = false)
         {
             var configuration = DependencyResolver.Current.GetService<EmployerFinanceConfiguration>();
-
+            var employerFinanceBaseUrl = configuration.EmployerFinanceBaseUrl + (configuration.EmployerFinanceBaseUrl.EndsWith("/") ? "" : "/");
             var requestUrl = html.ViewContext.HttpContext.Request.Url;
 
             var headerModel = new HeaderViewModel(new HeaderConfiguration
@@ -65,7 +65,7 @@ public static IHeaderViewModel GetHeaderViewModel(this HtmlHelper html, bool use
                 AuthenticationAuthorityUrl = configuration.Identity.BaseAddress,
                 ClientId = configuration.Identity.ClientId,
                 EmployerRecruitBaseUrl = configuration.EmployerRecruitBaseUrl,
-                SignOutUrl = new Uri($"{configuration.EmployerFinanceBaseUrl}/service/signOut/"),
+                SignOutUrl = new Uri($"{employerFinanceBaseUrl}service/signOut"),
                 ChangeEmailReturnUrl = requestUrl,
                 ChangePasswordReturnUrl = requestUrl
             },