From 8bfd2ac95331500deca02cae62a6910089ea10ab Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 10 Aug 2022 08:49:33 +0200 Subject: [PATCH] Update sso settings, add user manager --- env_secrets/local_chrigu.env | Bin 1757 -> 1757 bytes server/config/settings/base.py | 2 +- server/vbv_lernwelt/core/models.py | 4 ++++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/env_secrets/local_chrigu.env b/env_secrets/local_chrigu.env index c0a93e42b15f3e27a568ff15f747648baada9e61..736091fcc5041d2e69cfc00e9326868edd14dbca 100644 GIT binary patch literal 1757 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 diff --git a/server/config/settings/base.py b/server/config/settings/base.py index dcd70113..96557976 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -517,7 +517,7 @@ OAUTH = { "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/"), + "local_redirect_uri": env("IT_OAUTH_LOCAL_DIRECT_URI", default="http://localhost:8000/sso/callback/"), "client_kwargs": { 'scope': '', 'token_endpoint_auth_method': 'client_secret_post', diff --git a/server/vbv_lernwelt/core/models.py b/server/vbv_lernwelt/core/models.py index 55054f86..432e0608 100644 --- a/server/vbv_lernwelt/core/models.py +++ b/server/vbv_lernwelt/core/models.py @@ -2,6 +2,8 @@ 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): """ @@ -13,6 +15,8 @@ class User(AbstractUser): avatar_url = models.CharField(max_length=254, blank=True, default='') email = models.EmailField('email address', unique=True) + objects = UserManager() + class SecurityRequestResponseLog(models.Model): label = models.CharField(max_length=255, blank=True, default="")