github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] OpenID登录成功后，如果用户没有email字段则构造默认的email

pull/3840/head
Michael Bai 2020-03-28 21:34:17 +08:00
parent b2d9b69874
commit 5268c0faae
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/authentication/backends/openid/models.py
View File

@ -5,6 +5,7 @@ from django.db import transaction
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from keycloak.realm import KeycloakRealm from keycloak.realm import KeycloakRealm
from keycloak.keycloak_openid import KeycloakOpenID from keycloak.keycloak_openid import KeycloakOpenID
from users.utils import construct_user_email
from .signals import post_create_or_update_openid_user from .signals import post_create_or_update_openid_user
from .decorator import ssl_verification from .decorator import ssl_verification
@ -155,13 +156,17 @@ class Client(object):
""" """
userinfo = self.get_userinfo(token=token_response['access_token']) userinfo = self.get_userinfo(token=token_response['access_token'])
with transaction.atomic(): with transaction.atomic():
name = userinfo.get('name', '')
username = userinfo.get('preferred_username', ''),
email = userinfo.get('email', '')
email = construct_user_email(username, email)
user, created = get_user_model().objects.update_or_create( user, created = get_user_model().objects.update_or_create(
username=userinfo.get('preferred_username', ''), username=username,
defaults={ defaults={
'email': userinfo.get('email', ''), 'name': name, 'email': email,
'first_name': userinfo.get('given_name', ''), 'first_name': userinfo.get('given_name', ''),
'last_name': userinfo.get('family_name', ''), 'last_name': userinfo.get('family_name', ''),
'name': userinfo.get('name', '')
} }
) )
oidt_profile = OpenIDTokenProfile( oidt_profile = OpenIDTokenProfile(