@webex/plugin-authorization-browser-first-party 3.0.0-beta.9 → 3.0.0-bnr.2

package/src/authorization.js

@@ -43,8 +43,8 @@ const Authorization = WebexPlugin.extend({
       deps: ['isAuthorizing'],
       fn() {
         return this.isAuthorizing;
-      }
-    }
+      },
+    },
   },
 
   session: {
@@ -56,12 +56,12 @@ const Authorization = WebexPlugin.extend({
      */
     isAuthorizing: {
       default: false,
-      type: 'boolean'
+      type: 'boolean',
     },
     ready: {
       default: false,
-      type: 'boolean'
-    }
+      type: 'boolean',
+    },
   },
 
   namespace: 'Credentials',
@@ -90,8 +90,7 @@ const Authorization = WebexPlugin.extend({
 
     if (location.query.state) {
       location.query.state = JSON.parse(base64.decode(location.query.state));
-    }
-    else {
+    } else {
       location.query.state = {};
     }
 
@@ -99,7 +98,6 @@ const Authorization = WebexPlugin.extend({
 
     this.webex.getWindow().sessionStorage.removeItem(OAUTH2_CODE_VERIFIER);
 
-
     const {emailhash} = location.query.state;
 
     this._verifySecurityToken(location.query);
@@ -107,7 +105,8 @@ const Authorization = WebexPlugin.extend({
 
     // Wait until nextTick in case `credentials` hasn't initialized yet
     process.nextTick(() => {
-      this.webex.internal.services.collectPreauthCatalog({emailhash})
+      this.webex.internal.services
+        .collectPreauthCatalog({emailhash})
         .catch(() => Promise.resolve())
         .then(() => this.requestAuthorizationCodeGrant({code, codeVerifier}))
         .then(() => {
@@ -115,7 +114,6 @@ const Authorization = WebexPlugin.extend({
         });
     });
 
-
     return ret;
   },
 
@@ -140,7 +138,6 @@ const Authorization = WebexPlugin.extend({
     options.code_challenge = this._generateCodeChallenge();
     options.code_challenge_method = 'S256';
 
-
     return this.initiateAuthorizationCodeGrant(options);
   },
 
@@ -155,7 +152,9 @@ const Authorization = WebexPlugin.extend({
    */
   initiateAuthorizationCodeGrant(options) {
     this.logger.info('authorization: initiating authorization code grant flow');
-    this.webex.getWindow().location = this.webex.credentials.buildLoginUrl(Object.assign({response_type: 'code'}, options));
+    this.webex.getWindow().location = this.webex.credentials.buildLoginUrl(
+      Object.assign({response_type: 'code'}, options)
+    );
 
     return Promise.resolve();
   },
@@ -174,7 +173,6 @@ const Authorization = WebexPlugin.extend({
     }
   },
 
-
   @whileInFlight('isAuthorizing')
   @oneFlight
   /**
@@ -196,24 +194,25 @@ const Authorization = WebexPlugin.extend({
       grant_type: 'authorization_code',
       redirect_uri: this.config.redirect_uri,
       code: options.code,
-      self_contained_token: true
+      self_contained_token: true,
     };
 
     if (options.codeVerifier) {
       form.code_verifier = options.codeVerifier;
     }
 
-    return this.webex.request({
-      method: 'POST',
-      uri: this.config.tokenUrl,
-      form,
-      auth: {
-        user: this.config.client_id,
-        pass: this.config.client_secret,
-        sendImmediately: true
-      },
-      shouldRefreshAccessToken: false
-    })
+    return this.webex
+      .request({
+        method: 'POST',
+        uri: this.config.tokenUrl,
+        form,
+        auth: {
+          user: this.config.client_id,
+          pass: this.config.client_secret,
+          sendImmediately: true,
+        },
+        shouldRefreshAccessToken: false,
+      })
       .then((res) => {
         this.webex.credentials.set({supertoken: res.body});
       })
@@ -260,9 +259,10 @@ const Authorization = WebexPlugin.extend({
       Reflect.deleteProperty(location.query, 'code');
       if (isEmpty(omit(location.query.state, 'csrf_token'))) {
         Reflect.deleteProperty(location.query, 'state');
-      }
-      else {
-        location.query.state = base64.encode(JSON.stringify(omit(location.query.state, 'csrf_token')));
+      } else {
+        location.query.state = base64.encode(
+          JSON.stringify(omit(location.query.state, 'csrf_token'))
+        );
       }
       location.search = querystring.stringify(location.query);
       Reflect.deleteProperty(location, 'query');
@@ -283,16 +283,13 @@ const Authorization = WebexPlugin.extend({
     // eslint-disable-next-line no-underscore-dangle
     const safeCharacterMap = base64url._safe_map;
 
-    const codeVerifier = lodash.times(
-      128,
-      () => safeCharacterMap[lodash.random(0, safeCharacterMap.length - 1)]
-    ).join('');
+    const codeVerifier = lodash
+      .times(128, () => safeCharacterMap[lodash.random(0, safeCharacterMap.length - 1)])
+      .join('');
 
     const codeChallenge = CryptoJS.SHA256(codeVerifier).toString(base64url);
 
-    this.webex.getWindow().sessionStorage.setItem(
-      OAUTH2_CODE_VERIFIER, codeVerifier
-    );
+    this.webex.getWindow().sessionStorage.setItem(OAUTH2_CODE_VERIFIER, codeVerifier);
 
     return codeChallenge;
   },
@@ -344,7 +341,7 @@ const Authorization = WebexPlugin.extend({
     if (token !== sessionToken) {
       throw new Error(`CSRF token ${token} does not match stored token ${sessionToken}`);
     }
-  }
+  },
 });
 
 export default Authorization;

package/src/config.js

@@ -15,23 +15,24 @@ export default {
 
     refreshCallback(webex, token) {
       /* eslint-disable camelcase */
-      return webex.request({
-        method: 'POST',
-        uri: token.config.tokenUrl,
-        form: {
-          grant_type: 'refresh_token',
-          redirect_uri: token.config.redirect_uri,
-          refresh_token: token.refresh_token
-        },
-        auth: {
-          user: token.config.client_id,
-          pass: token.config.client_secret,
-          sendImmediately: true
-        },
-        shouldRefreshAccessToken: false
-      })
+      return webex
+        .request({
+          method: 'POST',
+          uri: token.config.tokenUrl,
+          form: {
+            grant_type: 'refresh_token',
+            redirect_uri: token.config.redirect_uri,
+            refresh_token: token.refresh_token,
+          },
+          auth: {
+            user: token.config.client_id,
+            pass: token.config.client_secret,
+            sendImmediately: true,
+          },
+          shouldRefreshAccessToken: false,
+        })
         .then((res) => res.body);
       /* eslint-enable camelcase */
-    }
-  }
+    },
+  },
 };

package/src/index.js

@@ -7,14 +7,11 @@ import {registerPlugin} from '@webex/webex-core';
 import Authorization from './authorization';
 import config from './config';
 
-const proxies = [
-  'isAuthorizing',
-  'isAuthenticating'
-];
+const proxies = ['isAuthorizing', 'isAuthenticating'];
 
 registerPlugin('authorization', Authorization, {
   config,
-  proxies
+  proxies,
 });
 
 export {default} from './authorization';

package/test/automation/fixtures/app.js

@@ -11,22 +11,23 @@ import WebexCore from '@webex/webex-core';
 
 import pkg from '../../../package';
 
-const webex = window.webex = new WebexCore({
+const webex = (window.webex = new WebexCore({
   config: {
     storage: {
-      boundedAdapter: new StorageAdapterLocalStorage('webex')
-    }
-  }
-});
+      boundedAdapter: new StorageAdapterLocalStorage('webex'),
+    },
+  },
+}));
 
 webex.once('ready', () => {
   if (webex.canAuthorize) {
     document.getElementById('access-token').innerHTML = webex.credentials.supertoken.access_token;
     document.getElementById('refresh-token').innerHTML = webex.credentials.supertoken.refresh_token;
 
-    webex.request({
-      uri: 'https://locus-a.wbx2.com/locus/api/v1/ping'
-    })
+    webex
+      .request({
+        uri: 'https://locus-a.wbx2.com/locus/api/v1/ping',
+      })
       .then(() => {
         document.getElementById('ping-complete').innerHTML = 'success';
       });
@@ -41,18 +42,17 @@ document.getElementById('initiate-authorization-code-grant').addEventListener('c
   webex.authorization.initiateLogin({
     state: {
       exchange: false,
-      name: pkg.name
-    }
+      name: pkg.name,
+    },
   });
 });
 
 document.getElementById('token-refresh').addEventListener('click', () => {
   document.getElementById('access-token').innerHTML = '';
-  webex.refresh({force: true})
-    .then(() => {
-      document.getElementById('access-token').innerHTML = webex.credentials.supertoken.access_token;
-      document.getElementById('refresh-token').innerHTML = webex.credentials.supertoken.refresh_token;
-    });
+  webex.refresh({force: true}).then(() => {
+    document.getElementById('access-token').innerHTML = webex.credentials.supertoken.access_token;
+    document.getElementById('refresh-token').innerHTML = webex.credentials.supertoken.refresh_token;
+  });
 });
 
 document.getElementById('logout').addEventListener('click', () => {

package/test/automation/fixtures/index.html

@@ -1,21 +1,24 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Authorization Automation Test</title>
-</head>
-<body class="authorization-automation-test">
-  <button title="Login with Authorization Code Grant" id="initiate-authorization-code-grant">Login with Authorization Code Grant</button>
-  <button title="Refresh Access Token" id="token-refresh">Refresh Access Token</button>
+  <head>
+    <title>Authorization Automation Test</title>
+  </head>
+  <body class="authorization-automation-test">
+    <button title="Login with Authorization Code Grant" id="initiate-authorization-code-grant">
+      Login with Authorization Code Grant
+    </button>
+    <button title="Refresh Access Token" id="token-refresh">Refresh Access Token</button>
 
-  <h1>Access Token</h1>
-  <div id="access-token"></div>
-  <h1>Refresh Token</h1>
-  <div id="refresh-token"></div>
+    <h1>Access Token</h1>
+    <div id="access-token"></div>
+    <h1>Refresh Token</h1>
+    <div id="refresh-token"></div>
 
-  <h1>Pinging WDM</h1>
-  <div id="ping-complete"></div>
+    <h1>Pinging WDM</h1>
+    <div id="ping-complete"></div>
 
-  <button title="Logout" id="logout">Logout</button>
+    <button title="Logout" id="logout">Logout</button>
 
-  <script src="app.js"></script>
-</body>
+    <script src="app.js"></script>
+  </body>
+</html>

package/test/automation/spec/authorization-code-grant.js

@@ -16,9 +16,17 @@ const redirectUri = process.env.WEBEX_REDIRECT_URI || process.env.REDIRECT_URI;
 // for test users in EU (Federation) and US
 // Also try US user with Federation enabled
 const runs = [
-  {it: 'with EU user with Federation enabled', EUUser: true, attrs: {config: {credentials: {federation: true}}}},
+  {
+    it: 'with EU user with Federation enabled',
+    EUUser: true,
+    attrs: {config: {credentials: {federation: true}}},
+  },
   {it: 'with US user without Federation enabled', EUUser: false, attrs: {}},
-  {it: 'with US user with Federation enabled', EUUser: false, attrs: {config: {credentials: {federation: true}}}}
+  {
+    it: 'with US user with Federation enabled',
+    EUUser: false,
+    attrs: {config: {credentials: {federation: true}}},
+  },
 ];
 
 runs.forEach((run) => {
@@ -35,98 +43,108 @@ runs.forEach((run) => {
           testUserParm.config = {orgId: process.env.EU_PRIMARY_ORG_ID};
         }
 
-        before(() => testUsers.create(testUserParm)
-          .then((users) => {
+        before(() =>
+          testUsers.create(testUserParm).then((users) => {
             user = users[0];
-          }));
+          })
+        );
 
-        before(() => createBrowser(pkg)
-          .then((b) => {
+        before(() =>
+          createBrowser(pkg).then((b) => {
             browser = b;
-          }));
+          })
+        );
 
         after(() => browser && browser.printLogs());
 
-        after(() => browser && browser.quit()
-          .catch((reason) => {
-            console.warn(reason);
-          }));
-
-        it('authorizes a user', () => browser
-          .get(`${redirectUri}/${pkg.name}`)
-          .waitForElementByClassName('ready')
-          .title()
+        after(
+          () =>
+            browser &&
+            browser.quit().catch((reason) => {
+              console.warn(reason);
+            })
+        );
+
+        it('authorizes a user', () =>
+          browser
+            .get(`${redirectUri}/${pkg.name}`)
+            .waitForElementByClassName('ready')
+            .title()
             .should.eventually.become('Authorization Automation Test')
-          .waitForElementByCssSelector('[title="Login with Authorization Code Grant"]')
+            .waitForElementByCssSelector('[title="Login with Authorization Code Grant"]')
             .click()
-          .login(user)
-          .waitForElementByClassName('authorization-automation-test')
-          .waitForElementById('refresh-token')
+            .login(user)
+            .waitForElementByClassName('authorization-automation-test')
+            .waitForElementById('refresh-token')
             .text()
-              .should.eventually.not.be.empty
-          .waitForElementByCssSelector('#ping-complete:not(:empty)')
+            .should.eventually.not.be.empty.waitForElementByCssSelector(
+              '#ping-complete:not(:empty)'
+            )
             .text()
-              .should.eventually.become('success'));
+            .should.eventually.become('success'));
 
-        it('is still logged in after reloading the page', () => browser
-          .waitForElementById('access-token')
-            .text()
-              .should.eventually.not.be.empty
-          .get(`${redirectUri}/${pkg.name}`)
-          .sleep(500)
-          .waitForElementById('access-token')
+        it('is still logged in after reloading the page', () =>
+          browser
+            .waitForElementById('access-token')
             .text()
-              .should.eventually.not.be.empty);
+            .should.eventually.not.be.empty.get(`${redirectUri}/${pkg.name}`)
+            .sleep(500)
+            .waitForElementById('access-token')
+            .text().should.eventually.not.be.empty);
 
-        it('refreshes the user\'s access token', () => {
+        it("refreshes the user's access token", () => {
           let accessToken = '';
 
-          return browser
-            .waitForElementByCssSelector('#access-token:not(:empty)')
+          return (
+            browser
+              .waitForElementByCssSelector('#access-token:not(:empty)')
               .text()
-                .then((text) => {
-                  accessToken = text;
-                  assert.isString(accessToken);
-                  assert.isAbove(accessToken.length, 0);
-
-                  return browser;
-                })
-            .waitForElementByCssSelector('[title="Refresh Access Token"]')
+              .then((text) => {
+                accessToken = text;
+                assert.isString(accessToken);
+                assert.isAbove(accessToken.length, 0);
+
+                return browser;
+              })
+              .waitForElementByCssSelector('[title="Refresh Access Token"]')
               .click()
-            // Not thrilled by a sleep, but we just need to give the button click
-            // enough time to clear the #access-token box
-            .sleep(500)
-            .waitForElementByCssSelector('#access-token:not(:empty)')
+              // Not thrilled by a sleep, but we just need to give the button click
+              // enough time to clear the #access-token box
+              .sleep(500)
+              .waitForElementByCssSelector('#access-token:not(:empty)')
               .text()
-                .then((text) => {
-                  assert.isString(text);
-                  assert.isAbove(text.length, 0);
-                  assert.notEqual(text, accessToken);
-
-                  return browser;
-                });
+              .then((text) => {
+                assert.isString(text);
+                assert.isAbove(text.length, 0);
+                assert.notEqual(text, accessToken);
+
+                return browser;
+              })
+          );
         });
 
-        it('logs out a user', () => browser
-          .title()
+        it('logs out a user', () =>
+          browser
+            .title()
             .should.eventually.become('Authorization Automation Test')
-          .waitForElementByCssSelector('[title="Logout"]')
+            .waitForElementByCssSelector('[title="Logout"]')
             .click()
-          // We need to revoke three tokens before the window.location assignment.
-          // So far, I haven't found any ques to wait for, so sleep seems to be
-          // the only option.
-          .sleep(3000)
-          .title()
+            // We need to revoke three tokens before the window.location assignment.
+            // So far, I haven't found any ques to wait for, so sleep seems to be
+            // the only option.
+            .sleep(3000)
+            .title()
             .should.eventually.become('Redirect Dispatcher')
-          .get(`${redirectUri}/${pkg.name}`)
-          .title()
+            .get(`${redirectUri}/${pkg.name}`)
+            .title()
             .should.eventually.become('Authorization Automation Test')
-          .waitForElementById('access-token')
+            .waitForElementById('access-token')
             .text()
-              .should.eventually.be.empty
-          .waitForElementByCssSelector('[title="Login with Authorization Code Grant"]')
+            .should.eventually.be.empty.waitForElementByCssSelector(
+              '[title="Login with Authorization Code Grant"]'
+            )
             .click()
-          .waitForElementById('IDToken1'));
+            .waitForElementById('IDToken1'));
       });
     });
   });