diff --git a/classquiz/oauth/custom.py b/classquiz/oauth/custom.py index 5d09d6b..2b2f568 100644 --- a/classquiz/oauth/custom.py +++ b/classquiz/oauth/custom.py @@ -47,29 +47,17 @@ class OpenIDResponse(BaseModel): @router.get("/login") async def openid_login(req: Request): - if ( - settings.custom_openid_provider.client_id is None - or settings.custom_openid_provider.client_secret is None - ): - raise HTTPException( - status_code=501, detail="Custom-OAuth-Login isn't available on this server" - ) + if settings.custom_openid_provider.client_id is None or settings.custom_openid_provider.client_secret is None: + raise HTTPException(status_code=501, detail="Custom-OAuth-Login isn't available on this server") oauth = init_oauth() - return await oauth.custom.authorize_redirect( - req, f"{settings.root_address}/api/v1/users/oauth/custom/auth" - ) + return await oauth.custom.authorize_redirect(req, f"{settings.root_address}/api/v1/users/oauth/custom/auth") @router.get("/auth") async def auth(request: Request, response: Response): - if ( - settings.custom_openid_provider.client_id is None - or settings.custom_openid_provider.client_secret is None - ): - raise HTTPException( - status_code=501, detail="Custom-OAuth-Login isn't available on this server" - ) + if settings.custom_openid_provider.client_id is None or settings.custom_openid_provider.client_secret is None: + raise HTTPException(status_code=501, detail="Custom-OAuth-Login isn't available on this server") access_token = request.cookies.get("access_token") rememberme_token = request.cookies.get("rememberme_token") if access_token is not None: @@ -80,9 +68,7 @@ async def auth(request: Request, response: Response): except HTTPException: pass if rememberme_token is not None: - return await rememberme_check( - rememberme_token=rememberme_token, response=response - ) + return await rememberme_check(rememberme_token=rememberme_token, response=response) oauth = init_oauth() user_data = await oauth.custom.authorize_access_token(request) diff --git a/classquiz/oauth/github.py b/classquiz/oauth/github.py index ac15cd1..1382c47 100644 --- a/classquiz/oauth/github.py +++ b/classquiz/oauth/github.py @@ -76,21 +76,15 @@ class GitHubOauthResponse(BaseModel): @router.get("/login") async def github_login(req: Request): if settings.github_client_id is None or settings.github_client_secret is None: - raise HTTPException( - status_code=501, detail="GitHub-Login isn't available on this server" - ) + raise HTTPException(status_code=501, detail="GitHub-Login isn't available on this server") oauth = init_oauth() - return await oauth.github.authorize_redirect( - req, f"{settings.root_address}/api/v1/users/oauth/github/auth" - ) + return await oauth.github.authorize_redirect(req, f"{settings.root_address}/api/v1/users/oauth/github/auth") @router.get("/auth") async def auth(request: Request, response: Response): if settings.github_client_id is None or settings.github_client_secret is None: - raise HTTPException( - status_code=501, detail="GitHub-Login isn't available on this server" - ) + raise HTTPException(status_code=501, detail="GitHub-Login isn't available on this server") access_token = request.cookies.get("access_token") rememberme_token = request.cookies.get("rememberme_token") if access_token is not None: @@ -101,9 +95,7 @@ async def auth(request: Request, response: Response): except HTTPException: pass if rememberme_token is not None: - return await rememberme_check( - rememberme_token=rememberme_token, response=response - ) + return await rememberme_check(rememberme_token=rememberme_token, response=response) oauth = init_oauth() try: token = await oauth.github.authorize_access_token(request) diff --git a/classquiz/oauth/google.py b/classquiz/oauth/google.py index bd141e7..300aa63 100644 --- a/classquiz/oauth/google.py +++ b/classquiz/oauth/google.py @@ -51,22 +51,16 @@ class OauthGoogleResponse(BaseModel): @router.get("/login") async def google_login(req: Request): if settings.google_client_secret is None or settings.google_client_id is None: - raise HTTPException( - status_code=501, detail="Google-Login isn't available on this server" - ) + raise HTTPException(status_code=501, detail="Google-Login isn't available on this server") oauth = init_oauth() - return await oauth.google.authorize_redirect( - req, f"{settings.root_address}/api/v1/users/oauth/google/auth" - ) + return await oauth.google.authorize_redirect(req, f"{settings.root_address}/api/v1/users/oauth/google/auth") @router.get("/auth") async def auth(request: Request, response: Response): if settings.google_client_secret is None or settings.google_client_id is None: - raise HTTPException( - status_code=501, detail="Google-Login isn't available on this server" - ) + raise HTTPException(status_code=501, detail="Google-Login isn't available on this server") access_token = request.cookies.get("access_token") rememberme_token = request.cookies.get("rememberme_token") if access_token is not None: @@ -77,9 +71,7 @@ async def auth(request: Request, response: Response): except HTTPException: pass if rememberme_token is not None: - return await rememberme_check( - rememberme_token=rememberme_token, response=response - ) + return await rememberme_check(rememberme_token=rememberme_token, response=response) oauth = init_oauth() user_data = await oauth.google.authorize_access_token(request) diff --git a/frontend/src/lib/quiz_types.ts b/frontend/src/lib/quiz_types.ts index 2d66073..6aadc17 100644 --- a/frontend/src/lib/quiz_types.ts +++ b/frontend/src/lib/quiz_types.ts @@ -65,12 +65,7 @@ export interface Question { } export type Answers = - | Answer[] - | RangeQuizAnswer - | VotingAnswer[] - | string - | TextQuizAnswer[] - | OrderQuizAnswer[]; + Answer[] | RangeQuizAnswer | VotingAnswer[] | string | TextQuizAnswer[] | OrderQuizAnswer[]; export interface Answer { right: boolean;