Skip to content

Add additional OIDC Field Mappings #652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add additional OIDC Field Mappings #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions source/app/blueprints/pages/login/login_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,12 @@ def oidc_authorise():
# not all providers set email by default, use preferred_username where it's missing
# Use the mapping from the configuration or default to email or preferred_username if not set
email_field = app.config.get("OIDC_MAPPING_EMAIL")
username_field = app.config.get("OIDC_MAPPING_USERNAME")
login_field = app.config.get("OIDC_MAPPING_USERNAME")
name_field = app.config.get("OIDC_MAPPING_DISPLAYNAME")

user_login = access_token_resp['id_token'].get(email_field) or access_token_resp['id_token'].get(username_field)
user_name = access_token_resp['id_token'].get(email_field) or access_token_resp['id_token'].get(username_field)
user_email = access_token_resp['id_token'].get(email_field) or access_token_resp['id_token'].get(login_field)
user_login = access_token_resp['id_token'].get(login_field) or access_token_resp['id_token'].get(email_field)
user_name = access_token_resp['id_token'].get(name_field) or access_token_resp['id_token'].get(login_field)

user = get_user(user_login, 'user')

Expand All @@ -240,7 +242,7 @@ def oidc_authorise():
user = create_user(
user_name=user_name,
user_login=user_login,
user_email=user_login,
user_email=user_email,
user_password=bc.generate_password_hash(password.encode('utf8')).decode('utf8'),
user_active=True,
user_is_service_account=False
Expand Down
1 change: 1 addition & 0 deletions source/app/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ class Config:
OIDC_TOKEN_ENDPOINT = config.load('OIDC', 'TOKEN_ENDPOINT', fallback=None)
OIDC_END_SESSION_ENDPOINT = config.load('OIDC', 'END_SESSION_ENDPOINT', fallback=None)
OIDC_SCOPES = config.load('OIDC', 'SCOPES', fallback="openid email profile")
OIDC_MAPPING_NAME = config.load('OIDC', 'MAPPING_DISPLAYNAME', fallback='name')
OIDC_MAPPING_USERNAME = config.load('OIDC', 'MAPPING_USERNAME', fallback='preferred_username')
OIDC_MAPPING_EMAIL = config.load('OIDC', 'MAPPING_EMAIL', fallback='email')

Expand Down