ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update env variables, use env variables in vite.config.js

This commit is contained in:
Christian Cueni 2022-04-14 13:13:53 +02:00
parent 149ba17580
commit bc8d1b0a21
3 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
client/vite.config.ts
View File

@ -1,30 +1,33 @@
import path from 'path' import path from 'path'
import { fileURLToPath, URL } from 'url' import { fileURLToPath, URL } from 'url'
import { defineConfig } from 'vite' import {defineConfig, loadEnv} from 'vite'
import vue from '@vitejs/plugin-vue' import vue from '@vitejs/plugin-vue'
import vueI18n from '@intlify/vite-plugin-vue-i18n' import vueI18n from '@intlify/vite-plugin-vue-i18n'
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default defineConfig({ export default ({mode}) => {
alias: { process.env = {...process.env, ...loadEnv(mode, process.cwd())};
'vue-i18n': 'vue-i18n/dist/vue-i18n.runtime.esm-bundler.js'
}, return defineConfig({
plugins: [ plugins: [
vue(), vue(),
vueI18n({ vueI18n({
include: path.resolve(__dirname, './locales/**') include: path.resolve(__dirname, './locales/**')
}) })
], ],
resolve: { resolve: {
alias: { alias: {
'@': fileURLToPath(new URL('./src', import.meta.url)) '@': fileURLToPath(new URL('./src', import.meta.url)),
'vue-i18n': 'vue-i18n/dist/vue-i18n.runtime.esm-bundler.js'
},
}, },
}, server: {
server: { proxy: {
proxy: { '/sso': process.env.VITE_PROXY_TARGET_BASE,
'/sso': 'http://localhost:8000', '/api': process.env.VITE_PROXY_TARGET_BASE,
'/api': 'http://localhost:8000', '/todo': process.env.VITE_PROXY_TARGET_BASE,
} }
}, },
}) })
}

14
server/config/settings/base.py
View File

@ -454,13 +454,13 @@ if "django_redis.cache.RedisCache" in env("VBV_DJANGO_CACHE_BACKEND", default=""
# OAuth/OpenId Connect # OAuth/OpenId Connect
OAUTH = { OAUTH = {
"client_name": env("OAUTH_CLIENT_NAME", default="lernetz"), "client_name": env("IT_OAUTH_CLIENT_NAME", default="lernetz"),
"client_id": env("OAUTH_CLIENT_ID", default="iterativ"), "client_id": env("IT_OAUTH_CLIENT_ID", default="iterativ"),
"client_secret": env("OAUTH_CLIENT_SECRET", default=""), "client_secret": env("IT_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"), "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("OAUTH_AUTHORIZE_URL", default="https://sso.test.b.lernetz.host/auth/realms/vbv/protocol/openid-connect/auth"), "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("OAUTH_API_BASE_URL", default="https://sso.test.b.lernetz.host/auth/realms/vbv/protocol/openid-connect/"), "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("OAUTH_LOCAL_DIRECT_URI", default="http://localhost:3000/sso/callback/"), "local_redirect_uri": env("IT_OAUTH_LOCAL_DIRECT_URI", default="http://localhost:3000/sso/callback/"),
"client_kwargs": { "client_kwargs": {
'scope': '', 'scope': '',
'token_endpoint_auth_method': 'client_secret_post', 'token_endpoint_auth_method': 'client_secret_post',

1
server/vbv_lernwelt/sso/views.py
View File

@ -36,6 +36,7 @@ def authorize(request):
user_data["last_name"], user_data["username"]) user_data["last_name"], user_data["username"])
dj_login(request, user) dj_login(request, user)
# todo: redirect to other page if new user
return redirect(f'/{OAUTH_SUCCESS_REDIRECT}?state=success') # to be defined return redirect(f'/{OAUTH_SUCCESS_REDIRECT}?state=success') # to be defined