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
15 changes: 9 additions & 6 deletions social_core/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ def do_auth(backend, redirect_name="next"):
# Check and sanitize a user-defined GET/POST next field value
redirect_uri = data[redirect_name]
if backend.setting("SANITIZE_REDIRECTS", True):
allowed_hosts = backend.setting("ALLOWED_REDIRECT_HOSTS", []) + [
backend.strategy.request_host()
allowed_hosts = [
*backend.setting("ALLOWED_REDIRECT_HOSTS", []),
backend.strategy.request_host(),
]
redirect_uri = sanitize_redirect(allowed_hosts, redirect_uri)
backend.strategy.session_set(
Expand Down Expand Up @@ -105,8 +106,9 @@ def do_complete(backend, login, user=None, redirect_name="next", *args, **kwargs
url += ("&" if "?" in url else "?") + f"{redirect_name}={redirect_value}"

if backend.setting("SANITIZE_REDIRECTS", True):
allowed_hosts = backend.setting("ALLOWED_REDIRECT_HOSTS", []) + [
backend.strategy.request_host()
allowed_hosts = [
*backend.setting("ALLOWED_REDIRECT_HOSTS", []),
backend.strategy.request_host(),
]
url = sanitize_redirect(allowed_hosts, url) or backend.setting(
"LOGIN_REDIRECT_URL"
Expand Down Expand Up @@ -136,8 +138,9 @@ def do_disconnect(
or backend.setting("LOGIN_REDIRECT_URL")
)
if backend.setting("SANITIZE_REDIRECTS", True):
allowed_hosts = backend.setting("ALLOWED_REDIRECT_HOSTS", []) + [
backend.strategy.request_host()
allowed_hosts = [
*backend.setting("ALLOWED_REDIRECT_HOSTS", []),
backend.strategy.request_host(),
]
url = (
sanitize_redirect(allowed_hosts, url)
Expand Down
3 changes: 2 additions & 1 deletion social_core/backends/mendeley.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ class MendeleyOAuth2(MendeleyMixin, BaseOAuth2):
ACCESS_TOKEN_METHOD = "POST"
DEFAULT_SCOPE = ["all"]
REDIRECT_STATE = False
EXTRA_DATA = MendeleyMixin.EXTRA_DATA + [
EXTRA_DATA = [
*MendeleyMixin.EXTRA_DATA,
("refresh_token", "refresh_token"),
("expires_in", "expires_in"),
("token_type", "token_type"),
Expand Down
2 changes: 1 addition & 1 deletion social_core/backends/oauth.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def get_unauthorized_token(self):
def set_unauthorized_token(self):
token = self.unauthorized_token()
name = self.name + self.UNATHORIZED_TOKEN_SUFIX
tokens = self.strategy.session_get(name, []) + [token]
tokens = [*self.strategy.session_get(name, []), token]
self.strategy.session_set(name, tokens)
return token

Expand Down
8 changes: 6 additions & 2 deletions social_core/backends/odnoklassniki.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,12 @@ def get_user_details(self, response):
def auth_complete(self, *args, **kwargs):
self.verify_auth_sig()
response = self.get_response()
fields = ("uid", "first_name", "last_name", "name") + self.setting(
"EXTRA_USER_DATA_LIST", ()
fields = (
"uid",
"first_name",
"last_name",
"name",
*self.setting("EXTRA_USER_DATA_LIST", ()),
)
data = {
"method": "users.getInfo",
Expand Down
9 changes: 7 additions & 2 deletions social_core/backends/professionali.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ def user_data(self, access_token, response, *args, **kwargs):
url = "https://api.professionali.ru/v6/users/get.json"
fields = list(
set(
["firstname", "lastname", "avatar_big", "link"]
+ self.setting("EXTRA_DATA", [])
[
"firstname",
"lastname",
"avatar_big",
"link",
*self.setting("EXTRA_DATA", []),
]
)
)
params = {
Expand Down
3 changes: 2 additions & 1 deletion social_core/backends/vk.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ def user_data(self, access_token, *args, **kwargs):
"screen_name",
"nickname",
"photo",
] + self.setting("EXTRA_DATA", [])
*self.setting("EXTRA_DATA", []),
]

fields = ",".join(set(request_data))
data = vk_api(
Expand Down
2 changes: 1 addition & 1 deletion social_core/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def to_setting_name(*names):


def setting_name(*names):
return to_setting_name(*((SETTING_PREFIX,) + names))
return to_setting_name(*((SETTING_PREFIX, *names)))


def sanitize_redirect(hosts, redirect_to):
Expand Down
Loading