decouple the admin and api modules

Signed-off-by: Jin Hai <haijin.chn@gmail.com>

Author: JinHai-CN

admin/server/auth.py

@@ -31,9 +31,7 @@
 from api.utils.crypt import decrypt
 from common.misc_utils import get_uuid
 from common.time_utils import current_timestamp, datetime_format, get_format_time
-from api.utils.api_utils import (
-    construct_response,
-)
+from common.connection_utils import construct_response
 
 
 def setup_auth(login_manager):

api/utils/api_utils.py

@@ -27,7 +27,6 @@
 from flask import (
     Response,
     jsonify,
-    make_response,
 )
 from flask_login import current_user
 from flask import (
@@ -194,25 +193,6 @@ def build_error_result(code=RetCode.FORBIDDEN, message="success"):
     return response
 
 
-def construct_response(code=RetCode.SUCCESS, message="success", data=None, auth=None):
-    result_dict = {"code": code, "message": message, "data": data}
-    response_dict = {}
-    for key, value in result_dict.items():
-        if value is None and key != "code":
-            continue
-        else:
-            response_dict[key] = value
-    response = make_response(jsonify(response_dict))
-    if auth:
-        response.headers["Authorization"] = auth
-    response.headers["Access-Control-Allow-Origin"] = "*"
-    response.headers["Access-Control-Allow-Method"] = "*"
-    response.headers["Access-Control-Allow-Headers"] = "*"
-    response.headers["Access-Control-Allow-Headers"] = "*"
-    response.headers["Access-Control-Expose-Headers"] = "Authorization"
-    return response
-
-
 def construct_json_result(code: RetCode = RetCode.SUCCESS, message="success", data=None):
     if data is None:
         return jsonify({"code": code, "message": message})

common/connection_utils.py

@@ -21,6 +21,8 @@
 import asyncio
 import trio
 from functools import wraps
+from flask import make_response, jsonify
+from common.contants import RetCode
 
 TimeoutException = Union[Type[BaseException], BaseException]
 OnTimeoutCallback = Union[Callable[..., Any], Coroutine[Any, Any, Any]]
@@ -99,3 +101,22 @@ async def async_wrapper(*args, **kwargs) -> Any:
         return wrapper
 
     return decorator
+
+
+def construct_response(code=RetCode.SUCCESS, message="success", data=None, auth=None):
+    result_dict = {"code": code, "message": message, "data": data}
+    response_dict = {}
+    for key, value in result_dict.items():
+        if value is None and key != "code":
+            continue
+        else:
+            response_dict[key] = value
+    response = make_response(jsonify(response_dict))
+    if auth:
+        response.headers["Authorization"] = auth
+    response.headers["Access-Control-Allow-Origin"] = "*"
+    response.headers["Access-Control-Allow-Method"] = "*"
+    response.headers["Access-Control-Allow-Headers"] = "*"
+    response.headers["Access-Control-Allow-Headers"] = "*"
+    response.headers["Access-Control-Expose-Headers"] = "Authorization"
+    return response