Merged develop into feature/VBV-778-bb-content-access

This commit is contained in:
Christian Cueni 2024-10-28 05:56:52 +00:00
commit 944dae9a07
2 changed files with 3 additions and 2 deletions

View File

@ -639,7 +639,7 @@ OAUTH_SIGNIN_REDIRECT_URI = env(
"OAUTH_SIGNIN_REDIRECT_URI", default="http://localhost:8000/sso/callback" "OAUTH_SIGNIN_REDIRECT_URI", default="http://localhost:8000/sso/callback"
) )
OAUTH_LOGOUT_REDIRECT_URI = env("OAUTH_LOGOUT_REDIRECT_URI", default="") OAUTH_LOGOUT_REDIRECT_URI = env("OAUTH_LOGOUT_REDIRECT_URI", default="/")
OAUTH_SIGNIN_URL = env("OAUTH_SIGNIN_URL", default="") OAUTH_SIGNIN_URL = env("OAUTH_SIGNIN_URL", default="")
OAUTH_SIGNIN_REALM = env("OAUTH_SIGNIN_REALM", default="vbv") OAUTH_SIGNIN_REALM = env("OAUTH_SIGNIN_REALM", default="vbv")

View File

@ -143,7 +143,8 @@ def logout(request):
id_token = user_data.get("id_token", "") id_token = user_data.get("id_token", "")
if not id_token: if not id_token:
logger.debug("SSO Logout", extra={"mode": "id_token_not_set"}) logger.debug("SSO Logout", extra={"mode": "id_token_not_set"})
return redirect(f"{redirect_uri}&client_id=iterativ") url_param_symbol = "&" if "?" in redirect_uri else "?"
return redirect(f"{redirect_uri}{url_param_symbol}client_id=iterativ")
# Handle scenarios when SSO-related data is present or redirect_uri is not set # Handle scenarios when SSO-related data is present or redirect_uri is not set
if not redirect_uri: if not redirect_uri: