refactor oauth for inclusion of helix

- adds MobileClient().prepare_token_uri() for generating app access tokens, adds client_secret requirement
- adds MobileClient().prepare_revoke_uri() for revoking oauth tokens
- adds helix oauth scopes
- twitch.scopes -> twitch.oauth.<api version>.scopes
- twitch.oauth.MobileClient() -> twitch.oauth.clients.MobileClient()

Author: anxdpanic

resources/lib/twitch/__init__.py

@@ -2,4 +2,5 @@
 
 VERSION = '1.3.0'
 CLIENT_ID = ''
+CLIENT_SECRET = ''
 OAUTH_TOKEN = ''

resources/lib/twitch/oauth/__init__.py

@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+
+from twitch.oauth import v5  # V5 is deprecated and will be removed entirely on 2/14/18
+from twitch.oauth import helix
+from twitch.oauth import v5 as default
+from twitch.oauth import clients
+
+__all__ = ['v5', 'default', 'helix', 'clients']

resources/lib/twitch/oauth.py resources/lib/twitch/oauth/clients.pyresources/lib/twitch/oauth.py renamed to resources/lib/twitch/oauth/clients.py

@@ -1,15 +1,16 @@
 # -*- encoding: utf-8 -*-
 
-from twitch import CLIENT_ID
-from twitch import scopes
+from twitch import CLIENT_ID, CLIENT_SECRET
+
 from six.moves.urllib_parse import urlsplit, urlencode
 
 
 class MobileClient:
-    _auth_base_url = 'https://api.twitch.tv/kraken/oauth2/authorize'
+    _base_url = 'https://api.twitch.tv/kraken/oauth2/{0}'
 
-    def __init__(self, client_id=''):
+    def __init__(self, client_id='', client_secret=''):
         self.client_id = client_id if client_id else CLIENT_ID
+        self.client_secret = client_secret if client_secret else CLIENT_SECRET
 
     def prepare_request_uri(self, redirect_uri='http://localhost:3000/', scope=list(), force_verify=False, state=''):
         params = {'response_type': 'token',
@@ -19,7 +20,22 @@ def prepare_request_uri(self, redirect_uri='http://localhost:3000/', scope=list(
                   'force_verify': str(force_verify).lower(),
                   'state': state}
         params = urlencode(params)
-        url = '{base_uri}?{params}'.format(base_uri=self._auth_base_url, params=params)
+        url = '{base_uri}?{params}'.format(base_uri=self._base_url.format('authorize'), params=params)
+        return url
+
+    def prepare_token_uri(self, scope=list()):
+        params = {'client_id': self.client_id,
+                  'client_secret': self.client_secret,
+                  'scope': ' '.join(scope)}
+        params = urlencode(params)
+        url = '{base_uri}?{params}'.format(base_uri=self._base_url.format('token'), params=params)
+        return url
+
+    def prepare_revoke_uri(self, token):
+        params = {'client_id': self.client_id,
+                  'token': token}
+        params = urlencode(params)
+        url = '{base_uri}?{params}'.format(base_uri=self._base_url.format('revoke'), params=params)
         return url
 
     @staticmethod

resources/lib/twitch/oauth/helix/__init__.py

@@ -0,0 +1,3 @@
+# -*- encoding: utf-8 -*-
+
+from twitch.oauth.helix import scopes

resources/lib/twitch/oauth/helix/scopes.py

@@ -0,0 +1,10 @@
+# -*- encoding: utf-8 -*-
+# https://dev.twitch.tv/docs/authentication#scopes
+"""
+    scopes
+
+    string constants
+"""
+
+user_edit = 'user:edit'  # Manage a user object.
+user_read_email = 'user:read:email'  # Read authorized user's email address.

resources/lib/twitch/oauth/v5/__init__.py

@@ -0,0 +1,3 @@
+# -*- encoding: utf-8 -*-
+
+from twitch.oauth.v5 import scopes

resources/lib/twitch/oauth/v5/scopes.py

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+# https://dev.twitch.tv/docs/authentication#scopes
+"""
+    scopes
+
+    string constants
+"""
+
+user_read = 'user_read'  # Read nonpublic user information, like email address.
+user_blocks_edit = 'user_blocks_edit'  # Turn on/off ignoring a user. Ignoring a user means you cannot see him type, receive messages from him, etc.
+user_blocks_read = 'user_blocks_read'  # Read a user’s list of ignored users.
+user_follows_edit = 'user_follows_edit'  # Manage a user’s followed channels.
+channel_read = 'channel_read'  # Read nonpublic channel information, including email address and stream key.
+channel_editor = 'channel_editor'  # Write channel metadata (game, status, etc).
+channel_commercial = 'channel_commercial'  # Trigger commercials on channel.
+channel_stream = 'channel_stream'  # Reset a channel’s stream key.
+channel_subscriptions = 'channel_subscriptions'  # Read all subscribers to your channel.
+user_subscriptions = 'user_subscriptions'  # Read a user’s subscriptions.
+channel_check_subscription = 'channel_check_subscription'  # Read whether a user is subscribed to your channel.
+chat_login = 'chat_login'  # Log into chat and send messages.
+channel_feed_read = 'channel_feed_read'  # View a channel feed.
+channel_feed_edit = 'channel_feed_edit'  # Add posts and reactions to a channel feed.
+collections_edit = 'collections_edit'  # Manage a user's collections (of videos).
+communities_edit = 'communities_edit'  # Manage a user's communities.
+communities_moderate = 'communities_moderate'  # Manage community moderators.
+viewing_activity_read = 'viewing_activity_read'  # Turn on Viewer Heartbeat Service ability to record user data.
+openid = 'openid'  # Use OpenID Connect authentication.