Merge branch 'master' of https://github.com/EOEPCA/um-identity-service …

…into develop
EOEPCA · Oct 15, 2023 · bd9757c · bd9757c
2 parents 826128b + f7608b6
commit bd9757c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/demos/docker-compose.yml b/demos/docker-compose.yml
@@ -110,4 +110,4 @@ volumes:
 networks:
   eoepca_network:
     driver: bridge
-    name: eoepca_network
+    name: eoepca_network
diff --git a/demos/gatekeeper-echo.yml b/demos/gatekeeper-echo.yml
@@ -11,4 +11,4 @@ enable-uma: true
 enable-logout-redirect: true
 enable-metrics: true
 enable-logging: true
-listen: :3000
+listen: :3000
diff --git a/demos/gatekeeper-resource-server.yml b/demos/gatekeeper-resource-server.yml
@@ -3,7 +3,6 @@ client-id: resource-server
 client-secret: NQDKaX9jBYGS8rYW0KOHhofYGI54FLPe
 encryption-key: AgXa7xRcoClDEU0ZDSH4X0XhL5Qy2Z2j
 upstream-url: http://spring-boot-oauth2-resource-server:7072
-#no-proxy: true
 secure-cookie: false
 enable-request-id: true
 enable-refresh-tokens: true
@@ -12,4 +11,4 @@ enable-uma: true
 enable-logout-redirect: true
 enable-metrics: true
 enable-logging: true
-listen: :3001
+listen: :3001
diff --git a/...pring-boot-oauth2-resource-server/src/main/java/um/identity/config/WebSecurityConfig.java b/...pring-boot-oauth2-resource-server/src/main/java/um/identity/config/WebSecurityConfig.java
@@ -57,6 +57,7 @@ SecurityFilterChain filterChain(HttpSecurity http, Converter<Jwt, ? extends Abst
                         new AntPathRequestMatcher("/v3/api-docs/**")
                 ).permitAll()
 				.requestMatchers(new AntPathRequestMatcher("/api/customers")).hasAnyRole("ADMIN", "REALM-ADMIN")
+
                 .anyRequest().authenticated()
         );
         // @formatter:on
@@ -131,4 +132,4 @@ public JwtAuthenticationToken convert(Jwt jwt) {
 
 	}
 
-}
+}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,10 +25,10 @@ services:
         ports:
             - '5566:5566'
         environment:
-            - IDENTITY_AUTH_SERVER_URL=http://keycloak:8080/
-            - IDENTITY_ADMIN_PASSWORD=admin
-            - IDENTITY_REALM=master
-            - IDENTITY_RESOURCE_SERVER_ENDPOINT=http://spring-boot-oauth2-resource-server:7071
+            - AUTH_SERVER_URL=http://keycloak:8080/
+            - ADMIN_PASSWORD=admin
+            - REALM=master
+            - RESOURCE_SERVER_ENDPOINT=http://spring-boot-oauth2-resource-server:7071
         restart: on-failure
     keycloak:
         image: quay.io/keycloak/keycloak:22.0.3
@@ -101,4 +101,4 @@ services:
 networks:
     eoepca_network:
         driver: bridge
-        name: eoepca_network
+        name: eoepca_network
diff --git a/gatekeeper.yml b/gatekeeper.yml
@@ -11,4 +11,4 @@ enable-uma: true
 enable-logout-redirect: true
 enable-metrics: true
 enable-logging: true
-listen: :3000
+listen: :3000
diff --git a/identityutils/keycloak_client.py b/identityutils/keycloak_client.py
@@ -480,4 +480,4 @@ def delete_client_scopes(self, client_id, scope_id):
         data_raw = self.keycloak_admin.raw_delete(url.format(**params_path))
         return raise_error_from_response(
             data_raw
-        )
+        )