1717
1818ALGORITHM = "HS256"
1919
20- reusable_oauth2 = OAuth2PasswordBearer (tokenUrl = f"{ settings .API_V1_STR } /tokens" )
20+ reusable_oauth2 = OAuth2PasswordBearer (
21+ tokenUrl = f"{ settings .API_V1_STR } /tokens" )
2122pwd_context = CryptContext (schemes = ["bcrypt" ], deprecated = "auto" )
2223
2324SessionDep = Annotated [Session , Depends (get_db )]
2728def get_user_from_session (request : Request , session : SessionDep ) -> User :
2829 session_user = request .session .get ("user" )
2930 if not session_user :
30- raise HTTPException (status_code = 401 , detail = "Not authenticated (no session)" )
31+ raise HTTPException (status_code = 401 ,
32+ detail = "Not authenticated (no session)" )
3133
32- user = session .exec (select (User ).where (User .email == session_user ["email" ])).first ()
34+ user = session .exec (select (User ).where (
35+ User .email == session_user ["email" ])).first ()
3336 if not user or not user .is_active :
3437 raise HTTPException (status_code = 401 , detail = "Invalid session user" )
3538 return UserPublic .model_validate (user )
@@ -57,7 +60,8 @@ def get_user_from_token(
5760def get_current_user (
5861 request : Request ,
5962 session : SessionDep ,
60- token : Annotated [str | None , Depends (OAuth2PasswordBearer (tokenUrl = f"{ settings .API_V1_STR } /tokens" , auto_error = False ))] = None ,
63+ token : Annotated [str | None , Depends (OAuth2PasswordBearer (
64+ tokenUrl = f"{ settings .API_V1_STR } /tokens" , auto_error = False ))] = None ,
6165) -> User :
6266 session_user = request .session .get ("user" )
6367 if session_user :
@@ -104,7 +108,11 @@ def get_password_hash(password: str) -> str:
104108 return pwd_context .hash (password )
105109
106110
107- def get_or_create_user_by_email (session : Session , email : str , defaults : dict = {}) -> User :
111+ def get_or_create_user_by_email (
112+ session : Session ,
113+ email : str ,
114+ defaults : dict | None = None ,
115+ ) -> User :
108116 user = session .exec (select (User ).where (User .email == email )).first ()
109117 if user :
110118 return user
@@ -113,4 +121,3 @@ def get_or_create_user_by_email(session: Session, email: str, defaults: dict = {
113121 session .commit ()
114122 session .refresh (user )
115123 return user
116-
0 commit comments