From 416b4f030251272b945504186514a1b2abcf8363 Mon Sep 17 00:00:00 2001 From: Vargha Csongor Date: Mon, 13 May 2024 21:11:10 +0200 Subject: [PATCH] update docker image platform in cd --- .github/workflows/auth-service-cd.yml | 2 +- .github/workflows/backend-cd.yml | 2 +- frontend/src/lib/auth.ts | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/auth-service-cd.yml b/.github/workflows/auth-service-cd.yml index a7374f7..49a8038 100644 --- a/.github/workflows/auth-service-cd.yml +++ b/.github/workflows/auth-service-cd.yml @@ -48,4 +48,4 @@ jobs: push: true context: "{{defaultContext}}:auth-service" tags: vcscsvcscs/gheritage-auth-service:${{steps.create_image_tag.outputs.result}} - platforms: linux/arm64/v8 + platforms: linux/arm64 diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index 16ba9c0..e2bfce7 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -48,4 +48,4 @@ jobs: push: true context: "{{defaultContext}}:backend" tags: vcscsvcscs/gheritage-backend-service:${{steps.create_image_tag.outputs.result}} - platforms: linux/arm64/v8 + platforms: linux/arm64 diff --git a/frontend/src/lib/auth.ts b/frontend/src/lib/auth.ts index 95788f5..25b119d 100644 --- a/frontend/src/lib/auth.ts +++ b/frontend/src/lib/auth.ts @@ -3,8 +3,6 @@ import { isAuthenticated, user } from './stores'; import { PUBLIC_ZITADEL_CLIENT_ID, PUBLIC_ISSUER, - PUBLIC_LOGIN_REDIRECT_URI, - PUBLIC_LOGOUT_REDIRECT_URI } from '$env/static/public'; import { goto } from '$app/navigation'; import { browser } from '$app/environment'; @@ -14,13 +12,13 @@ if (browser) { const config = { authority: PUBLIC_ISSUER, // At Zitadel Project Console > [Your project] > [Your application] > URLs - Issuer client_id: PUBLIC_ZITADEL_CLIENT_ID, // At Zitadel Project Console > [Your project] > [Your application] > Configuration - Client ID - redirect_uri: PUBLIC_LOGIN_REDIRECT_URI + '/callback', // At Zitadel Project Console > [Your project] > [Your application] > URLs - Login Redirect URI + redirect_uri: window.location.hostname + '/callback', // At Zitadel Project Console > [Your project] > [Your application] > URLs - Login Redirect URI response_type: 'code', scope: 'openid profile email', - post_logout_redirect_uri: PUBLIC_LOGOUT_REDIRECT_URI, + post_logout_redirect_uri: window.location.hostname, userStore: new WebStorageStateStore({ store: window.localStorage }), automaticSilentRenew: true, - silent_redirect_uri: PUBLIC_LOGIN_REDIRECT_URI + '/silent-refresh' + silent_redirect_uri: window.location.hostname + '/silent-refresh' }; userManager = new UserManager(config);