BED-4921 fix: missing entity id for saml provider (#935)

SpecterOps · Nov 6, 2024 · 71e49c8 · 71e49c8
1 parent 36170aa
commit 71e49c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cmd/api/src/api/v2/auth/saml.go b/cmd/api/src/api/v2/auth/saml.go
@@ -56,6 +56,8 @@ func serviceProviderFactory(ctx context.Context, cfg config.Configuration, samlP
 	} else if idpMetadata, err := samlsp.ParseMetadata(samlProvider.MetadataXML); err != nil {
 		return bhsaml.ServiceProvider{}, fmt.Errorf("failed to parse metadata XML for service provider %s: %w", samlProvider.Name, err)
 	} else {
+		// This is required to populate the samlProvider.ServiceProviderIssuerURI
+		samlProvider = bhsaml.FormatSAMLProviderURLs(ctx, samlProvider)[0]
 		return bhsaml.NewServiceProvider(samlProvider, bhsaml.FormatServiceProviderURLs(*bhCtx.Get(ctx).Host, samlProvider.Name), samlsp.Options{
 			EntityID:          samlProvider.ServiceProviderIssuerURI.String(),
 			URL:               samlProvider.ServiceProviderIssuerURI.AsURL(),

diff --git a/cmd/ui/src/views/Login.tsx b/cmd/ui/src/views/Login.tsx
@@ -103,7 +103,7 @@ const Login: React.FC = () => {
         );
     }
 
-    if (listSSOProvidersQuery.isError || listSSOProvidersQuery.data?.length === 0) {
+    if (listSSOProvidersQuery.isError || !listSSOProvidersQuery.data) {
         return (
             <LoginPage>
                 <LoginForm onSubmit={handleSubmitLoginForm} loading={authState.loginLoading} />