Cleanup

thomasdarimont · May 10, 2024 · 13fe20d · 13fe20d
1 parent ccaae89
commit 13fe20d
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 35 deletions.
diff --git a/deployments/local/dev/docker-compose-extensions-classes.yml b/deployments/local/dev/docker-compose-extensions-classes.yml
diff --git a/deployments/local/dev/docker-compose-extensions-jar.yml b/deployments/local/dev/docker-compose-extensions-jar.yml
diff --git a/deployments/local/dev/docker-compose-graylog.yml b/deployments/local/dev/docker-compose-graylog.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   # MongoDB: https://hub.docker.com/_/mongo/
   acme-graylog-mongo:

diff --git a/deployments/local/dev/docker-compose-openldap.yml b/deployments/local/dev/docker-compose-openldap.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   openldap:
     image: osixia/openldap:1.5.0

diff --git a/...java/com/github/thomasdarimont/keycloak/custom/endpoints/CustomAdminResourceProvider.java b/...java/com/github/thomasdarimont/keycloak/custom/endpoints/CustomAdminResourceProvider.java
@@ -3,6 +3,7 @@
 import com.github.thomasdarimont.keycloak.custom.endpoints.admin.AdminSettingsResource;
 import com.github.thomasdarimont.keycloak.custom.endpoints.admin.CustomDemoAdminResource;
 import com.google.auto.service.AutoService;
+import lombok.extern.jbosslog.JBossLog;
 import org.keycloak.Config;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
@@ -12,6 +13,7 @@
 import org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory;
 import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator;
 
+@JBossLog
 public class CustomAdminResourceProvider implements AdminRealmResourceProvider {
 
     public static final String ID = "custom-admin-resources";
@@ -48,7 +50,7 @@ public void init(Config.Scope config) {
 
         @Override
         public void postInit(KeycloakSessionFactory factory) {
-
+            log.info("### Register custom admin resources");
         }
 
         @Override

diff --git a/...ons/src/main/java/com/github/thomasdarimont/keycloak/custom/endpoints/CustomResource.java b/...ons/src/main/java/com/github/thomasdarimont/keycloak/custom/endpoints/CustomResource.java
@@ -9,7 +9,6 @@
 import com.github.thomasdarimont.keycloak.custom.endpoints.migration.UserImportMigrationResource;
 import com.github.thomasdarimont.keycloak.custom.endpoints.offline.OfflineSessionPropagationResource;
 import com.github.thomasdarimont.keycloak.custom.endpoints.profile.UserProfileResource;
-//import com.github.thomasdarimont.keycloak.custom.endpoints.provisioning.BulkUserImportResource;
 import com.github.thomasdarimont.keycloak.custom.endpoints.settings.UserSettingsResource;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
@@ -126,10 +125,4 @@ public TokenMigrationResource tokenMigration() {
     public UserImportMigrationResource userMigration() {
         return new UserImportMigrationResource(session, token);
     }
-
-//    @Path("admin/userimport")
-//    public BulkUserImportResource bulkUserImport() {
-//        return new BulkUserImportResource(session);
-//    }
-
 }
diff --git a/...va/com/github/thomasdarimont/keycloak/custom/endpoints/admin/CustomDemoAdminResource.java b/...va/com/github/thomasdarimont/keycloak/custom/endpoints/admin/CustomDemoAdminResource.java
@@ -29,7 +29,8 @@ public CustomDemoAdminResource(KeycloakSession session, RealmModel realm, AdminP
     }
 
     /**
-     * http://localhost:8080/auth/realms/acme-token-migration/custom-admin-resources/example
+     * http://localhost:8080/auth/realms/acme-workshop/custom-admin-resources/example
+     *
      * @return
      */
     @Path("/example")

diff --git a/keycloak/http-tests/http-client.env.json b/keycloak/http-tests/http-client.env.json
@@ -49,6 +49,7 @@
 
   "acme-workshop": {
     "ISSUER": "https://id.acme.test:8443/auth/realms/acme-workshop",
+    "ADMIN_ENDPOINT_BASE": "https://id.acme.test:8443/auth/admin/realms/acme-workshop",
     "ADMIN_USERNAME": "admin",
     "ADMIN_PASSWORD": "admin",
     "USER_USERNAME": "tester",

diff --git a/keycloak/themes/minimal/login/theme.properties b/keycloak/themes/minimal/login/theme.properties
@@ -2,5 +2,3 @@ parent=keycloak
 import=common/keycloak
 styles=css/login.css css/custom-login.css
 scripts=js/custom-login.js
-
-kcFormGroupClass=custom-form-group
diff --git a/start.java b/start.java
@@ -167,16 +167,16 @@ public static void main(String[] args) throws Exception {
             commandLine.add("deployments/local/dev/docker-compose-opa.yml");
         }
 
-        if (EXTENSIONS_OPT_CLASSES.equals(extension)) {
-            commandLine.add("--file");
-            commandLine.add("deployments/local/dev/docker-compose-extensions-classes.yml");
-        } else if (EXTENSIONS_OPT_JAR.equals(extension)) {
-            commandLine.add("--file");
-            commandLine.add("deployments/local/dev/docker-compose-extensions-jar.yml");
-        } else {
-            System.err.printf("Unkown extension include option %s, valid ones are %s and %s%n", extension, EXTENSIONS_OPT_CLASSES, EXTENSIONS_OPT_JAR);
-            System.exit(-1);
-        }
+//        if (EXTENSIONS_OPT_CLASSES.equals(extension)) {
+//            commandLine.add("--file");
+//            commandLine.add("deployments/local/dev/docker-compose-extensions-classes.yml");
+//        } else if (EXTENSIONS_OPT_JAR.equals(extension)) {
+//            commandLine.add("--file");
+//            commandLine.add("deployments/local/dev/docker-compose-extensions-jar.yml");
+//        } else {
+//            System.err.printf("Unkown extension include option %s, valid ones are %s and %s%n", extension, EXTENSIONS_OPT_CLASSES, EXTENSIONS_OPT_JAR);
+//            System.exit(-1);
+//        }
 
         if (usePostgres) {
             commandLine.add("--file");