refactored

auth/authenticate.py

@@ -1,21 +1,17 @@
 from functools import wraps
 from typing import Optional, Tuple
-
 from datetime import datetime, timedelta
-
 from graphql import GraphQLResolveInfo
 from jwt import DecodeError, ExpiredSignatureError
 from starlette.authentication import AuthenticationBackend
 from starlette.requests import HTTPConnection
-
 from auth.credentials import AuthCredentials, AuthUser
 from auth.jwtcodec import JWTCodec
 from auth.authorize import Authorize, TokenStorage
-from exceptions import InvalidToken, OperationNotAllowed
+from base.exceptions import InvalidToken
 from orm.user import User
 from storages.users import UserStorage
-from orm.base import local_session
-from redis import redis
+from base.orm import local_session
 from settings import JWT_AUTH_HEADER, EMAIL_TOKEN_LIFE_SPAN
 
 

auth/authorize.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 
 from auth.jwtcodec import JWTCodec
-from redis import redis
+from base.redis import redis
 from settings import JWT_LIFE_SPAN
 from auth.validations import User
 

auth/credentials.py

@@ -1,5 +1,4 @@
 from typing import List, Optional, Text
-
 from pydantic import BaseModel
 
 

auth/email.py

@@ -1,9 +1,7 @@
 import requests
 from starlette.responses import RedirectResponse
-from starlette.exceptions import HTTPException
-
 from auth.authenticate import EmailAuthenticate, ResetPassword
-
+from base.orm import local_session
 from settings import BACKEND_URL, MAILGUN_API_KEY, MAILGUN_DOMAIN, RESET_PWD_URL, \
 	CONFIRM_EMAIL_URL, ERROR_URL_ON_FRONTEND
 

auth/identity.py

@@ -1,7 +1,7 @@
 from auth.password import Password
-from exceptions import InvalidPassword, ObjectNotExist
+from base.exceptions import InvalidPassword, ObjectNotExist
 from orm import User as OrmUser
-from orm.base import local_session
+from base.orm import local_session
 from auth.validations import User
 
 from sqlalchemy import or_

auth/oauth.py

@@ -1,8 +1,5 @@
 from authlib.integrations.starlette_client import OAuth
 from starlette.responses import RedirectResponse
-
-from urllib.parse import quote_plus
-
 from auth.authorize import Authorize
 from auth.identity import Identity