Skip to content

Commit 0aa6bb0

Browse files
amisadminamisadmin
committed
style: reformat code
1 parent ff22cf6 commit 0aa6bb0

File tree

14 files changed

+58
-46
lines changed

14 files changed

+58
-46
lines changed

‎fastapi_user_auth/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
__version__ = "0.0.23"
2-
__url__ = "https://github.com/amisadmin/fastapi-user-auth"
2+
__url__ = "https://github.com/amisadmin/fastapi-user-auth"

‎fastapi_user_auth/admin.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from typing import Dict, Any, Type, Callable
2+
23
from fastapi import Depends, HTTPException
34
from fastapi_amis_admin.amis.components import ActionType, Action, ButtonToolbar, Form, Html, Grid, Page, Horizontal, \
45
PageSchema
@@ -10,6 +11,7 @@
1011
from starlette import status
1112
from starlette.requests import Request
1213
from starlette.responses import Response
14+
1315
from fastapi_user_auth.auth import Auth
1416
from fastapi_user_auth.auth.models import BaseUser, User, Group, Permission, Role
1517
from fastapi_user_auth.auth.schemas import UserLoginOut
@@ -32,8 +34,8 @@ class UserLoginFormAdmin(FormAdmin):
3234
page_schema = None
3335

3436
async def handle(self, request: Request,
35-
data: "self.schema", # type:ignore
36-
**kwargs) -> BaseApiOut["self.schema_submit_out"]: # type:ignore
37+
data: BaseModel, # self.schema
38+
**kwargs) -> BaseApiOut[BaseModel]: # self.schema_submit_out
3739
if request.user:
3840
return BaseApiOut(code=1, msg='用户已登录', data=self.schema_submit_out.parse_obj(request.user))
3941
user = await request.auth.authenticate_user(username=data.username, password=data.password) # type:ignore
@@ -98,12 +100,12 @@ class UserRegFormAdmin(FormAdmin):
98100
page_schema = None
99101

100102
async def handle(self, request: Request,
101-
data: "self.schema", # type:ignore
102-
**kwargs) -> BaseApiOut["self.schema_submit_out"]: # type:ignore
103+
data: BaseModel, # self.schema
104+
**kwargs) -> BaseApiOut[BaseModel]: # self.schema_submit_out
103105
user = await request.auth.get_user_by_username(data.username)
104106
if user:
105107
return BaseApiOut(status=-1, msg='用户名已注册!', data=None)
106-
user = await request.auth.get_user_by_whereclause(self.user_model.email == data.email)
108+
user = await request.auth.get_user_by_whereclause(self.user_model.email == data.email)
107109
if user:
108110
return BaseApiOut(status=-2, msg='邮箱已注册!', data=None)
109111
user = self.user_model.parse_obj(data)

‎fastapi_user_auth/app.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
from typing import Type
2+
23
from fastapi_amis_admin.amis.components import PageSchema
34
from fastapi_amis_admin.amis_admin.admin import AdminApp, ModelAdmin
45
from fastapi_amis_admin.crud.utils import schema_create_by_schema
56
from starlette.requests import Request
7+
68
from fastapi_user_auth.admin import UserLoginFormAdmin, GroupAdmin, PermissionAdmin, UserAdmin, \
7-
UserRegFormAdmin, RoleAdmin, UserInfoFormAdmin
9+
UserRegFormAdmin, RoleAdmin, UserInfoFormAdmin # noqa F401
810
from fastapi_user_auth.auth import AuthRouter
911

1012

@@ -24,28 +26,26 @@ def __init__(self, app: "AdminApp"):
2426
AdminApp.__init__(self, app)
2527
AuthRouter.__init__(self)
2628
self.UserAdmin.model = self.UserAdmin.model or self.auth.user_model
27-
self.UserLoginFormAdmin.schema = self.UserLoginFormAdmin.schema \
28-
or schema_create_by_schema(self.auth.user_model, 'UserLoginIn',
29-
include={'username', 'password'})
29+
self.UserLoginFormAdmin.schema = self.UserLoginFormAdmin.schema or schema_create_by_schema(
30+
self.auth.user_model, 'UserLoginIn', include={'username', 'password'})
3031
self.UserLoginFormAdmin.schema_submit_out = self.UserLoginFormAdmin.schema_submit_out or self.schema_user_login_out
31-
self.UserRegFormAdmin.schema = self.UserRegFormAdmin.schema \
32-
or schema_create_by_schema(self.auth.user_model, 'UserRegIn',
33-
include={'username', 'password', 'email'})
32+
self.UserRegFormAdmin.schema = self.UserRegFormAdmin.schema or schema_create_by_schema(
33+
self.auth.user_model, 'UserRegIn', include={'username', 'password', 'email'})
3434
self.UserRegFormAdmin.schema_submit_out = self.UserRegFormAdmin.schema_submit_out or self.schema_user_login_out
35-
self.UserInfoFormAdmin.schema = self.UserInfoFormAdmin.schema \
36-
or schema_create_by_schema(self.auth.user_model, 'UserInfoForm',
37-
exclude={'id', 'username', 'password', 'is_active',
38-
'parent_id', 'point', 'create_time'})
35+
self.UserInfoFormAdmin.schema = self.UserInfoFormAdmin.schema or schema_create_by_schema(
36+
self.auth.user_model, 'UserInfoForm', exclude={
37+
'id', 'username', 'password', 'is_active', 'parent_id', 'point', 'create_time'})
3938
self.UserInfoFormAdmin.schema_submit_out = self.UserInfoFormAdmin.schema_submit_out or self.schema_user_info
4039
# register admin
41-
self.register_admin(self.UserLoginFormAdmin,
42-
self.UserRegFormAdmin,
43-
self.UserInfoFormAdmin,
44-
self.UserAdmin,
45-
self.RoleAdmin,
46-
self.GroupAdmin,
47-
self.PermissionAdmin
48-
)
40+
self.register_admin(
41+
self.UserLoginFormAdmin,
42+
self.UserRegFormAdmin,
43+
self.UserInfoFormAdmin,
44+
self.UserAdmin,
45+
self.RoleAdmin,
46+
self.GroupAdmin,
47+
self.PermissionAdmin
48+
)
4949

5050
async def has_page_permission(self, request: Request) -> bool:
5151
return (await super().has_page_permission(request)

‎fastapi_user_auth/auth/auth.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import inspect
44
from collections.abc import Coroutine
55
from typing import Type, Any, TypeVar, Optional, Sequence, Tuple, Union, Callable, Generic
6+
67
from fastapi import FastAPI, HTTPException, Depends, Form
78
from fastapi.security import OAuth2PasswordBearer
89
from fastapi.security.utils import get_authorization_scheme_param
@@ -20,10 +21,10 @@
2021
from starlette.requests import HTTPConnection, Request
2122
from starlette.responses import RedirectResponse, Response
2223
from starlette.websockets import WebSocket
23-
from fastapi_user_auth.auth.models import Role, UserRoleLink
24+
2425
from .backends.base import BaseTokenStore
2526
from .backends.db import DbTokenStore
26-
from .models import BaseUser, User
27+
from .models import BaseUser, User, Role, UserRoleLink
2728
from .schemas import UserLoginOut
2829

2930
_UserModelT = TypeVar("_UserModelT", bound=BaseUser)
@@ -233,8 +234,8 @@ def __init__(self, auth: Auth = None):
233234
assert self.auth, 'auth is None'
234235
RouterMixin.__init__(self)
235236
self.router.dependencies.insert(0, Depends(self.auth.backend.authenticate))
236-
self.schema_user_info = self.schema_user_info \
237-
or schema_create_by_schema(self.auth.user_model, 'UserInfo', exclude={'password'})
237+
self.schema_user_info = self.schema_user_info or schema_create_by_schema(
238+
self.auth.user_model, 'UserInfo', exclude={'password'})
238239

239240
self.router.add_api_route('/userinfo', self.route_userinfo, methods=["GET"], description='用户信息',
240241
dependencies=None, response_model=BaseApiOut[self.schema_user_info])
@@ -265,7 +266,7 @@ async def user_logout(request: Request, response: Response):
265266
token_value = request.auth.backend.get_user_token(request=request)
266267
try:
267268
await self.auth.backend.token_store.destroy_token(token=token_value)
268-
except Exception as e: # jwt
269+
except Exception: # jwt
269270
pass
270271
response.delete_cookie('Authorization')
271272
return RedirectResponse(url='/')

‎fastapi_user_auth/auth/backends/db.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class TokenStoreModel(SQLModelTable, table=True):
1717
create_time: datetime = Field(default_factory=datetime.utcnow)
1818

1919

20-
2120
class DbTokenStore(BaseTokenStore):
2221
def __init__(self, db: SqlalchemyAsyncClient,
2322
expire_seconds: Optional[int] = 60 * 60 * 24 * 3,

‎fastapi_user_auth/auth/backends/jwt.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from datetime import timedelta, datetime
2-
from typing import Generic, List, Optional, Union
2+
from typing import Optional, Union
3+
34
from jose import jwt, JWTError
5+
46
from ..backends.base import BaseTokenStore, _TokenDataSchemaT
57

68

‎fastapi_user_auth/auth/backends/redis.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import secrets
2+
from typing import Optional, Union
3+
24
from aioredis import Redis
3-
from typing import Generic, Optional, Union
5+
46
from ..backends.base import BaseTokenStore, _TokenDataSchemaT
57

68

@@ -26,5 +28,5 @@ async def write_token(self, token_data: Union[_TokenDataSchemaT, dict]) -> str:
2628
async def destroy_token(self, token: str) -> None:
2729
await self.redis.delete(self.get_key(token))
2830

29-
def get_key(self, token:str):
31+
def get_key(self, token: str):
3032
return f'auth:token:{token}'

‎fastapi_user_auth/auth/models.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from datetime import datetime
22
from typing import Optional, List, Any
3+
34
from fastapi_amis_admin.amis.components import InputImage, ColumnImage
45
from fastapi_amis_admin.models.fields import Field
56
from pydantic import EmailStr, SecretStr

‎fastapi_user_auth/auth/schemas.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from pydantic import validator, SecretStr, BaseModel
22
from sqlmodel import Field
3+
34
from .models import UserUsername, UserPassword, UserEmail, BaseUser
45

56

‎fastapi_user_auth/site.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from typing import Type
2+
23
from fastapi import FastAPI
34
from fastapi_amis_admin.amis.components import Flex, App, Service, ActionType, Dialog
45
from fastapi_amis_admin.amis.constants import SizeEnum
@@ -7,6 +8,7 @@
78
from fastapi_amis_admin.amis_admin.site import AdminSite
89
from sqlalchemy.ext.asyncio import AsyncEngine
910
from starlette.requests import Request
11+
1012
from fastapi_user_auth.app import UserAuthApp
1113
from fastapi_user_auth.auth import Auth
1214

0 commit comments

Comments
 (0)