Merge branch 'feature/437468_realm_strapi' into 'develop'

feature/437468_realm_strapi See merge request upm-inesdata/inesdata-public-portal-backend!7
oeg-upm · Aug 5, 2024 · 44b7a8c · 44b7a8c
2 parents 664339a + 85150d3
commit 44b7a8c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config/inesdata.js b/config/inesdata.js
@@ -4,7 +4,7 @@ module.exports = ({ env }) => ({
     tokenClientId: env('TOKEN_CLIENT_ID', 'dataspace-users'),
     tokenUsername: env('TOKEN_USERNAME', 'user-c1'),
     tokenPassword: env('TOKEN_PASSWORD', 'user-c1'),
-    keycloakBaseUrl: env('KEYCLOAK_BASE_URL', 'http://keycloak:8080'),
+    keycloakBaseUrl: env('KEYCLOAK_BASE_URL', 'http://keycloak:8080/realms/dataspace'),
     catalogBaseUrl: env('CATALOG_BASE_URL', 'http://connector-c1:19193'),
     vocabulariesBaseUrl: env('VOCABULARIES_BASE_URL', 'http://connector-c1:19196')
 })
diff --git a/src/api/services/token-service.js b/src/api/services/token-service.js
@@ -17,7 +17,7 @@ const getTokenFromAuthServer = async () => {
     params.append('username', process.env.TOKEN_USERNAME);
     params.append('password', process.env.TOKEN_PASSWORD);
 
-    const tokenUrl = `${process.env.KEYCLOAK_BASE_URL}/realms/dataspace/protocol/openid-connect/token`;
+    const tokenUrl = `${process.env.KEYCLOAK_BASE_URL}/protocol/openid-connect/token`;
 
     const response = await axios.post(tokenUrl, params);
     const data = response.data;
@@ -43,7 +43,7 @@ const refreshToken = async () => {
     params.append('client_id', process.env.TOKEN_CLIENT_ID);
     params.append('refresh_token', tokenData.refreshToken);
 
-    const tokenUrl = `${process.env.KEYCLOAK_BASE_URL}/realms/dataspace/protocol/openid-connect/token`;
+    const tokenUrl = `${process.env.KEYCLOAK_BASE_URL}/protocol/openid-connect/token`;
 
     const response = await axios.post(tokenUrl, params);
     const data = response.data;