Added verify-login #70

kdb-bot/src/bot_api/controller/auth_controller.py

@@ -6,6 +6,8 @@ from flask import request, jsonify, Response
 
 from bot_api.abc.auth_service_abc import AuthServiceABC
 from bot_api.api import Api
+from bot_api.exception.service_error_code_enum import ServiceErrorCode
+from bot_api.exception.service_exception import ServiceException
 from bot_api.filter.auth_user_select_criteria import AuthUserSelectCriteria
 from bot_api.json_processor import JSONProcessor
 from bot_api.logging.api_logger import ApiLogger
@@ -76,6 +78,19 @@ class AuthController:
         result = await self._auth_service.login_async(dto)
         return jsonify(result.to_dict())
 
+    @Route.get(f'{BasePath}/verify-login')
+    async def verify_login(self):
+        token = None
+        result = False
+        if 'Authorization' in request.headers:
+            bearer = request.headers.get('Authorization')
+            token = bearer.split()[1]
+
+        if token is not None:
+            result = self._auth_service.verify_login(token)
+
+        return jsonify(result)
+
     @Route.post(f'{BasePath}/forgot-password/<email>')
     async def forgot_password(self, email: str):
         await self._auth_service.forgot_password_async(email)
@@ -108,7 +123,6 @@ class AuthController:
         return jsonify(result.to_dict())
 
     @Route.post(f'{BasePath}/revoke')
-    @Route.authorize
     async def revoke(self):
         dto: TokenDTO = JSONProcessor.process(TokenDTO, request.get_json(force=True, silent=True))
         await self._auth_service.revoke_async(dto)

kdb-bot/src/bot_api/exception/service_error_code_enum.py

@@ -1,5 +1,7 @@
 from enum import Enum
 
+from werkzeug.exceptions import Unauthorized
+
 
 class ServiceErrorCode(Enum):
 
@@ -17,3 +19,5 @@ class ServiceErrorCode(Enum):
     ConnectionFailed = 8
     Timeout = 9
     MailError = 10
+
+    Unauthorized = 11

kdb-bot/src/bot_api/route/route.py

@@ -1,12 +1,13 @@
 from functools import wraps
 from typing import Optional
 
-from flask import request
+from flask import request, jsonify
 from flask_cors import cross_origin
 
 from bot_api.abc.auth_service_abc import AuthServiceABC
 from bot_api.exception.service_error_code_enum import ServiceErrorCode
 from bot_api.exception.service_exception import ServiceException
+from bot_api.model.error_dto import ErrorDTO
 from bot_data.abc.auth_user_repository_abc import AuthUserRepositoryABC
 
 
@@ -30,14 +31,20 @@ class Route:
                 bearer = request.headers.get('Authorization')
                 token = bearer.split()[1]
 
-            if not token:
-                raise ServiceException(ServiceErrorCode.InvalidData, f'Token not set')
+            if token is None:
+                ex = ServiceException(ServiceErrorCode.Unauthorized, f'Token not set')
+                error = ErrorDTO(ex.error_code, ex.message)
+                return jsonify(error.to_dict()), 401
 
             if cls._auth_users is None or cls._auth is None:
-                raise ServiceException(ServiceErrorCode.InvalidDependencies, f'Authorize is not initialized')
+                ex = ServiceException(ServiceErrorCode.Unauthorized, f'Authorize is not initialized')
+                error = ErrorDTO(ex.error_code, ex.message)
+                return jsonify(error.to_dict()), 401
 
             if not cls._auth.verify_login(token):
-                raise ServiceException(ServiceErrorCode.InvalidUser, f'Token expired')
+                ex = ServiceException(ServiceErrorCode.Unauthorized, f'Token expired')
+                error = ErrorDTO(ex.error_code, ex.message)
+                return jsonify(error.to_dict()), 401
 
             return await f(*args, **kwargs)