use MyAccessId as AAI endpoint

SSHOC · Aug 6, 2024 · ea4f414 · ea4f414
1 parent 5f50748
commit ea4f414
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/docker-compose-acdh-develop.yml b/docker-compose-acdh-develop.yml
@@ -1,10 +1,10 @@
 version: "2"
 services:
   marketplace:
-    build: 
+    build:
       context: .
       dockerfile: Dockerfile-acdh-ch
-      args: 
+      args:
         - GID=1032
         - UID=1032
     image: docker.gitlab.gwdg.de/sshoc/sshoc-marketplace-backend/api:latest
@@ -23,7 +23,7 @@ services:
       POSTGRES_PORT: 5432
       SOLR_HOST: solr
       SOLR_PORT: 8983
-      aai_base_uri: https://aai.eosc-portal.eu/oidc
+      aai_base_uri: https://proxy.acc.myaccessid.org/OIDC
       egi_id: ${egi_id}
       egi_secret: ${egi_secret}
       token_secret: ${token_secret}

diff --git a/docker-compose-acdh-prod.yml b/docker-compose-acdh-prod.yml
@@ -25,7 +25,7 @@ services:
       POSTGRES_PORT: 5432
       SOLR_HOST: solr-prod
       SOLR_PORT: 8983
-      aai_base_uri: https://aai.eosc-portal.eu/oidc
+      aai_base_uri: https://proxy.acc.myaccessid.org/OIDC
       egi_id: ${egi_id}
       egi_secret: ${egi_secret}
       token_secret: ${token_secret}

diff --git a/docker-compose-acdh-stage.yml b/docker-compose-acdh-stage.yml
@@ -1,10 +1,10 @@
 version: "2"
 services:
   marketplace-stage:
-    build: 
+    build:
       context: .
       dockerfile: Dockerfile-acdh-ch
-      args: 
+      args:
         - GID=1057
         - UID=1057
     image: docker.gitlab.gwdg.de/sshoc/sshoc-marketplace-backend/api-stage:latest
@@ -23,7 +23,7 @@ services:
       POSTGRES_PORT: 5432
       SOLR_HOST: solr-stage
       SOLR_PORT: 8983
-      aai_base_uri: https://aai.eosc-portal.eu/oidc
+      aai_base_uri: https://proxy.acc.myaccessid.org/OIDC
       egi_id: ${egi_id}
       egi_secret: ${egi_secret}
       token_secret: ${token_secret}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - solr
     environment:
       APPLICATION_PROFILE: dev
-      aai_base_uri: https://aai.eosc-portal.eu/oidc
+      aai_base_uri: https://proxy.acc.myaccessid.org/OIDC
       egi_id: ${egi_id}
       egi_secret: ${egi_secret}
       token_secret: ${token_secret}

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -66,13 +66,13 @@ spring:
                             - eduperson_scoped_affiliation
                             - eduperson_entitlement
                         redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
-                        client-name: EOSC
+                        client-name: MyAccessId
                 provider:
                     eosc:
-                        token-uri: ${aai_base_uri:https://aai-dev.egi.eu/oidc}/token
-                        authorization-uri: ${aai_base_uri:https://aai-dev.egi.eu/oidc}/authorize
-                        user-info-uri: ${aai_base_uri:https://aai-dev.egi.eu/oidc}/userinfo
-                        jwk-set-uri: ${aai_base_uri:https://aai-dev.egi.eu/oidc}/jwk
+                        token-uri: ${aai_base_uri:https://proxy.acc.myaccessid.org/OIDC}/token
+                        authorization-uri: ${aai_base_uri:https://proxy.acc.myaccessid.org/OIDC}/authorization
+                        user-info-uri: ${aai_base_uri:https://proxy.acc.myaccessid.org/OIDC}/userinfo
+                        jwk-set-uri: ${aai_base_uri:https://proxy.acc.myaccessid.org/OIDC}/jwk
                         user-name-attribute: sub
 
     profiles:
@@ -177,4 +177,4 @@ management:
     endpoint:
         health:
             show-details: when_authorized
-            roles: 'ADMINISTRATOR'
+            roles: 'ADMINISTRATOR'