Merge pull request #535 from Lingghh/dev/login_api_opti

🎨完善登录接口异常处理和错误提示

Author: nickcdon

server/projects/login/login/apis/v3.py

@@ -8,8 +8,8 @@
 """
 login - v3 apis
 """
-import logging
 # 原生
+import logging
 import os
 
 # 第三方
@@ -218,7 +218,7 @@ def post(self, request, *args, **kwargs):
                 raise NotAuthenticated("账号或密码不正确")
         except Exception as e:
             logger.exception("OAInfo登录失败: %s" % e)
-            raise ParseError("登录失败，请稍后再试")
+            raise ParseError("登录失败，账户或密码错误或账户未注册")
         return Response(params)
 
 

server/projects/login/login/lib/rendererresponse.py

@@ -16,15 +16,16 @@
 class CustomRenderer(JSONRenderer):
     # 重构render方法
     def render(self, data, accepted_media_type=None, renderer_context=None):
-
         status_code = renderer_context["response"].status_code
         code = 0
         if renderer_context:
             msg = ""
             status = status_code
             if data:
                 if isinstance(data, dict):
-                    msg = data.pop("msg", "success")
+                    msg = data.pop("msg", None)
+                    detail = data.pop("detail", None)
+                    msg = msg or detail or "success"
                     status = data.pop("status", status_code)
                     code = 0
                 elif isinstance(data, list):

server/projects/login/login/middleware/loginmiddleware.py

@@ -51,8 +51,8 @@ def handle_auth_authorization(self, request):
             auth_type = settings.OAUTH_JWT['AUTH_HEADER_TYPES'][0]
             pub_key = settings.OAUTH_JWT['VERIFYING_KEY']
             life_time = settings.OAUTH_JWT['ACCESS_TOKEN_LIFETIME']
-
             now_time = datetime.now()
+
             if auth_type in authorization:
                 access_token = authorization.replace('%s ' % auth_type, '')
                 decoded_jwt = jwt.decode(access_token, pub_key, algorithm='RS256')
@@ -75,7 +75,8 @@ def handle_auth_authorization(self, request):
                 else:
                     request.oauth = None
             else:
+                logger.warning("[auth_type: %s] auth type not in authorization" % auth_type)
                 request.oauth = None
         except Exception as e:
             logger.exception(e)
-            raise e
+            return Response({"exception_message": "鉴权失败", "status": -1})