Use cryptomator client id in staging keycloak as well (#10). Use vaul…

…t instead of vault user attribute (#10).
shift7-ch · Aug 4, 2023 · ed43913 · ed43913
1 parent 8278614
commit ed43913
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/backend/src/main/java/org/cryptomator/hub/cipherduck/KeycloakGrantAccessToVault.java b/backend/src/main/java/org/cryptomator/hub/cipherduck/KeycloakGrantAccessToVault.java
@@ -27,7 +27,7 @@ public static void keycloakGrantAccessToVault(final SyncerConfig syncerConfig, f
             if(attributes == null){
                 attributes = new HashMap<>();
             }
-            attributes.put("vaults", Stream.concat(attributes.getOrDefault("vaults", Collections.EMPTY_LIST).stream(), Stream.of(vaultId)).toList());
+            attributes.put("vault", Stream.concat(attributes.getOrDefault("vault", Collections.EMPTY_LIST).stream(), Stream.of(vaultId)).toList());
             ur.setAttributes(attributes);
             userResource.update(ur);
         }

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
@@ -42,8 +42,6 @@ quarkus.http.access-log.enabled=true
 quarkus.oidc.application-type=service
 quarkus.oidc.client-id=cryptomatorhub
 hub.keycloak.oidc.cryptomator-client-id=cryptomator
-# TODO https://github.com/chenkins/cipherduck-hub/issues/4 should we rather use hub.keycloak.oidc.cryptomator-client-id or add a new one for cipherduck if?
-%cipherduck-staging.quarkus.oidc.client-id=cipherduckclient
 
 
 

diff --git a/backend/src/main/resources/dev-realm.json b/backend/src/main/resources/dev-realm.json
@@ -80,23 +80,6 @@
       "realmRoles": [
         "syncer"
       ]
-    },
-    {
-      "username": "user001",
-      "email": "user001@localhost",
-      "enabled": true,
-      "attributes": {
-        "picture": "https://cryptomator.org/img/logo.svg"
-      },
-      "credentials": [
-        {
-          "type": "password",
-          "value": "1234"
-        }
-      ],
-      "realmRoles": [
-        "user"
-      ]
     }
   ],
   "scopeMappings": [
@@ -166,7 +149,7 @@
             "aggregate.attrs": "true",
             "userinfo.token.claim": "false",
             "multivalued": "true",
-            "user.attribute": "vaults",
+            "user.attribute": "vault",
             "id.token.claim": "true",
             "access.token.claim": "true",
             "claim.name": "aud"
@@ -231,7 +214,7 @@
             "aggregate.attrs": "true",
             "userinfo.token.claim": "false",
             "multivalued": "true",
-            "user.attribute": "vaults",
+            "user.attribute": "vault",
             "id.token.claim": "true",
             "access.token.claim": "true",
             "claim.name": "aud"