lesscode-flask 0.0.85__tar.gz → 0.0.86__tar.gz

{lesscode-flask-0.0.85 → lesscode_flask-0.0.86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.85
+Version: 0.0.86
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode-flask-0.0.85 → lesscode_flask-0.0.86}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.85'
+__version__ = '0.0.86'
 
 import functools
 import logging

{lesscode-flask-0.0.85 → lesscode_flask-0.0.86}/lesscode_flask/setup/__init__.py

@@ -4,12 +4,13 @@ from datetime import datetime
 from importlib import import_module
 from logging.handlers import TimedRotatingFileHandler
 
-from flask import current_app, send_from_directory
+from flask import current_app
 
 from lesscode_flask import download_func_dict
 from lesscode_flask.db import db
 from lesscode_flask.export_data.data_download_handler import convert_page, format_to_table_download, upload_result_url
 from lesscode_flask.log.access_log_handler import AccessLogHandler
+from lesscode_flask.model.user import User
 from lesscode_flask.utils.swagger.swagger_template import split_doc
 from lesscode_flask.utils.swagger.swagger_util import generate_openapi_spec, replace_symbol, get_params_type, \
     get_sample_data
@@ -136,7 +137,7 @@ def setup_login_manager(app):
 
     @login_manager.request_loader
     def request_loader(request):
-        return LoadUser.get_user(request)
+        return User.get_user(request)
 
 
 def setup_swagger(app):

{lesscode-flask-0.0.85 → lesscode_flask-0.0.86}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.85
+Version: 0.0.86
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode-flask-0.0.85 → lesscode_flask-0.0.86}/lesscode_flask.egg-info/SOURCES.txt

@@ -20,7 +20,6 @@ lesscode_flask/model/parameterized_query.py
 lesscode_flask/model/response_result.py
 lesscode_flask/model/user.py
 lesscode_flask/service/access_log_service.py
-lesscode_flask/service/authentication_service.py
 lesscode_flask/service/base_service.py
 lesscode_flask/setting/__init__.py
 lesscode_flask/setup/__init__.py

lesscode-flask-0.0.85/lesscode_flask/service/authentication_service.py

@@ -1,106 +0,0 @@
-import json
-from urllib.parse import unquote
-
-
-from lesscode_flask.model.user import User
-from lesscode_flask.utils.helpers import app_config
-from lesscode_flask.utils.redis.redis_helper import RedisHelper
-
-
-class LoadUser():
-
-    @staticmethod
-    def get_user(request):
-        # 使用token访问的用户
-        if app_config.get("GATEWAY_USER_ENABLE"):
-            user_json = request.headers.get("User", "")
-            if user_json:
-                return LoadUser.get_gateway_user(user_json)
-        # 使用token访问的用户
-        authorization = request.headers.get("Authorization", "")
-        if "Bearer " in authorization:
-            token = request.headers.get("Authorization", "").replace("Bearer ", "")
-            if token:
-                return LoadUser.get_token_user(token)
-        apikey = request.headers.get("app_key")
-        if apikey:
-            # 使用AK访问的接口用户
-            return LoadUser.get_api_user(apikey)
-        # 无任何用户信息返回 匿名用户
-        return User()
-
-    @staticmethod
-    def get_gateway_user(user_json):
-        """
-        网关传输信息中获取用户信息
-        :param apikey:
-        :return:
-        """
-        if user_json:
-            user_dict = json.loads(user_json)
-            if user_dict and isinstance(user_dict, dict):
-                if type(user_dict["roleIds"]) == str:
-                    user_dict["roleIds"] = json.loads(user_dict["roleIds"])
-                user = User(
-                    id=user_dict["id"],
-                    username=user_dict["username"],
-                    display_name=unquote(user_dict["display_name"]),
-                    phone_no=user_dict["phone_no"],
-                    permissions=user_dict.get("permissions", []),
-                    roleIds=user_dict["roleIds"],
-                    client_id=user_dict["client_id"]
-                )
-                return user
-        return User()
-
-    @staticmethod
-    def get_token_user(token):
-        """
-        根据token获取用户信息。
-
-        该函数通过Redis缓存来获取用户信息。如果在缓存中找到了对应的用户数据，
-        则会创建一个User对象并返回；如果没有找到，则返回一个AnonymousUser对象。
-
-        参数:
-        - token (str): 用户的令牌。
-
-        返回:
-        - User: 如果找到了用户信息，则返回一个User对象。
-        - AnonymousUser: 如果没有找到用户信息，则返回一个AnonymousUser对象。
-        """
-        # 生成用户缓存键
-        user_cache_key = f"oauth2:user:{token}"
-
-        # 从Redis中获取用户数据
-        user_dict = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(user_cache_key)
-
-        # 检查是否获取到了用户数据
-        if user_dict:
-            # 创建并返回User对象
-            user = User(
-                id=user_dict.get("id"),
-                username=user_dict.get("username"),
-                display_name=user_dict.get("display_name"),
-                phone_no=user_dict.get("phone_no"),
-                email=user_dict.get("email"),
-                permissions=json.loads(user_dict.get("permissions")) if user_dict.get(
-                    "permissions") is not None else [],
-                client_id=user_dict.get("client_id")
-            )
-            return user
-        return User()
-
-    @staticmethod
-    def get_api_user(apikey):
-        """
-        使用API key 获取用户信息
-        :param apikey:
-        :return:
-        """
-        cache_key = f"oauth2:user:{apikey}"
-        # 优先从缓存中获取
-        user_dict = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(cache_key)
-        if user_dict:
-            user = User.to_user(user_dict)
-            return user
-        return User()