reyserver 1.1.50__py3-none-any.whl → 1.1.51__py3-none-any.whl

reyserver/rauth.py

@@ -9,10 +9,11 @@
 """
 
 
+from typing import Literal
 from fastapi import APIRouter
 from reydb import rorm, DatabaseEngine, DatabaseEngineAsync
-from reykit.rdata import encode_jwt, decode_jwt, hash_bcrypt, is_hash_bcrypt
-from reykit.rtime import now
+# from reykit.rdata import encode_jwt, is_hash_bcrypt
+# from reykit.rtime import now
 
 from .rbase import ServerConfig, Bind, exit_api
 
@@ -72,8 +73,7 @@ class DatabaseORMTablePerm(rorm.Model, table=True):
     perm_id: int = rorm.Field(rorm.types_mysql.SMALLINT(unsigned=True), key_auto=True, comment='Permission ID.')
     name: str = rorm.Field(rorm.types.VARCHAR(50), not_null=True, index_u=True, comment='Permission name.')
     desc: str = rorm.Field(rorm.types.VARCHAR(500), comment='Permission description.')
-    method: str = rorm.Field(rorm.types.VARCHAR(7), comment='API request method regular expression "match" pattern.')
-    path: str = rorm.Field(rorm.types.VARCHAR(1000), comment='API resource path regular expression "match" pattern.')
+    api: str = rorm.Field(rorm.types.VARCHAR(1000), comment='API resource path regular expression "match" pattern.')
 
 
 class DatabaseORMTableUserRole(rorm.Model, table=True):
@@ -202,8 +202,9 @@ depend_auth_conn = Bind.create_depend_db('auth', 'conn')
 
 @auth_router.post('/sessions')
 async def create_sessions(
-    username: str = Bind.body,
-    password: str = Bind.body,
+    account: str = Bind.i.body,
+    password: str = Bind.i.body,
+    account_type: Literal['name', 'email', 'phone'] = Bind.Body('name'),
     conn: Bind.Conn = depend_auth_conn
 ) -> dict:
     """
@@ -211,8 +212,9 @@ async def create_sessions(
 
     Parameters
     ----------
-    username : User name.
+    account : User account, name or email or phone.
     password : User password.
+    account_type : User account type.
 
     Returns
     -------
@@ -221,31 +223,81 @@ async def create_sessions(
 
     # Parameter.
     key = ServerConfig.server.api_auth_key
-    password_hash = hash_bcrypt(password)
+    sess_seconds = ServerConfig.server.api_auth_sess_seconds
 
     # Check.
     sql = (
-        ''
+        'SELECT ANY_VALUE(`create_time`) AS `create_time`,\n'
+        '    ANY_VALUE(`update_time`) AS `update_time`,\n'
+        '    ANY_VALUE(`user`.`user_id`) AS `user_id`,\n'
+        '    ANY_VALUE(`user`.`name`) AS `user_name`,\n'
+        '    ANY_VALUE(`password`) AS `password`,\n'
+        '    ANY_VALUE(`email`) AS `email`,\n'
+        '    ANY_VALUE(`phone`) AS `phone`,\n'
+        '    ANY_VALUE(`avatar`) AS `avatar`,\n'
+        "    GROUP_CONCAT(DISTINCT `role`.`name` SEPARATOR ';') AS `role_names`,\n"
+        "    GROUP_CONCAT(DISTINCT `perm`.`name` SEPARATOR ';') AS `perm_names`,\n"
+        "    GROUP_CONCAT(DISTINCT `perm`.`api` SEPARATOR ';') AS `perm_apis`\n"
+        'FROM (\n'
+        '    SELECT `create_time`, `update_time`, `user_id`, `password`, `name`, `email`, `phone`, `avatar`\n'
+        '    FROM `test`.`user`\n'
+        f'    WHERE `{account_type}` = :account\n'
+        '    LIMIT 1\n'
+        ') as `user`\n'
+        'LEFT JOIN (\n'
+        '    SELECT `user_id`, `role_id`\n'
+        '    FROM `test`.`user_role`\n'
+        ') as `user_role`\n'
+        'ON `user_role`.`user_id` = `user`.`user_id`\n'
+        'LEFT JOIN (\n'
+        '    SELECT `role_id`, `name`\n'
+        '    FROM `test`.`role`\n'
+        ') AS `role`\n'
+        'ON `user_role`.`role_id` = `role`.`role_id`\n'
+        'LEFT JOIN (\n'
+        '    SELECT `role_id`, `perm_id`\n'
+        '    FROM `test`.`role_perm`\n'
+        ') as `role_perm`\n'
+        'ON `role_perm`.`role_id` = `role`.`role_id`\n'
+        'LEFT JOIN (\n'
+        "    SELECT `perm_id`, `name`, CONCAT(`method`, ':', `path`) as `api`\n"
+        '    FROM `test`.`perm`\n'
+        ') AS `perm`\n'
+        'ON `role_perm`.`perm_id` = `perm`.`perm_id`'
     )
+    print(1111111111111)
     result = await conn.execute(
         sql,
-        username=username,
-        password_hash=password_hash
+        account=account
     )
-
-    # Check.
-    if result.empty:
-        exit_api(401)
-
-    # Response.
-    json = {
-        'time': now('timestamp'),
-        'sub': username,
-        'iat': now('timestamp'),
-        'nbf': now('timestamp'),
-        'exp': now('timestamp') + 28800000
-    }
-    token = encode_jwt(json, key)
-    data = {'token': token}
-
-    return data
+    print(result.fetchall())
+    return {'message': 'ok'}
+
+    # # Check.
+    # table = result.to_table()
+    # print(table)
+    # if table == []:
+    #     exit_api(401)
+    # json = table[0]
+    # if not is_hash_bcrypt(password, json['password']):
+    #     exit_api(401)
+
+    # # JWT.
+    # now_timestamp_s = now('timestamp_s')
+    # json['sub'] = json.pop('user_id')
+    # json['iat'] = now_timestamp_s
+    # json['nbf'] = now_timestamp_s
+    # json['exp'] = now_timestamp_s + sess_seconds
+    # json['role_names'] = json['role_names'].split(';')
+    # json['perm_names'] = json['perm_names'].split(';')
+    # perm_apis: list[str] = json['perm_apis'].split(';')
+    # perm_api_dict = {}
+    # for perm_api in perm_apis:
+    #     for method, path in perm_api.split(':', 1):
+    #         paths: list = perm_api_dict.setdefault(method, [])
+    #         paths.append(path)
+    # json['perm_apis'] = perm_api_dict
+    # token = encode_jwt(json, key)
+    # data = {'token': token}
+    # print(111111, data)
+    # return data

reyserver/rbase.py

@@ -26,8 +26,7 @@ from fastapi.params import (
 )
 from reydb.rconn import DatabaseConnectionAsync
 from reydb.rorm import DatabaseORMModel, DatabaseORMSessionAsync
-from reykit.rwrap import wrap_cache
-from reykit.rbase import CoroutineFunctionSimple, Base, Exit, StaticMeta, ConfigMeta, throw
+from reykit.rbase import CoroutineFunctionSimple, Base, Exit, StaticMeta, ConfigMeta, Singleton, throw
 
 from . import rserver
 
@@ -38,7 +37,8 @@ __all__ = (
     'ServerExit',
     'ServerExitAPI',
     'exit_api',
-    'ServerBind'
+    'ServerBind',
+    'Bind'
 )
 
 
@@ -91,6 +91,168 @@ def exit_api(code: int = 400, text: str | None = None) -> NoReturn:
     raise ServerExitAPI(code, text)
 
 
+class ServerBindInstance(ServerBase, Singleton):
+    """
+    Server API bind parameter build instance type.
+    """
+
+
+    @property
+    def path(self) -> Path:
+        """
+        Path instance.
+        """
+
+        # Build.
+        path = Path()
+
+        return path
+
+
+    @property
+    def query(self) -> Query:
+        """
+        Query instance.
+        """
+
+        # Build.
+        query = Query()
+
+        return query
+
+
+    @property
+    def header(self) -> Header:
+        """
+        Header instance.
+        """
+
+        # Build.
+        header = Header()
+
+        return header
+
+
+    @property
+    def cookie(self) -> Cookie:
+        """
+        Cookie instance.
+        """
+
+        # Build.
+        cookie = Cookie()
+
+        return cookie
+
+
+    @property
+    def body(self) -> Body:
+        """
+        Body instance.
+        """
+
+        # Build.
+        body = Body()
+
+        return body
+
+
+    @property
+    def form(self) -> Form:
+        """
+        Form instance.
+        """
+
+        # Build.
+        form = Form()
+
+        return form
+
+
+    @property
+    def forms(self) -> Forms:
+        """
+        Forms instance.
+        """
+
+        # Build.
+        forms = Forms()
+
+        return forms
+
+
+    @property
+    def query_n(self) -> Query:
+        """
+        Query instance, default `None`.
+        """
+
+        # Build.
+        query = Query(None)
+
+        return query
+
+
+    @property
+    def header_n(self) -> Header:
+        """
+        Header instance, default `None`.
+        """
+
+        # Build.
+        header = Header(None)
+
+        return header
+
+
+    @property
+    def cookie_n(self) -> Cookie:
+        """
+        Cookie instance, default `None`.
+        """
+
+        # Build.
+        cookie = Cookie(None)
+
+        return cookie
+
+
+    @property
+    def body_n(self) -> Body:
+        """
+        Body instance, default `None`.
+        """
+
+        # Build.
+        body = Body(None)
+
+        return body
+
+
+    @property
+    def form_n(self) -> Form:
+        """
+        Form instance, default `None`.
+        """
+
+        # Build.
+        form = Form(None)
+
+        return form
+
+
+    @property
+    def forms_n(self) -> Forms:
+        """
+        Forms instance, default `None`.
+        """
+
+        # Build.
+        forms = Forms(None)
+
+        return forms
+
+
 class ServerBind(ServerBase, metaclass=StaticMeta):
     """
     Server API bind parameter type.
@@ -148,7 +310,6 @@ class ServerBind(ServerBase, metaclass=StaticMeta):
         return lifespan
 
 
-    @wrap_cache
     def create_depend_db(database: str, mode: Literal['sess', 'conn']) -> Depends:
         """
         Create dependencie type of asynchronous database.
@@ -201,32 +362,7 @@ class ServerBind(ServerBase, metaclass=StaticMeta):
     JSON = DatabaseORMModel
     Conn = DatabaseConnectionAsync
     Sess = DatabaseORMSessionAsync
-    path = Path()
-    'Path instance.'
-    query = Query()
-    'Query instance.'
-    header = Header()
-    'Header instance.'
-    cookie = Cookie()
-    'Cookie instance.'
-    body = Body()
-    'Body instance.'
-    form = Form()
-    'Form instance.'
-    forms = Forms()
-    'Forms instance.'
-    query_n = Query(None)
-    'Query instance, default `None`.'
-    header_n = Header(None)
-    'Header instance, default `None`.'
-    cookie_n = Cookie(None)
-    'Cookie instance, default `None`.'
-    body_n = Body(None)
-    'Body instance, default `None`.'
-    form_n = Form(None)
-    'Form instance, default `None`.'
-    forms_n = Forms(None)
-    'Forms instance, default `None`.'
+    i = ServerBindInstance()
 
 
 Bind = ServerBind

reyserver/rclient.py

@@ -9,7 +9,7 @@
 """
 
 
-from typing import TypedDict
+from typing import TypedDict, Literal
 from datetime import datetime as Datetime
 from reykit.ros import File, Folder, overload
 from reykit.rnet import join_url, request, get_response_file_name
@@ -44,6 +44,43 @@ class ServerClient(ServerBase):
         self.url = url
 
 
+    def create_session(
+        self,
+        account: str,
+        password: str,
+        account_type: Literal['name', 'email', 'phone'] = 'name'
+    ) -> str:
+        """
+        Create session.
+
+        Parameters
+        ----------
+        account : User account, name or email or phone.
+        password : User password.
+        account_type : User account type.
+
+        Returns
+        -------
+        Token.
+        """
+
+        # Parameter.
+        url = join_url(self.url, 'sessions')
+        json = {
+            'account': account,
+            'password': password,
+            'account_type': account_type
+        }
+
+        # Request.
+        response = request(url, json=json, check=True)
+        response_dict = response.json()
+        print(response_dict)
+        token = response_dict['token']
+
+        return token
+
+
     def upload_file(
         self,
         source: str | bytes,

reyserver/rfile.py

@@ -184,7 +184,7 @@ depend_file_conn = Bind.create_depend_db('file', 'conn')
 
 @file_router.get('/files/{file_id}')
 async def get_file_info(
-    file_id: int = Bind.path,
+    file_id: int = Bind.i.path,
     sess: Bind.Sess = depend_file_sess
 ) -> DatabaseORMTableInfo:
     """
@@ -211,9 +211,9 @@ async def get_file_info(
 
 @file_router.post('/files')
 async def upload_file(
-    file: Bind.File = Bind.forms,
-    name: str = Bind.forms_n,
-    note: str = Bind.forms_n,
+    file: Bind.File = Bind.i.forms,
+    name: str = Bind.i.forms_n,
+    note: str = Bind.i.forms_n,
     sess: Bind.Sess = depend_file_sess
 ) -> DatabaseORMTableInfo:
     """
@@ -265,7 +265,7 @@ async def upload_file(
 
 @file_router.get('/files/{file_id}/download')
 async def download_file(
-    file_id: int = Bind.path,
+    file_id: int = Bind.i.path,
     conn: Bind.Conn = depend_file_conn
 ) -> FileResponse:
     """

reyserver/rserver.py

@@ -105,6 +105,8 @@ class Server(ServerBase, Singleton):
         # API.
         self.api_auth_key: str
         'Authentication API JWT encryption key.'
+        self.api_auth_sess_seconds: int
+        'Authentication API session valid seconds.'
         self.api_file_dir: str
         'File API store directory path.'
 
@@ -190,7 +192,7 @@ class Server(ServerBase, Singleton):
                 setattr(self.app, key, value)
 
 
-    def add_api_auth(self, key: str | None = None) -> None:
+    def add_api_auth(self, key: str | None = None, sess_seconds: int = 28800) -> None:
         """
         Add authentication API.
         Note: must include database engine of `auth` name.
@@ -199,9 +201,10 @@ class Server(ServerBase, Singleton):
         ----------
         key : JWT encryption key.
             - `None`: Random 32 length string.
+        sess_seconds : Session valid seconds.
         """
 
-        from .rauth import build_file_db, auth_router
+        from .rauth import build_auth_db, auth_router
 
         # Parameter.
         if key is None:
@@ -209,10 +212,11 @@ class Server(ServerBase, Singleton):
 
         # Build database.
         engine = self.db.auth
-        build_file_db(engine)
+        build_auth_db(engine)
 
         # Add.
         self.api_auth_key = key
+        self.api_auth_sess_seconds = sess_seconds
         self.app.include_router(auth_router, tags=['auth'])
 
 

{reyserver-1.1.50.dist-info → reyserver-1.1.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reyserver
-Version: 1.1.50
+Version: 1.1.51
 Summary: Backend server method set.
 Project-URL: homepage, https://github.com/reyxbo/reyserver/
 Author-email: Rey <reyxbo@163.com>

reyserver-1.1.51.dist-info/RECORD

@@ -0,0 +1,11 @@
+reyserver/__init__.py,sha256=7GX64p7uI2eetJH9NJ-DTg-8iyQwOsGcviADFJCPxVA,373
+reyserver/rall.py,sha256=riyDRTUsigco_Bee1H4aZFb8IgvjnxdX9qcnVb9i9mE,270
+reyserver/rauth.py,sha256=T2oafUAmXr4WfVYmEHO5v0j9K703KUYLGNVEom0J76Q,11716
+reyserver/rbase.py,sha256=xgdLP_O77e-pSrRWm9GVSziPSqEOh2w20cWkF4HBeWo,7042
+reyserver/rclient.py,sha256=IWZ3smyIP0_YJrfSrM8JFCr0FCtN02AyT3hp8YuSsDQ,5103
+reyserver/rfile.py,sha256=bvuXOYO3UDM1jMiyNzQDz56_0ekZUEIRcfNFAhGgdUY,9010
+reyserver/rserver.py,sha256=gOvLfaLqiDgHcZbzd3h2iIaDtraCuBcmsy1d61TaJ2c,6717
+reyserver-1.1.51.dist-info/METADATA,sha256=F4eENaUB_2lE1aEeV4ZZ_W7AHW7iB6NfPuTsR1fy-8U,1689
+reyserver-1.1.51.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.51.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.51.dist-info/RECORD,,

reyserver-1.1.50.dist-info/RECORD

@@ -1,11 +0,0 @@
-reyserver/__init__.py,sha256=7GX64p7uI2eetJH9NJ-DTg-8iyQwOsGcviADFJCPxVA,373
-reyserver/rall.py,sha256=riyDRTUsigco_Bee1H4aZFb8IgvjnxdX9qcnVb9i9mE,270
-reyserver/rauth.py,sha256=xknFI0IEMJcDRTkmO8jb-4Pbl7QSnQOA8m87D7gU3MM,9228
-reyserver/rbase.py,sha256=IUVkkNsLmQh-QRLX6qtbCjPZAbQAsxoe0goPLCxG9KA,5283
-reyserver/rclient.py,sha256=pTJtn78jPKgFo5EoQwZRdM0cYHdCs7QUKqfl-jUBRgk,4220
-reyserver/rfile.py,sha256=RpMeq0vRStop4RnyjKv4wjdXgJjKPOAKpwPAKpLt0hk,9000
-reyserver/rserver.py,sha256=oOfAc0aM-C561k8mKhF8_gYDmF0Kn6hKyZ5ff6mzPCE,6498
-reyserver-1.1.50.dist-info/METADATA,sha256=iVbZ7pE_k0IlyYw1bsuw5lJIziRJ2CvsRyM4ivSQRi8,1689
-reyserver-1.1.50.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.50.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.50.dist-info/RECORD,,