From 427bf9ebaf66ef692b142f009af7c5ea43b60400 Mon Sep 17 00:00:00 2001 From: Mawoka Date: Sun, 12 Jun 2022 12:05:07 +0200 Subject: [PATCH] :rotating_light: Removed bare except-statement --- classquiz/oauth/github.py | 12 ++++++------ classquiz/oauth/google.py | 9 +++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/classquiz/oauth/github.py b/classquiz/oauth/github.py index 0e1c201..57bb6ed 100644 --- a/classquiz/oauth/github.py +++ b/classquiz/oauth/github.py @@ -3,7 +3,7 @@ from classquiz.config import settings from classquiz.db.models import User, UserAuthTypes from pydantic import BaseModel -from classquiz.auth import check_token +from classquiz.auth import check_token, credentials_exception from classquiz.oauth.authenticate_user import log_user_in, rememberme_check from datetime import datetime from classquiz.oauth.init_oauth import init_oauth @@ -81,15 +81,15 @@ async def auth(request: Request, response: Response): data = await check_token(access_token) if data is not None: return - except: + except HTTPException: pass if rememberme_token is not None: return await rememberme_check(rememberme_token=rememberme_token, response=response) oauth = init_oauth() - try: - token = await oauth.github.authorize_access_token(request) - except: - raise HTTPException(status_code=401, detail="OAuth didn't work!") + # try: + token = await oauth.github.authorize_access_token(request) + # except: + # raise HTTPException(status_code=401, detail="OAuth didn't work!") resp = await oauth.github.get("user", token=token) user_data = GitHubOauthResponse(**resp.json()) user_in_db = await User.objects.get_or_none(email=user_data.email) diff --git a/classquiz/oauth/google.py b/classquiz/oauth/google.py index 233bd33..a4d8a60 100644 --- a/classquiz/oauth/google.py +++ b/classquiz/oauth/google.py @@ -3,7 +3,7 @@ from classquiz.config import settings from classquiz.db.models import User, UserAuthTypes from pydantic import BaseModel, ValidationError -from classquiz.auth import check_token +from classquiz.auth import check_token, credentials_exception from classquiz.oauth.authenticate_user import log_user_in, rememberme_check from classquiz.oauth.init_oauth import init_oauth @@ -59,16 +59,13 @@ async def auth(request: Request, response: Response): data = await check_token(access_token) if data is not None: return - except: + except HTTPException: pass if rememberme_token is not None: return await rememberme_check(rememberme_token=rememberme_token, response=response) oauth = init_oauth() - try: - user_data = await oauth.google.authorize_access_token(request) - except: - raise HTTPException(status_code=401, detail="OAuth didn't work!") + user_data = await oauth.google.authorize_access_token(request) try: user_data = OauthGoogleResponse(**user_data).userinfo except (TypeError, ValidationError):