Merge pull request teamhephy#75 from jianxiaoguo/main

chore(oauth2): update user info pipline

Author: duanhongyi

rootfs/api/authentication.py

@@ -53,7 +53,8 @@ def _get_user(key):
             user_info = OAuthManager().get_user_by_token(key)
             if not user_info.get('email'):
                 user_info['email'] = OAuthManager().get_email_by_token(key)
-            return serializers.UserSerializer.update_or_create(user_info)
+            user, _ = serializers.UserSerializer.update_or_create(user_info)
+            return user
         except Exception as e:
             logger.info(e)
             raise exceptions.AuthenticationFailed(_('Verify token fail.'))

rootfs/api/backend.py

@@ -25,7 +25,7 @@ def authenticate(self, request, username=None, password=None, **kwargs):
             user_info['password'] = password
             if not user_info.get('email'):
                 user_info['email'] = client.get_email()
-            user = serializers.UserSerializer.update_or_create(user_info)
+            user, _ = serializers.UserSerializer.update_or_create(user_info)
         return user
 
     def get_user(self, user_id):

rootfs/api/pipeline.py

@@ -2,7 +2,15 @@
 
 
 def update_or_create(backend, user, response, *args, **kwargs):
-    UserSerializer.update_or_create(response)
+    user, created = UserSerializer.update_or_create(response)
+
+    if not created:
+        return {'is_new': False}
+
+    return {
+        'is_new': True,
+        'user': user
+    }
 
 
 def load_extra_data(backend, details, response, uid, user, *args, **kwargs):

rootfs/api/serializers.py

@@ -164,7 +164,7 @@ def update_or_create(data):
             user.date_joined = now
             user.set_unusable_password()
         user.save()
-        return user
+        return user, created
 
 
 class AdminUserSerializer(serializers.ModelSerializer):