diff --git a/client/vite.config.ts b/client/vite.config.ts index e1e8a58b..50b1be76 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -1,30 +1,33 @@ import path from 'path' import { fileURLToPath, URL } from 'url' -import { defineConfig } from 'vite' +import {defineConfig, loadEnv} from 'vite' import vue from '@vitejs/plugin-vue' import vueI18n from '@intlify/vite-plugin-vue-i18n' // https://vitejs.dev/config/ -export default defineConfig({ - alias: { - 'vue-i18n': 'vue-i18n/dist/vue-i18n.runtime.esm-bundler.js' - }, - plugins: [ - vue(), - vueI18n({ +export default ({mode}) => { + process.env = {...process.env, ...loadEnv(mode, process.cwd())}; + + return defineConfig({ + plugins: [ + vue(), + vueI18n({ include: path.resolve(__dirname, './locales/**') }) - ], - resolve: { - alias: { - '@': fileURLToPath(new URL('./src', import.meta.url)) + ], + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)), + 'vue-i18n': 'vue-i18n/dist/vue-i18n.runtime.esm-bundler.js' + }, }, - }, - server: { - proxy: { - '/sso': 'http://localhost:8000', - '/api': 'http://localhost:8000', - } - }, -}) + server: { + proxy: { + '/sso': process.env.VITE_PROXY_TARGET_BASE, + '/api': process.env.VITE_PROXY_TARGET_BASE, + '/todo': process.env.VITE_PROXY_TARGET_BASE, + } + }, + }) +} diff --git a/server/config/settings/base.py b/server/config/settings/base.py index 21f3eca9..13be663f 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -454,13 +454,13 @@ if "django_redis.cache.RedisCache" in env("VBV_DJANGO_CACHE_BACKEND", default="" # OAuth/OpenId Connect OAUTH = { - "client_name": env("OAUTH_CLIENT_NAME", default="lernetz"), - "client_id": env("OAUTH_CLIENT_ID", default="iterativ"), - "client_secret": env("OAUTH_CLIENT_SECRET", default=""), - "access_token_url": env("OAUTH_ACCESS_TOKEN_URL", default="https://sso.test.b.lernetz.host/auth/realms/vbv/protocol/openid-connect/token"), - "authorize_url": env("OAUTH_AUTHORIZE_URL", default="https://sso.test.b.lernetz.host/auth/realms/vbv/protocol/openid-connect/auth"), - "api_base_url": env("OAUTH_API_BASE_URL", default="https://sso.test.b.lernetz.host/auth/realms/vbv/protocol/openid-connect/"), - "local_redirect_uri": env("OAUTH_LOCAL_DIRECT_URI", default="http://localhost:3000/sso/callback/"), + "client_name": env("IT_OAUTH_CLIENT_NAME", default="lernetz"), + "client_id": env("IT_OAUTH_CLIENT_ID", default="iterativ"), + "client_secret": env("IT_OAUTH_CLIENT_SECRET", default=""), + "access_token_url": env("IT_OAUTH_ACCESS_TOKEN_URL", default="https://sso.test.b.lernetz.host/auth/realms/vbv/protocol/openid-connect/token"), + "authorize_url": env("IT_OAUTH_AUTHORIZE_URL", default="https://sso.test.b.lernetz.host/auth/realms/vbv/protocol/openid-connect/auth"), + "api_base_url": env("IT_OAUTH_API_BASE_URL", default="https://sso.test.b.lernetz.host/auth/realms/vbv/protocol/openid-connect/"), + "local_redirect_uri": env("IT_OAUTH_LOCAL_DIRECT_URI", default="http://localhost:3000/sso/callback/"), "client_kwargs": { 'scope': '', 'token_endpoint_auth_method': 'client_secret_post', diff --git a/server/vbv_lernwelt/sso/views.py b/server/vbv_lernwelt/sso/views.py index f05946aa..b6788e98 100644 --- a/server/vbv_lernwelt/sso/views.py +++ b/server/vbv_lernwelt/sso/views.py @@ -36,6 +36,7 @@ def authorize(request): user_data["last_name"], user_data["username"]) dj_login(request, user) + # todo: redirect to other page if new user return redirect(f'/{OAUTH_SUCCESS_REDIRECT}?state=success') # to be defined