Made google version 2 optional

client/src/main/java/dk/acto/fafnir/api/service/AdministrationService.java

@@ -101,10 +101,6 @@ public interface AdministrationService {
      */
     OrganisationData readOrganisation(TenantIdentifier identifier);
 
-
-
-    Optional<OrganisationData> readOrganisationDoesNotThrow(TenantIdentifier identifier);
-
     /**
      * Updates an organisation. Fails if organisation does not exist.
      *

client/src/main/java/dk/acto/fafnir/api/service/hazelcast/HazelcastAdministrationService.java

@@ -133,14 +133,6 @@ public OrganisationData readOrganisation(TenantIdentifier identifier) {
                 .findAny()
                 .orElseThrow(NoSuchOrganisation::new);
     }
-    @Override
-    public Optional<OrganisationData> readOrganisationDoesNotThrow(TenantIdentifier identifier) {
-        IMap<String, OrganisationData> orgMap = hazelcastInstance.getMap(hazelcastConf.getPrefix() + ORG_POSTFIX);
-        return orgMap.values()
-            .stream()
-            .filter(entry -> identifier.matches(entry.getProviderConfiguration()))
-            .findAny();
-    }
 
 
     @Override

docker-compose.yaml

@@ -17,6 +17,7 @@ services:
       - MITID_AUTHORITY_URL=https://brokertest.signaturgruppen.dk/op
       - KEYSTORE_PASS=fafnir
       - KEY_PASS=fafnir
+      - GOOGLE_VERSION2_ENABLED=true
     volumes:
       - ./fafnir-storage:/var/lib/fafnir
 

sso/src/main/java/dk/acto/fafnir/sso/provider/GoogleProvider.java

@@ -31,6 +31,8 @@ public String authenticate() {
 
     @Override
     public AuthenticationResult callback(TokenCredentials data) {
+        boolean version2Enabled = Boolean.parseBoolean(System.getenv("GOOGLE_VERSION2_ENABLED"));
+
         var token = Try.of(() -> googleOauth.getAccessToken(data.getCode()))
             .onFailure(x -> log.error("Authentication failed", x))
             .getOrNull();
@@ -50,26 +52,25 @@ public AuthenticationResult callback(TokenCredentials data) {
             .name(displayName)
             .build();
 
-        var orgOptional = administrationService.readOrganisationDoesNotThrow(
-            test -> getMetaData().getProviderId().equals(test.getProviderId()) &&
-                (providerValue.equals(test.getValues().get("Organisation Domain")) || "true".equals(test.getValues().get("Catchall Organisation")))
-        );
-
-        if (orgOptional.isPresent()) {
-            var orgActual = orgOptional.get();
-            var claimsActual = ClaimData.empty();
-            var jwt = tokenFactory.generateToken(subjectActual, orgActual, claimsActual, getMetaData(), providerValue);
-            return AuthenticationResult.success(jwt);
-        } else {
+        if (version2Enabled) {
             var fafnirUser = FafnirUser.builder()
                 .data(subjectActual)
                 .organisationId(providerValue)
-                .organisationName(displayName)
                 .provider("google")
                 .build();
 
             var jwt = tokenFactory.generateToken(fafnirUser);
             return AuthenticationResult.success(jwt);
+
+        } else {
+            var orgActual = administrationService.readOrganisation(
+                test -> getMetaData().getProviderId().equals(test.getProviderId()) &&
+                    (providerValue.equals(test.getValues().get("Organisation Domain")) || "true".equals(test.getValues().get("Catchall Organisation")))
+            );
+            var claimsActual = ClaimData.empty();
+            var jwt = tokenFactory.generateToken(subjectActual, orgActual, claimsActual, getMetaData(), providerValue);
+
+            return AuthenticationResult.success(jwt);
         }
     }