Fix typo and clean up some other bits

slmnio · Oct 16, 2022 · 2229750 · 2229750
1 parent f7a2c07
commit 2229750
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/server/src/action-utils.js b/server/src/action-utils.js
@@ -74,8 +74,8 @@ async function createRecord(Cache, tableName, records) {
         newRecords.forEach(record => {
             Cache.set(cleanID(record.id), deAirtable(record.fields), { eager: true });
         });
-        console.log(newRecords.length);
-        console.log(newRecords);
+        // console.log(newRecords.length);
+        // console.log(newRecords);
     } catch (e) {
         console.error("Airtable create failed", e);
         return { error: true, errorMessage: e.message };

diff --git a/server/src/routes.js b/server/src/routes.js
@@ -308,7 +308,7 @@ module.exports = ({ app, cors, Cache, io }) => {
         if (!TwitchEnvSet) return res.status(503).send({ error: true, message: "Twitch authentication is disabled on the server." });
         let state = createState();
         states[state] = req.params.scopes;
-        res.redirect(`https://id.twitch.tv/oauth2/authorize?client_id=${process.env.TWITCH_CLIENT_ID}&redirect_uri=${process.env.TWITCH_REDIRECT_URI}&response_type=code&scope=${req.params.scopes}&force_verify=true`);
+        res.redirect(`https://id.twitch.tv/oauth2/authorize?client_id=${process.env.TWITCH_CLIENT_ID}&redirect_uri=${process.env.TWITCH_REDIRECT_URI}&response_type=code&scope=${req.params.scopes}&force_verify=true&state=${state}`);
     });
 
 
@@ -332,25 +332,29 @@ module.exports = ({ app, cors, Cache, io }) => {
             if (existingChannel) {
                 airtableResponse = await updateRecord(Cache, "Channels", existingChannel.id, {
                     "Twitch Refresh Token": tokenInfo.accessToken,
-                    "Twitch Scopes": tokenInfo.scopes.join(" "),
+                    "Twitch Scopes": tokenInfo.scope.join(" "),
                     "Channel ID": tokenInfo.userId,
                     "Name": tokenInfo.userName
                 });
+
             } else {
                 airtableResponse = await createRecord(Cache, "Channels", [{
                     "Twitch Refresh Token": tokenInfo.accessToken,
-                    "Twitch Scopes": tokenInfo.scopes.join(" "),
+                    "Twitch Scopes": tokenInfo.scope.join(" "),
                     "Channel ID": tokenInfo.userId,
                     "Name": tokenInfo.userName
                 }]);
             }
 
             // console.log(airtableResponse);
 
-            return res.send("okay thanks");
+            if (airtableResponse.error) {
+                return res.status(400).send({ error: true, errorMessage: airtableResponse.errorMessage });
+            }
+            return res.send("poggers thanks");
         } catch (e) {
             console.error("[Twitch Auth] error", e);
-            res.status(400).send({ error: true, errorMessage: e.message});
+            res.status(400).send({ error: true, errorMessage: e.message });
         }
     });
 

diff --git a/website/src/components/website/TwitchAuthScopeSelector.vue b/website/src/components/website/TwitchAuthScopeSelector.vue
@@ -32,7 +32,7 @@ export default {
                 value: "channel:manage:predictions channel:read:predictions"
             },
             {
-                text: "Title (channel:manage:broadcast)",
+                text: "Title/Game (channel:manage:broadcast)",
                 value: "channel:manage:broadcast"
             },
             {

diff --git a/website/src/router/default.js b/website/src/router/default.js
@@ -62,7 +62,7 @@ export default [
                 component: Authenticator
             },
             {
-                path: "/twitch-scopes",
+                path: "/twitch-auth",
                 component: TwitchAuthScopeSelector
             }
         ]