登录接口返回数据添加登录类型字段

Controller/UserController.py

@@ -1765,6 +1765,11 @@ class v3LoginView(TemplateView):
         tko = TokenObject()
         res = tko.generate(
             data={'userID': userID, 'lang': response.lang, 'user': users['username'], 'm_code': '123413243214'})
+        oauth_qs = UserOauth2Model.objects.filter(userID__userID=userID)
+        auth_type = 0
+        if oauth_qs.exists():
+            auth_type = oauth_qs[0].authType
+
         if tko.code == 0:
             now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
             user_qs.update(last_login=now_time, language=response.lang)
@@ -1783,8 +1788,9 @@ class v3LoginView(TemplateView):
             res['username'] = users['username'] if users['username'] is not None else ''
             res['userEmail'] = users['userEmail'] if users['userEmail'] is not None else ''
             res['phone'] = users['phone'] if users['phone'] is not None else ''
-            res['fingerprint_enable'] = users['fingerprint_enable']
-            res['fingerprint_key'] = CommonService.encode_data(content=users['fingerprint_key'], start=2)
+            # res['fingerprint_enable'] = users['fingerprint_enable']
+            # res['fingerprint_key'] = CommonService.encode_data(content=users['fingerprint_key'], start=2)
+            res['authType'] = auth_type
             return response.json(0, res)
         else:
             return response.json(tko.code)
@@ -2034,6 +2040,12 @@ class wxAuthSignView(TemplateView):
         res['userEmail'] = user_list[0]["userEmail"] if user_list[0]["userEmail"] is not None else ''
         res['phone'] = user_list[0]["phone"] if user_list[0]["phone"] is not None else ''
         print(res)
+        # 添加用户登录类型
+        oauth_qs = UserOauth2Model.objects.filter(userID__userID=userID)
+        auth_type = 0
+        if oauth_qs.exists():
+            auth_type = oauth_qs[0].authType
+        res['authType'] = auth_type
         user_qs.update(last_login=now_time, online=True)
         return response.json(0, res)
 
@@ -3150,6 +3162,12 @@ class v3LoginByCodeView(View):
         res = tko.generate(
             data={'userID': userID, 'lang': response.lang, 'user': users['username'],
                   'm_code': '123413243214'})
+        # 添加用户登录类型
+        oauth_qs = UserOauth2Model.objects.filter(userID__userID=userID)
+        auth_type = 0
+        if oauth_qs.exists():
+            auth_type = oauth_qs[0].authType
+
         if tko.code == 0:
             now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
             user_qs.update(last_login=now_time, language=response.lang)
@@ -3168,6 +3186,7 @@ class v3LoginByCodeView(View):
             res['username'] = users['username'] if users['username'] is not None else ''
             res['userEmail'] = users['userEmail'] if users['userEmail'] is not None else ''
             res['phone'] = users['phone'] if users['phone'] is not None else ''
+            res['authType'] = auth_type
             return response.json(0, res)
         else:
             return response.json(tko.code)
@@ -3384,6 +3403,12 @@ class AppleAuthLogin(View):
         res['userEmail'] = user_list[0]["userEmail"] if user_list[0]["userEmail"] is not None else ''
         res['phone'] = user_list[0]["phone"] if user_list[0]["phone"] is not None else ''
         print(res)
+        # 添加用户登录类型
+        oauth_qs = UserOauth2Model.objects.filter(userID__userID=userID)
+        auth_type = 0
+        if oauth_qs.exists():
+            auth_type = oauth_qs[0].authType
+        res['authType'] = auth_type
         user_qs.update(last_login=now_time, online=True)
         return response.json(0, res)