From 975d9cfdc24e73ff6aeecf2a07154cbac026e4b3 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Thu, 1 Jun 2023 22:57:24 +0200 Subject: [PATCH] More cleanup --- caprover_deploy.sh | 25 +----------------------- client/src/main.ts | 13 +++++------- client/src/router/guards.ts | 4 ++-- compose/django/docker_start.sh | 2 -- env/bitbucket/prepare_for_deployment.sh | 3 --- env_secrets/prod-azure.json | Bin 4817 -> 4722 bytes 6 files changed, 8 insertions(+), 39 deletions(-) diff --git a/caprover_deploy.sh b/caprover_deploy.sh index 692efda2..2014b227 100755 --- a/caprover_deploy.sh +++ b/caprover_deploy.sh @@ -25,34 +25,11 @@ function generate_default_app_name() { # take app name as first argument or use the default generated app name APP_NAME=${1:-$(generate_default_app_name)} -if [[ "$APP_NAME" == "myvbv" ]]; then - VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv.iterativ.ch/" - https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/ - VITE_SENTRY_ENV="production" -elif [[ "$APP_NAME" == "myvbv-stage" ]]; then - VITE_LOGOUT_REDIRECT="https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv-stage.iterativ.ch/" - https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/ - VITE_SENTRY_ENV="stage" -elif [[ "$APP_NAME" == "vbv-lernwelt" ]]; then - VITE_OAUTH_API_BASE_URL= https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/ - VITE_LOGOUT_REDIRECT=" https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://vbv-lernwelt.control.iterativ.ch" - VITE_SENTRY_ENV="development" -elif [[ "$APP_NAME" == "prod-azure" ]]; then - VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://my.vbv-afa.ch/" - VITE_SENTRY_ENV="production" -fi - echo "Deploy to $APP_NAME" -echo "VITE_SENTRY_ENV: $VITE_SENTRY_ENV" -echo "VITE_LOGOUT_REDIRECT: $VITE_LOGOUT_REDIRECT" - -export VITE_SENTRY_ENV=$VITE_SENTRY_ENV -export VITE_LOGOUT_REDIRECT=$VITE_LOGOUT_REDIRECT - # create client for django npm run build -python server/manage.py collectstatic --no-input +VITE_APP_ENVIRONMENT=dev python server/manage.py collectstatic --no-input if [[ "$APP_NAME" == "prod-azure" ]]; then # build and push azure docker container diff --git a/client/src/main.ts b/client/src/main.ts index 0e11e50d..d1216063 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -14,10 +14,9 @@ declare module "pinia" { } } -if ( - window.location.href.indexOf("localhost") >= 0 || - window.location.href.indexOf("127.0.0.1") >= 0 -) { +const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local"; + +if (appEnv === "local") { log.setLevel("trace"); } else { log.setLevel("warn"); @@ -28,12 +27,10 @@ const app = createApp(App); Sentry.init({ app, - environment: import.meta.env.VITE_APP_ENVIRONMENT || "local", + environment: appEnv, dsn: "https://2df6096a4fd94bd6b4802124d10e4b8d@o8544.ingest.sentry.io/4504157846372352", tracesSampleRate: 0.0, - enabled: - import.meta.env.VITE_APP_ENVIRONMENT.startsWith("prod") || - import.meta.env.VITE_APP_ENVIRONMENT.startsWith("stage"), + enabled: appEnv.startsWith("prod") || appEnv.startsWith("stage"), }); // todo: define lang setup diff --git a/client/src/router/guards.ts b/client/src/router/guards.ts index 6ca8fc14..f7090336 100644 --- a/client/src/router/guards.ts +++ b/client/src/router/guards.ts @@ -15,8 +15,8 @@ export const updateLoggedIn: NavigationGuard = async () => { export const redirectToLoginIfRequired: NavigationGuard = (to) => { const userStore = useUserStore(); if (loginRequired(to) && !userStore.loggedIn) { - const sentryEnv = import.meta.env.VITE_APP_ENVIRONMENT; - const ssoLogin = sentryEnv.startsWith("prod") || sentryEnv.startsWith("stage"); + const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local"; + const ssoLogin = appEnv.startsWith("prod") || appEnv.startsWith("stage"); return ssoLogin ? `/login?next=${to.fullPath}` : `/login-local?next=${to.fullPath}`; } }; diff --git a/compose/django/docker_start.sh b/compose/django/docker_start.sh index e888148f..16637c5b 100644 --- a/compose/django/docker_start.sh +++ b/compose/django/docker_start.sh @@ -10,5 +10,3 @@ python /app/manage.py collectstatic --no-input --no-post-process python /app/manage.py reset_schema /usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:7555 --chdir=/app -k uvicorn.workers.UvicornWorker - - diff --git a/env/bitbucket/prepare_for_deployment.sh b/env/bitbucket/prepare_for_deployment.sh index 7db1b2a3..2359750c 100755 --- a/env/bitbucket/prepare_for_deployment.sh +++ b/env/bitbucket/prepare_for_deployment.sh @@ -12,9 +12,6 @@ export PATH="$PWD/vbvvenv/bin:$PATH" docker login --username=iterativ --password=$DOCKER_PASSWORD_TOKEN -# only used for `python manage.py collectstatic` so value doesn't matter -export VITE_APP_ENVIRONMENT=dev - pip install -r $BITBUCKET_CLONE_DIR/server/requirements/requirements-dev.txt npm install -g caprover diff --git a/env_secrets/prod-azure.json b/env_secrets/prod-azure.json index 00840c828ff8ce23c12277797387f785210277c4..f73289950b77f02e7551d0d8c11c34c958e180ca 100644 GIT binary patch literal 4722 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 A!~g&Q literal 4817 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