From c0089a98f41caf9874a598ba32dfe99c5f615287 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 28 Apr 2020 22:29:56 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9openid=E4=BF=A1?=
=?UTF-8?q?=E5=8F=B7=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/users/signals_handler.py | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/apps/users/signals_handler.py b/apps/users/signals_handler.py
index 622f4a9f8..9d6c96c02 100644
--- a/apps/users/signals_handler.py
+++ b/apps/users/signals_handler.py
@@ -7,7 +7,7 @@ from django_auth_ldap.backend import populate_user
from django.conf import settings
from django_cas_ng.signals import cas_user_authenticated
-from jms_oidc_rp.signals import openid_user_create_or_update
+from jms_oidc_rp.signals import openid_create_or_update_user
from common.utils import get_logger
from .signals import post_user_create
@@ -53,14 +53,12 @@ def on_ldap_create_user(sender, user, ldap_user, **kwargs):
user.save()
-@receiver(openid_user_create_or_update)
-def on_openid_user_create_or_update(sender, request, user, created, name, username, email, **kwargs):
+@receiver(openid_create_or_update_user)
+def on_openid_create_or_update_user(sender, request, user, created, name, username, email, **kwargs):
if created:
user.source = User.SOURCE_OPENID
user.save()
- return
-
- if not created and settings.AUTH_OPENID_ALWAYS_UPDATE_USER:
+ elif not created and settings.AUTH_OPENID_ALWAYS_UPDATE_USER:
user.name = name
user.username = username
user.email = email