Update OAUTH flow for upcoming Firefox 75

Author: Maluen

src/background/services/AuthService.js

@@ -3,18 +3,24 @@ import uuidv4 from 'uuid/v4';
 import config from '../../common/config';
 import { getUrlQuery } from '../../common/utils';
 
-const redirectUrl = `https://${config.app.id}.chromiumapp.org/`;
+const authConfig = config.auths[process.env.BROWSER];
+const { clientId, clientSecret } = authConfig;
+
+const redirectUrl = (process.env.BROWSER === 'firefox')
+  ? browser.identity.getRedirectURL()
+  : `https://${config.app.ids.chrome}.chromiumapp.org/`;
+console.log('OAUTH REDIRECT URL', redirectUrl);
 
 const scope = 'gist';
 const getAuthUrl = state => 'https://github.com/login/oauth/authorize?' +
-  `client_id=${encodeURIComponent(config.auth.clientId)}&` +
+  `client_id=${encodeURIComponent(clientId)}&` +
   `scope=${encodeURIComponent(scope)}&` +
   `state=${encodeURIComponent(state)}&` +
   `redirect_uri=${redirectUrl}`;
 
 const getAccessTokenUrl = (code, state) => 'https://github.com/login/oauth/access_token?' +
-  `client_id=${encodeURIComponent(config.auth.clientId)}&` +
-  `client_secret=${encodeURIComponent(config.auth.clientSecret)}&` +
+  `client_id=${encodeURIComponent(clientId)}&` +
+  `client_secret=${encodeURIComponent(clientSecret)}&` +
   `code=${encodeURIComponent(code)}&` +
   `state=${encodeURIComponent(state)}&` +
   `redirect_uri=${redirectUrl}`;
@@ -45,10 +51,10 @@ function getAccessToken(code, state) {
 }
 
 function revokeAccessToken(accessToken) {
-  return fetch(`https://api.github.com/applications/${config.auth.clientId}/tokens/${accessToken}`, {
+  return fetch(`https://api.github.com/applications/${clientId}/tokens/${accessToken}`, {
     method: 'DELETE',
     headers: {
-      Authorization: `Basic ${btoa(config.auth.clientId + ':' + config.auth.clientSecret)}`,
+      Authorization: `Basic ${btoa(clientId + ':' + clientSecret)}`,
     },
   }).then(response => {
     // 404 here just means that the user is already logged out

src/common/config.js

@@ -2,13 +2,23 @@ module.exports = {
   namespace: 'code-medium-extension',
 
   app: {
-    id: 'dganoageikmadjocbmklfgaejpkdigbe',
+    ids: {
+      chrome: 'dganoageikmadjocbmklfgaejpkdigbe',
+      firefox: '{22b7825c-a56f-4978-a9db-aa31bc6152fb}',
+    },
     name: 'Code Medium',
     website: 'https://github.com/Maluen/code-medium',
   },
 
-  auth: {
-    clientId: '30d1a6209ed6f8d31760',
-    clientSecret: '07ce4c1f2b9582b5e2470eb5189e7ea9084203e8',
+  auths: {
+    chrome: {
+      clientId: '30d1a6209ed6f8d31760',
+      clientSecret: '07ce4c1f2b9582b5e2470eb5189e7ea9084203e8',
+    },
+
+    firefox: {
+      clientId: '0c67dcc9e18d397ac74f',
+      clientSecret: 'd1e2a02f20ec52a9609a80e83332e07a84b8b142',
+    },
   },
 };

src/manifest.js

@@ -1,3 +1,5 @@
+var config = require('./common/config');
+
 module.exports = (browser, version) => ({
   "key": (browser === 'chrome')
     ? "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhUUr0Z4y8DxD5WIezuYeGW3zDZkvGXST+uviv4jtXwkNVZI5XTUrs/pfYoYsOKdnrxkE47/mI+TiumUj7buB1pC+qeWYjVEshDD5Wum6J44RhXmAo7eb1e3u+IG0BmFvQOO+ENtRxIacZ/M8gexGRIlVWJKuRtcLREc7EkwxtWN58fPrWcYsuXfO3NDEkvrSz7hCCNgeVf/y0MKIz7ZRje8Afb1cRa2PtVAFJ2KUFikzghNFyAY8DVmXXZzrvUDbkeKxA/ja2+5TePhVhKBE+DpFGNUBhb1bEi+pl7ysssxFxjdwiW5/9q58JJeh1Mcu1lnoGIVQTspcd5fbioMNNQIDAQAB"
@@ -6,6 +8,7 @@ module.exports = (browser, version) => ({
   minimum_chrome_version: (browser === 'chrome') ? "34" : undefined,
   applications: (browser === 'firefox') ? {
     "gecko": {
+      "id": config.app.ids.firefox,
       "strict_min_version": "50.0"
     }
   } : undefined,