fix urls

ls1intum · Oct 6, 2024 · b5dffc4 · b5dffc4
1 parent f7e7fdc
commit b5dffc4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/server/application-server/keycloak-hephaestus-realm-example-config.json b/server/application-server/keycloak-hephaestus-realm-example-config.json
@@ -577,14 +577,14 @@
     "clientId" : "hephaestus",
     "name" : "",
     "description" : "",
-    "rootUrl" : "https://hephaestus.ase.cit.tum.de",
+    "rootUrl" : "http://localhost:4200",
     "adminUrl" : "",
     "baseUrl" : "",
     "surrogateAuthRequired" : false,
     "enabled" : true,
     "alwaysDisplayInConsole" : false,
     "clientAuthenticatorType" : "client-secret",
-    "redirectUris" : [ "https://hephaestus.ase.cit.tum.de/*" ],
+    "redirectUris" : [ "https://localhost:4200/*" ],
     "webOrigins" : [ "+" ],
     "notBefore" : 0,
     "bearerOnly" : false,
@@ -600,7 +600,7 @@
       "realm_client" : "false",
       "oidc.ciba.grant.enabled" : "false",
       "backchannel.logout.session.required" : "true",
-      "post.logout.redirect.uris" : "https://hephaestus.ase.cit.tum.de/*",
+      "post.logout.redirect.uris" : "https://localhost:4200/*",
       "display.on.consent.screen" : "false",
       "oauth2.device.authorization.grant.enabled" : "false",
       "backchannel.logout.revoke.offline.tokens" : "false"
@@ -615,15 +615,15 @@
     "clientId" : "hephaestus-confidential",
     "name" : "",
     "description" : "",
-    "rootUrl" : "https://api.hephaestus.felixdietrich.com",
-    "adminUrl" : "https://api.hephaestus.felixdietrich.com",
-    "baseUrl" : "https://api.hephaestus.felixdietrich.com/",
+    "rootUrl" : "https://localhost:8080",
+    "adminUrl" : "https://localhost:8080",
+    "baseUrl" : "https://localhost:8080/",
     "surrogateAuthRequired" : false,
     "enabled" : true,
     "alwaysDisplayInConsole" : false,
     "clientAuthenticatorType" : "client-secret",
     "secret" : "0g0QtFmz6GB1Jv03SszCFepPro0hiP7G",
-    "redirectUris" : [ "https://api.hephaestus.felixdietrich.com/login/oauth2/code/keycloak" ],
+    "redirectUris" : [ "https://localhost:8080/login/oauth2/code/keycloak" ],
     "webOrigins" : [ "+" ],
     "notBefore" : 0,
     "bearerOnly" : false,
@@ -640,7 +640,7 @@
       "oidc.ciba.grant.enabled" : "false",
       "client.secret.creation.time" : "1728160951",
       "backchannel.logout.session.required" : "true",
-      "post.logout.redirect.uris" : "https://api.hephaestus.felixdietrich.com/",
+      "post.logout.redirect.uris" : "https://localhost:8080/",
       "display.on.consent.screen" : "false",
       "oauth2.device.authorization.grant.enabled" : "false",
       "use.jwks.url" : "false",

diff --git a/webapp/Dockerfile b/webapp/Dockerfile
@@ -20,6 +20,7 @@ RUN export $(grep -v '^#' .env | xargs) && \
     echo "Generating environment.prod.ts" && \
     cat > src/environments/environment.prod.ts <<EOF
 export const environment = {
+  clientUrl: '${APPLICATION_CLIENT_URL}',
   serverUrl: '${APPLICATION_SERVER_URL}',
   keycloak: {
     url: '${KEYCLOAK_URL}',

diff --git a/webapp/src/app/core/security/keycloak.service.ts b/webapp/src/app/core/security/keycloak.service.ts
@@ -48,6 +48,6 @@ export class KeycloakService {
   }
 
   logout() {
-    return this.keycloak.logout({ redirectUri: 'http://localhost:4200' });
+    return this.keycloak.logout({ redirectUri: environment.clientUrl });
   }
 }
diff --git a/webapp/src/environments/environment.prod.ts b/webapp/src/environments/environment.prod.ts
@@ -1,4 +1,5 @@
 export const environment = {
+  clientUrl: 'http://localhost:4200',
   serverUrl: 'http://localhost:8080',
   keycloak: {
     url: 'http://localhost:8081',

diff --git a/webapp/src/environments/environment.ts b/webapp/src/environments/environment.ts
@@ -1,4 +1,5 @@
 export const environment = {
+  clientUrl: 'http://localhost:4200',
   serverUrl: 'http://localhost:8080',
   keycloak: {
     url: 'http://localhost:8081',