style(base): extract create method to BaseModel

Author: ruicore

authority/authorize.py

@@ -24,13 +24,14 @@ async def authorize(user: User, device: str = "pc", auto_delete=True) -> str:
         return token
 
     @staticmethod
-    async def revoke(token: str):
+    async def revoke(token: str) -> bool:
         try:
             payload = Token.decode(token)
         except:  # noqa
             pass
         else:
             await redis.execute("DEL", f"{payload.id}-{token}")
+        return True
 
     @staticmethod
     async def revoke_all(user: User):

authority/credentials.py

@@ -18,7 +18,7 @@ class AuthUser(BaseModel):
 
     @property
     def is_authenticated(self) -> bool:
-        return True
+        return self.user_id is not None
 
     @property
     def display_id(self) -> int:

database.sqlite3

@@ -1,9 +1,17 @@
+from typing import TypeVar
+
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
 from settings import SQLITE_URI
 
+engine = create_engine(f'sqlite:///{SQLITE_URI}', convert_unicode=True, echo=False)
+Session = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+session = Session()
+
+T = TypeVar("T")
+
 
 class Base(declarative_base()):
     __abstract__ = True
@@ -12,7 +20,13 @@ def dict(self):
         column_names = self.__table__.columns.keys()
         return {c: getattr(self, c) for c in column_names}
 
+    @classmethod
+    def create(cls, **kwargs):
+        instance = cls(**kwargs)  # noqa
+        return instance.save()
 
-engine = create_engine(f'sqlite:///{SQLITE_URI}', convert_unicode=True, echo=False)
-Session = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-session = Session()
+    def save(self) -> T:
+        """Save the record."""
+        session.add(self)
+        session.commit()
+        return self

orm/base.py

@@ -15,10 +15,7 @@
 async def register(*_, create: dict = None) -> User:
     create_user = CreateUser(**create)
     create_user.password = Password.encode(create_user.password)
-    user = User(**create_user.dict())
-    session.add(user)
-    session.commit()
-    return user
+    return User.create(**create_user.dict())
 
 
 @query.field("login")
@@ -36,8 +33,7 @@ async def login(_, info: GraphQLResolveInfo, id: int, password: str) -> str:
 @login_required
 async def logout(_, info: GraphQLResolveInfo, id: int) -> bool:
     token = info.context["request"].headers[JWT_AUTH_HEADER]
-    await Authorize.revoke(token)
-    return True
+    return await Authorize.revoke(token)
 
 
 @query.field("user")