fix: rollback initial changes

bcgov · Dec 4, 2024 · e0bf672 · e0bf672
1 parent c184b0c
commit e0bf672
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/.../main/java/com/github/bcgov/keycloak/authenticators/browser/IdentityProviderStopForm.java b/.../main/java/com/github/bcgov/keycloak/authenticators/browser/IdentityProviderStopForm.java
@@ -62,11 +62,6 @@ public void authenticate(AuthenticationFlowContext context) {
       formData.add(AuthenticationManager.FORM_USERNAME, "{}");
     }
 
-    if (formData.size() == 1) {
-      context.attempted();
-      return;
-    }
-
     Response challengeResponse = challenge(context, formData);
     context.challenge(challengeResponse);
   }

diff --git a/localdev/macs/Dockerfile b/localdev/macs/Dockerfile
@@ -14,15 +14,15 @@ ENV KC_DB=postgres
 
 COPY --from=extensions-builder /tmp/services/target/bcgov-services-1.0.0.jar /opt/keycloak/providers/
 
-COPY ./docker/keycloak/extensions-26/themes/src/main/resources/theme /opt/keycloak/themes/
-
-RUN /opt/keycloak/bin/kc.sh build --verbose
-
 WORKDIR /opt/keycloak
 
+COPY ./docker/keycloak/extensions-26/themes/src/main/resources/theme /opt/keycloak/themes/
+
 COPY ./docker/keycloak/configuration/26/quarkus.properties /opt/keycloak/conf
 
 COPY ./docker/keycloak/configuration/26/keycloak-default-user-profile.json /tmp
 
+RUN /opt/keycloak/bin/kc.sh build
+
 # change these values to point to a running postgres instance
 ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]
diff --git a/localdev/macs/docker-compose.yml b/localdev/macs/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.8'
 services:
   keycloak:
     container_name: keycloak
-    image: sso-keycloak:24.0.5
+    image: sso-keycloak:26.0.5
     command: start-dev
     depends_on:
       - postgres
@@ -19,8 +19,8 @@ services:
       KEYCLOAK_ADMIN: admin
       KEYCLOAK_ADMIN_PASSWORD: admin
       KC_HTTP_RELATIVE_PATH: /auth
-      KC_HOSTNAME_URL: http://localhost:8080/auth/
-      KC_HOSTNAME_ADMIN_URL: http://localhost:8080/auth/
+      KC_HOSTNAME: http://localhost:8080/auth/
+      KC_HOSTNAME_ADMIN: http://localhost:8080/auth/
     volumes:
       - ../../docker/keycloak/extensions-24/themes/src/main/resources/theme:/opt/keycloak/themes/