re-implement OAuth1.0 code

OAuth support for SmugMug needs some additional features
(auth-rebuild on redirect, query parameters in URL, ...)
and fixing this in the old code wouldn't work all that well.

gallery_dl/extractor/flickr.py

@@ -9,7 +9,7 @@
 """Extract images from https://www.flickr.com/"""
 
 from .common import Extractor, Message
-from .. import text, util, exception
+from .. import text, oauth, util, exception
 
 
 class FlickrExtractor(Extractor):
@@ -264,17 +264,20 @@ class FlickrAPI():
     ]
 
     def __init__(self, extractor):
-        self.api_key = extractor.config("api-key", self.API_KEY)
-        self.api_secret = extractor.config("api-secret", self.API_SECRET)
+        api_key = extractor.config("api-key", self.API_KEY)
+        api_secret = extractor.config("api-secret", self.API_SECRET)
         token = extractor.config("access-token")
         token_secret = extractor.config("access-token-secret")
-        if token and token_secret:
-            self.session = util.OAuthSession(
-                extractor.session,
-                self.api_key, self.api_secret, token, token_secret)
+
+        if api_key and api_secret and token and token_secret:
+            self.session = oauth.OAuth1Session(
+                api_key, api_secret,
+                token, token_secret,
+            )
             self.api_key = None
         else:
             self.session = extractor.session
+            self.api_key = api_key
 
         self.maxsize = extractor.config("size-max")
         if isinstance(self.maxsize, str):

gallery_dl/extractor/oauth.py

@@ -10,7 +10,7 @@
 
 from .common import Extractor, Message
 from . import deviantart, flickr, reddit, tumblr
-from .. import text, util, config
+from .. import text, oauth, config
 import os
 import urllib.parse
 
@@ -70,21 +70,19 @@ class OAuthBase(Extractor):
     def _oauth1_authorization_flow(
             self, request_token_url, authorize_url, access_token_url):
         """Perform the OAuth 1.0a authorization flow"""
-        del self.session.params["oauth_token"]
-
         # get a request token
         params = {"oauth_callback": self.redirect_uri}
         data = self.session.get(request_token_url, params=params).text
 
         data = text.parse_query(data)
-        self.session.params["oauth_token"] = token = data["oauth_token"]
-        self.session.token_secret = data["oauth_token_secret"]
+        self.session.auth.token_secret = data["oauth_token_secret"]
 
         # get the user's authorization
-        params = {"oauth_token": token, "perms": "read"}
+        params = {"oauth_token": data["oauth_token"], "perms": "read"}
         data = self.open(authorize_url, params)
 
         # exchange the request token for an access token
+        # self.session.token = data["oauth_token"]
         data = self.session.get(access_token_url, params=data).text
 
         data = text.parse_query(data)
@@ -101,7 +99,7 @@ class OAuthBase(Extractor):
 
         state = "gallery-dl_{}_{}".format(
             self.subcategory,
-            util.OAuthSession.nonce(8)
+            oauth.nonce(8),
         )
 
         auth_params = {
@@ -182,8 +180,7 @@ class OAuthFlickr(OAuthBase):
 
     def __init__(self, match):
         OAuthBase.__init__(self, match)
-        self.session = util.OAuthSession(
-            self.session,
+        self.session = oauth.OAuth1Session(
             self.oauth_config("api-key", flickr.FlickrAPI.API_KEY),
             self.oauth_config("api-secret", flickr.FlickrAPI.API_SECRET),
         )
@@ -221,8 +218,7 @@ class OAuthTumblr(OAuthBase):
 
     def __init__(self, match):
         OAuthBase.__init__(self, match)
-        self.session = util.OAuthSession(
-            self.session,
+        self.session = oauth.OAuth1Session(
             self.oauth_config("api-key", tumblr.TumblrAPI.API_KEY),
             self.oauth_config("api-secret", tumblr.TumblrAPI.API_SECRET),
         )

gallery_dl/extractor/smugmug.py

@@ -9,7 +9,7 @@
 """Extract images from https://www.smugmug.com/"""
 
 from .common import Extractor, Message
-from .. import text, util, exception
+from .. import text, oauth, exception
 
 BASE_PATTERN = (
     r"(?:smugmug:(?!album:)(?:https?://)?([^/]+)|"
@@ -186,8 +186,7 @@ class SmugmugAPI():
         token_secret = extractor.config("access-token-secret")
 
         if api_key and api_secret and token and token_secret:
-            self.session = util.OAuthSession(
-                extractor.session,
+            self.session = oauth.OAuth1Session(
                 api_key, api_secret,
                 token, token_secret,
             )

gallery_dl/extractor/tumblr.py

@@ -9,7 +9,7 @@
 """Extract images from https://www.tumblr.com/"""
 
 from .common import Extractor, Message
-from .. import text, util, exception
+from .. import text, oauth, exception
 from datetime import datetime, timedelta
 import re
 import time
@@ -261,8 +261,7 @@ class TumblrAPI():
         token_secret = extractor.config("access-token-secret")
 
         if api_key and api_secret and token and token_secret:
-            self.session = util.OAuthSession(
-                extractor.session,
+            self.session = oauth.OAuth1Session(
                 api_key, api_secret,
                 token, token_secret,
             )