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 @@ +
+
+ + +
+
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 @@ SP Entity ID + + Assertion Consumer Service (ACS) URL + Validate Certificates