Merge commit '1901846d4f50b431cd3cd7af2298c41eff06110a'

Author: rishubil

backend/flask/app/__init__.py

@@ -3,10 +3,11 @@
 from flask_migrate import Migrate
 from flask_restful import Api
 from flask_sqlalchemy import SQLAlchemy
-from twitch import TwitchClient
+from twitch import TwitchHelix
+from twitch.constants import OAUTH_SCOPE_USER_READ_EMAIL 
 
 from . import config as config
-from .consts import TWITCH_EXTENSION_CLIENT_ID
+from .consts import TWITCH_EXTENSION_CLIENT_ID, TWITCH_EXTENSION_CLIENT_SECRET
 
 app = Flask(__name__, static_folder='/frontend/dist/static', template_folder='/frontend/dist')
 app.config.from_object(config)
@@ -15,7 +16,11 @@
 migrate = Migrate(app, db)
 cors = CORS(app)
 
-twitchClient = TwitchClient(client_id=TWITCH_EXTENSION_CLIENT_ID)
+twitchClient = TwitchHelix(
+    client_id=TWITCH_EXTENSION_CLIENT_ID,
+    client_secret=TWITCH_EXTENSION_CLIENT_SECRET,
+    scopes=[OAUTH_SCOPE_USER_READ_EMAIL]
+)
 
 from . import models
 from . import apis

backend/flask/app/apis/common.py

@@ -75,13 +75,14 @@ def update_twitch_rc(decoded_token, twitch_extension_version, rc):
     }
     token = jwt.encode(token_data, TWITCH_EXTENSION_SECRET).decode("utf-8")
 
-    url = 'https://api.twitch.tv/extensions/' + TWITCH_EXTENSION_CLIENT_ID + '/' + \
-          twitch_extension_version + '/required_configuration?channel_id=' + decoded_token['channel_id']
+    url = 'https://api.twitch.tv/helix/extensions/required_configuration?broadcaster_id=' + decoded_token['channel_id']
 
     r = None
     try:
         r = requests.put(url, data={
-            'required_configuration': ','.join(rc) if rc else 'nope'
+            'required_configuration': ','.join(rc) if rc else 'nope',
+            'extension_id': TWITCH_EXTENSION_CLIENT_ID,
+            'extension_version': twitch_extension_version,
         }, headers={
             'Authorization': 'Bearer ' + token,
             'Client-Id': TWITCH_EXTENSION_CLIENT_ID

backend/flask/app/consts.py

@@ -3,6 +3,7 @@
 from datetime import timedelta
 
 TWITCH_EXTENSION_SECRET = base64.b64decode(os.environ['TWITCH_EXTENSION_SECRET'])
+TWITCH_EXTENSION_CLIENT_SECRET = os.environ['TWITCH_EXTENSION_CLIENT_SECRET']
 TWITCH_EXTENSION_CLIENT_ID = os.environ['TWITCH_EXTENSION_CLIENT_ID']
 TWITCH_EXTENSION_VERSION = os.environ['TWITCH_EXTENSION_VERSION']
 TWITCH_EXTENSION_OWNER_ID = os.environ['TWITCH_EXTENSION_OWNER_ID']

backend/flask/app/utils.py

@@ -1,8 +1,16 @@
 from . import twitchClient
+from requests.exceptions import RequestException
 
 
 def twitch_channel_name_to_id(channel_name):
-    channels = twitchClient.users.translate_usernames_to_ids([channel_name])
+    try:
+        channels = twitchClient.get_users(login_names=channel_name)
+    except RequestException as e:
+        if e.response.status_code != 401:
+            raise e
+        twitchClient.get_oauth()
+        channels = twitchClient.get_users(login_names=channel_name)
+
     if channels and len(channels) > 0:
         channel = channels[0]
         return channel.id

backend/flask/requirements.txt

@@ -6,6 +6,6 @@ Flask-RESTful==0.3.8
 flask-cors==3.0.3
 psycopg2==2.7.3
 PyJWT==1.5.2
-requests==2.18.4
+requests==2.27.1
 uWSGI==2.0.15
-python-twitch-client==0.3.0
+python-twitch-client==0.7.1

settings.env.example

@@ -1,6 +1,7 @@
 API_HOSTNAME=localhost:8088
 POSTGRES_PASSWORD=passwordpassworpasswopasswpasspaspap
 TWITCH_EXTENSION_SECRET=asdf
+TWITCH_EXTENSION_CLIENT_SECRET=asdf
 TWITCH_EXTENSION_CLIENT_ID=asdf
 TWITCH_EXTENSION_VERSION=0.0.1
 TWITCH_EXTENSION_OWNER_ID=0