feat: Adjust Organization support to latest upstream changes

sventorben · Jun 10, 2024 · 5022bab · 5022bab
1 parent 22695bf
commit 5022bab
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/...ntorben/keycloak/authentication/hidpd/discovery/orgs/domainhint/OrgsDomainDiscoverer.java b/...ntorben/keycloak/authentication/hidpd/discovery/orgs/domainhint/OrgsDomainDiscoverer.java
@@ -9,6 +9,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 final class OrgsDomainDiscoverer implements HomeIdpDiscoverer {
 
@@ -29,10 +30,9 @@ public List<IdentityProviderModel> discoverForUser(AuthenticationFlowContext con
 
         OrganizationModel org = orgProvider.getByDomainName(domain);
         if (org != null) {
-            IdentityProviderModel idp = org.getIdentityProvider();
-            if (idp != null) {
-                return Collections.singletonList(idp);
-            }
+            return org.getIdentityProviders()
+                .filter(IdentityProviderModel::isEnabled)
+                .collect(Collectors.toList());
         }
         return Collections.emptyList();
     }

diff --git a/.../sventorben/keycloak/authentication/hidpd/discovery/orgs/email/OrgsIdentityProviders.java b/.../sventorben/keycloak/authentication/hidpd/discovery/orgs/email/OrgsIdentityProviders.java
@@ -4,13 +4,15 @@
 import de.sventorben.keycloak.authentication.hidpd.discovery.email.IdentityProviders;
 import org.keycloak.authentication.AuthenticationFlowContext;
 import org.keycloak.models.IdentityProviderModel;
+import org.keycloak.models.OrganizationDomainModel;
 import org.keycloak.models.OrganizationModel;
 import org.keycloak.models.UserModel;
 import org.keycloak.organization.OrganizationProvider;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 final class OrgsIdentityProviders implements IdentityProviders {
 
@@ -22,11 +24,10 @@ public List<IdentityProviderModel> candidatesForHomeIdp(AuthenticationFlowContex
         }
         if (orgProvider.isEnabled()) {
             OrganizationModel org = orgProvider.getByMember(user);
-            if (org != null) {
-                IdentityProviderModel orgIdp = org.getIdentityProvider();
-                if (orgIdp != null) {
-                    return Collections.singletonList(orgIdp);
-                }
+            if (org != null && org.isEnabled()) {
+                return org.getIdentityProviders()
+                    .filter(IdentityProviderModel::isEnabled)
+                    .collect(Collectors.toList());
             }
         } else {
             // TODO: Log a warning
@@ -39,18 +40,21 @@ public List<IdentityProviderModel> withMatchingDomain(AuthenticationFlowContext
         OrganizationProvider orgProvider = context.getSession().getProvider(OrganizationProvider.class);
         if (orgProvider.isEnabled()) {
             OrganizationModel org = orgProvider.getByDomainName(domain.getRawValue());
-            if (org != null) {
-                IdentityProviderModel orgIdp = org.getIdentityProvider();
-                if (orgIdp != null) {
-                    List<IdentityProviderModel> result = new ArrayList<>(candidates);
-                    result.add(orgIdp);
-                    return result;
+            if (org != null && org.isEnabled()) {
+                boolean verified = org.getDomains()
+                    .filter(it -> domain.getRawValue().equalsIgnoreCase(it.getName()))
+                    .anyMatch(OrganizationDomainModel::getVerified);
+                if (verified) {
+                    return org.getIdentityProviders()
+                        .filter(IdentityProviderModel::isEnabled)
+                        // TODO: Filter based on domain - should only be one
+                        .collect(Collectors.toList());
                 }
             }
         } else {
             // TODO: Log a warning
         }
-        return candidates;
+        return Collections.emptyList();
     }
 
 }