From a997440e3d12412a14626e8a353ca68b93caa4a1 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Tue, 8 Sep 2020 13:04:26 -0400
Subject: [PATCH] Added SP ACS URL to Config Screen (#920)

---
 .../src/Portal/Models/SsoConfigDataViewModel.cs             | 3 +++
 bitwarden_license/src/Portal/Views/Sso/Index.cshtml         | 6 ++++++
 src/Core/Models/Data/SsoConfigurationData.cs                | 5 +++++
 src/Core/Resources/SharedResources.en.resx                  | 3 +++
 4 files changed, 17 insertions(+)

diff --git a/bitwarden_license/src/Portal/Models/SsoConfigDataViewModel.cs b/bitwarden_license/src/Portal/Models/SsoConfigDataViewModel.cs
index 0b5c93f7aa..bb7bdb6792 100644
--- a/bitwarden_license/src/Portal/Models/SsoConfigDataViewModel.cs
+++ b/bitwarden_license/src/Portal/Models/SsoConfigDataViewModel.cs
@@ -24,6 +24,7 @@ namespace Bit.Portal.Models
             MetadataAddress = configurationData.MetadataAddress;
             GetClaimsFromUserInfoEndpoint = configurationData.GetClaimsFromUserInfoEndpoint;
             SpEntityId = configurationData.BuildSaml2ModulePath(globalSettings.BaseServiceUri.Sso);
+            SpAcsUrl = configurationData.BuildSaml2AcsUrl(globalSettings.BaseServiceUri.Sso);
             IdpEntityId = configurationData.IdpEntityId;
             IdpBindingType = configurationData.IdpBindingType;
             IdpSingleSignOnServiceUrl = configurationData.IdpSingleSignOnServiceUrl;
@@ -64,6 +65,8 @@ namespace Bit.Portal.Models
         // SAML2 SP
         [Display(Name = "SpEntityId")]
         public string SpEntityId { get; set; }
+        [Display(Name = "SpAcsUrl")]
+        public string SpAcsUrl { get; set; }
         [Display(Name = "NameIdFormat")]
         public Saml2NameIdFormat SpNameIdFormat { get; set; }
         [Display(Name = "OutboundSigningAlgorithm")]
diff --git a/bitwarden_license/src/Portal/Views/Sso/Index.cshtml b/bitwarden_license/src/Portal/Views/Sso/Index.cshtml
index d1c4a92aac..97e2fc1ec5 100644
--- a/bitwarden_license/src/Portal/Views/Sso/Index.cshtml
+++ b/bitwarden_license/src/Portal/Views/Sso/Index.cshtml
@@ -113,6 +113,12 @@
                     <input asp-for="Data.SpEntityId" class="form-control" readonly>
                 </div>
             </div>
+            <div class="row">
+                <div class="col-6 form-group">
+                    <label asp-for="Data.SpAcsUrl">@i18nService.T("SpAcsUrl")</label>
+                    <input asp-for="Data.SpAcsUrl" class="form-control" readonly>
+                </div>
+            </div>
             <div class="row">
                 <div class="col-6 form-group">
                     <label asp-for="Data.SpNameIdFormat">@i18nService.T("NameIdFormat")</label>
diff --git a/src/Core/Models/Data/SsoConfigurationData.cs b/src/Core/Models/Data/SsoConfigurationData.cs
index a07e54faf6..fe6e961034 100644
--- a/src/Core/Models/Data/SsoConfigurationData.cs
+++ b/src/Core/Models/Data/SsoConfigurationData.cs
@@ -53,6 +53,11 @@ namespace Bit.Core.Models.Data
             return BuildSsoUrl(_saml2ModulePath, ssoUri);
         }
 
+        public string BuildSaml2AcsUrl(string ssoUri = null)
+        {
+            return string.Concat(BuildSaml2ModulePath(ssoUri), "/Acs");
+        }
+
         private string BuildSsoUrl(string relativePath, string ssoUri)
         {
             if (string.IsNullOrWhiteSpace(ssoUri) ||
diff --git a/src/Core/Resources/SharedResources.en.resx b/src/Core/Resources/SharedResources.en.resx
index 41d3e1945b..7acb16b51b 100644
--- a/src/Core/Resources/SharedResources.en.resx
+++ b/src/Core/Resources/SharedResources.en.resx
@@ -265,6 +265,9 @@
   <data name="SpEntityId" xml:space="preserve">
     <value>SP Entity ID</value>
   </data>
+  <data name="SpAcsUrl" xml:space="preserve">
+    <value>Assertion Consumer Service (ACS) URL</value>
+  </data>
   <data name="SpValidateCertificates" xml:space="preserve">
     <value>Validate Certificates</value>
   </data>