github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[oauth] use Extractor.request() for HTTP requests (#5433)

Browse Source 
Enables using proxies and general network options.
This commit is contained in:
Mike Fährmann
2024-04-04 20:51:54 +02:00
parent 28a795ca61
commit ef8f02c3d9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gallery_dl/extractor/oauth.py
View File

@@ -110,7 +110,7 @@ class OAuthBase(Extractor):
# get a request token # get a request token
params = {"oauth_callback": self.redirect_uri} params = {"oauth_callback": self.redirect_uri}
data = self.session.get(request_token_url, params=params).text data = self.request(request_token_url, params=params).text
data = text.parse_query(data) data = text.parse_query(data)
self.session.auth.token_secret = data["oauth_token_secret"] self.session.auth.token_secret = data["oauth_token_secret"]
@@ -120,7 +120,7 @@ class OAuthBase(Extractor):
data = self.open(authorize_url, params) data = self.open(authorize_url, params)
# exchange the request token for an access token # exchange the request token for an access token
data = self.session.get(access_token_url, params=data).text data = self.request(access_token_url, params=data).text
data = text.parse_query(data) data = text.parse_query(data)
token = data["oauth_token"] token = data["oauth_token"]
token_secret = data["oauth_token_secret"] token_secret = data["oauth_token_secret"]
@@ -189,7 +189,8 @@ class OAuthBase(Extractor):
data["client_id"] = client_id data["client_id"] = client_id
data["client_secret"] = client_secret data["client_secret"] = client_secret
data = self.session.post(token_url, data=data, auth=auth).json() data = self.request(
token_url, method="POST", data=data, auth=auth).json()
# check token response # check token response
if "error" in data: if "error" in data:
@@ -386,7 +387,7 @@ class OAuthMastodon(OAuthBase):
"redirect_uris": self.redirect_uri, "redirect_uris": self.redirect_uri,
"scopes": "read", "scopes": "read",
} }
data = self.session.post(url, data=data).json() data = self.request(url, method="POST", data=data).json()
if "client_id" not in data or "client_secret" not in data: if "client_id" not in data or "client_secret" not in data:
raise exception.StopExtraction( raise exception.StopExtraction(
@@ -441,7 +442,8 @@ class OAuthPixiv(OAuthBase):
"redirect_uri" : "https://app-api.pixiv.net" "redirect_uri" : "https://app-api.pixiv.net"
"/web/v1/users/auth/pixiv/callback", "/web/v1/users/auth/pixiv/callback",
} }
data = self.session.post(url, headers=headers, data=data).json() data = self.request(
url, method="POST", headers=headers, data=data).json()
if "error" in data: if "error" in data:
stdout_write("\n{}\n".format(data)) stdout_write("\n{}\n".format(data))