diff --git a/api/src/dooris_api/app.py b/api/src/dooris_api/app.py index 8fc9dad..27f581a 100644 --- a/api/src/dooris_api/app.py +++ b/api/src/dooris_api/app.py @@ -65,22 +65,13 @@ app.add_exception_handler( async def get_user_info( req: Request, current_user: deps.CurrentUser ) -> models.UserStatus: - if current_user is None: - return models.UserStatus( - is_logged_in=False, - is_authorized=False, - username=None, - guaranteed_session_until=None, - ) - else: - return models.UserStatus( - is_logged_in=True, - is_authorized=current_user.may_operate_locks, - guaranteed_session_until=datetime.fromtimestamp( - current_user.id_token.exp, UTC - ), - username=current_user.id_token.preferred_username, - ) + return models.UserStatus( + is_authorized=current_user.may_operate_locks, + guaranteed_session_until=datetime.fromtimestamp( + current_user.id_token.exp, UTC + ), + username=current_user.id_token.preferred_username, + ) @app.get("/auth/login", tags=["auth"], response_class=RedirectResponse, status_code=302) diff --git a/api/src/dooris_api/models.py b/api/src/dooris_api/models.py index cab53f2..eac83dd 100644 --- a/api/src/dooris_api/models.py +++ b/api/src/dooris_api/models.py @@ -41,7 +41,6 @@ class CurrentUser(BaseModel): class UserStatus(BaseModel): - is_logged_in: bool is_authorized: bool guaranteed_session_until: Optional[datetime] username: Optional[str]