diff --git a/README.md b/README.md index 544ed13b..8ab71bfb 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,12 @@ npm run dev * In the .idea/vbv_lernwelt.iml file change the module type to "PYTHON_MODULE". * Add django facet in "Project Structure". * Run configuration with "Python -> server.py" to have async debugging support. -### Optional -* Install the EnvFile Plugin -* Install the tailwind css Plugin from Jetbrains + +### Optional + +#### Install the EnvFile Plugin + +![](docs/envfile_plugin_settings.png) + +#### Install the tailwind css Plugin from Jetbrains diff --git a/client/vite.config.ts b/client/vite.config.ts index 244ea56b..1bd01a2e 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -1,5 +1,5 @@ import path from 'path' -import { fileURLToPath, URL } from 'url' +import {fileURLToPath, URL} from 'url' import {defineConfig, loadEnv} from 'vite' import vue from '@vitejs/plugin-vue' @@ -32,6 +32,7 @@ export default ({mode}) => { }, server: { proxy: { + '^.*': process.env.VITE_PROXY_TARGET_BASE, '/sso': process.env.VITE_PROXY_TARGET_BASE, '/api': process.env.VITE_PROXY_TARGET_BASE, '/todo': process.env.VITE_PROXY_TARGET_BASE, diff --git a/docs/envfile_plugin_settings.png b/docs/envfile_plugin_settings.png new file mode 100644 index 00000000..4e9a290e Binary files /dev/null and b/docs/envfile_plugin_settings.png differ diff --git a/env_secrets/local_daniel.env b/env_secrets/local_daniel.env new file mode 100644 index 00000000..d4a2197a Binary files /dev/null and b/env_secrets/local_daniel.env differ diff --git a/server/config/settings/base.py b/server/config/settings/base.py index bc29a5aa..38375a65 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -129,7 +129,10 @@ AUTH_USER_MODEL = "core.User" # https://docs.djangoproject.com/en/dev/ref/settings/#login-redirect-url # LOGIN_REDIRECT_URL = "users:redirect" # https://docs.djangoproject.com/en/dev/ref/settings/#login-url -LOGIN_URL = "/sso/login/" + +# FIXME make configurable!? +# LOGIN_URL = "/sso/login/" +LOGIN_URL = "/login/" ALLOW_LOCAL_LOGIN = env.bool("IT_ALLOW_LOCAL_LOGIN", default=False) diff --git a/server/vbv_lernwelt/core/managers.py b/server/vbv_lernwelt/core/managers.py index 5d47b767..b1e53efe 100644 --- a/server/vbv_lernwelt/core/managers.py +++ b/server/vbv_lernwelt/core/managers.py @@ -1,8 +1,8 @@ +from django.contrib.auth.base_user import BaseUserManager from django.contrib.auth.models import AbstractUser -from django.db import models -class UserManager(models.Manager): +class UserManager(BaseUserManager): def create_or_update_by_email(self, email: str, first_name: str, last_name: str, username: str) -> tuple[ AbstractUser, bool]: # create or sync user with OpenID Data diff --git a/server/vbv_lernwelt/core/models.py b/server/vbv_lernwelt/core/models.py index 295a666d..b679d72d 100644 --- a/server/vbv_lernwelt/core/models.py +++ b/server/vbv_lernwelt/core/models.py @@ -2,15 +2,14 @@ from django.contrib.auth.models import AbstractUser from django.db import models from django.db.models import JSONField -from vbv_lernwelt.core.managers import UserManager - class User(AbstractUser): """ Default custom user model for VBV Lernwelt. If adding fields that need to be filled at user signup, """ - objects = UserManager() + # FIXME: look into it... + # objects = UserManager() class SecurityRequestResponseLog(models.Model):