Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions social_core/backends/evernote.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ def access_token(self, token):
# Evernote returns a 401 error when AuthCanceled
if err.response.status_code == 401:
raise AuthCanceled(self, response=err.response)
else:
raise
raise

def extra_data(self, user, uid, response, details=None, *args, **kwargs):
data = super().extra_data(user, uid, response, details, *args, **kwargs)
Expand Down
3 changes: 1 addition & 2 deletions social_core/backends/facebook.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,7 @@ def auth_complete(self, *args, **kwargs):
if access_token is None:
if self.data.get("error") == "access_denied":
raise AuthCanceled(self)
else:
raise AuthException(self)
raise AuthException(self)
return self.do_auth(access_token, response, *args, **kwargs)

def auth_html(self):
Expand Down
3 changes: 1 addition & 2 deletions social_core/backends/jawbone.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ def process_error(self, data):
if error:
if error == "access_denied":
raise AuthCanceled(self)
else:
raise AuthUnknownError(self, f"Jawbone error was {error}")
raise AuthUnknownError(self, f"Jawbone error was {error}")
return super().process_error(data)

def auth_complete_params(self, state=None):
Expand Down
9 changes: 4 additions & 5 deletions social_core/backends/oauth.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,11 @@ def validate_state(self):
request_state = self.get_request_state()
if not request_state:
raise AuthMissingParameter(self, "state")
elif not state:
if not state:
raise AuthStateMissing(self, "state")
elif not constant_time_compare(request_state, state):
if not constant_time_compare(request_state, state):
raise AuthStateForbidden(self)
else:
return state
return state

def get_redirect_uri(self, state=None):
"""Build redirect with redirect_state parameter."""
Expand Down Expand Up @@ -401,7 +400,7 @@ def process_error(self, data):
if "denied" in data["error"] or "cancelled" in data["error"]:
raise AuthCanceled(self, data.get("error_description", ""))
raise AuthFailed(self, data.get("error_description") or data["error"])
elif "denied" in data:
if "denied" in data:
raise AuthCanceled(self, data["denied"])

@handle_http_errors
Expand Down
6 changes: 3 additions & 3 deletions social_core/backends/open_id.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ def auth_complete(self, *args, **kwargs):
def process_error(self, data):
if not data:
raise AuthException(self, "OpenID relying party endpoint")
elif data.status == FAILURE:
if data.status == FAILURE:
raise AuthFailed(self, data.message)
elif data.status == CANCEL:
if data.status == CANCEL:
raise AuthCanceled(self)
elif data.status != SUCCESS:
if data.status != SUCCESS:
raise AuthUnknownError(self, data.status)

def setup_request(self, params=None):
Expand Down
3 changes: 1 addition & 2 deletions social_core/backends/twitter.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ class TwitterOAuth(BaseOAuth1):
def process_error(self, data):
if "denied" in data:
raise AuthCanceled(self)
else:
super().process_error(data)
super().process_error(data)

def get_user_details(self, response):
"""Return user details from Twitter account"""
Expand Down
3 changes: 1 addition & 2 deletions social_core/backends/vk.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ def user_data(self, access_token, *args, **kwargs):
msg = error.get("error_msg", "Unknown error")
if error.get("error_code") == 5:
raise AuthTokenRevoked(self, msg)
else:
raise AuthException(self, msg)
raise AuthException(self, msg)

if data:
data = data.get("response")[0]
Expand Down
6 changes: 2 additions & 4 deletions social_core/backends/weixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ def auth_complete(self, *args, **kwargs):
except HTTPError as err:
if err.response.status_code == 400:
raise AuthCanceled(self, response=err.response)
else:
raise
raise
except KeyError:
raise AuthUnknownError(self)
if "errcode" in response:
Expand Down Expand Up @@ -166,8 +165,7 @@ def auth_complete(self, *args, **kwargs):
except HTTPError as err:
if err.response.status_code == 400:
raise AuthCanceled(self)
else:
raise
raise
except KeyError:
raise AuthUnknownError(self)

Expand Down
2 changes: 1 addition & 1 deletion social_core/pipeline/social_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def social_user(backend, uid, user=None, *args, **kwargs):
if social:
if user and social.user != user:
raise AuthAlreadyAssociated(backend)
elif not user:
if not user:
user = social.user
return {
"social": social,
Expand Down
7 changes: 3 additions & 4 deletions social_core/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,11 @@ def wrapper(*args, **kwargs):
except requests.HTTPError as err:
if err.response.status_code == 400:
raise AuthCanceled(args[0], response=err.response)
elif err.response.status_code == 401:
if err.response.status_code == 401:
raise AuthForbidden(args[0])
elif err.response.status_code == 503:
if err.response.status_code == 503:
raise AuthUnreachableProvider(args[0])
else:
raise
raise

return wrapper

Expand Down
Loading