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

package/src/authorization.js

@@ -33,8 +33,8 @@ const Authorization = WebexPlugin.extend({
       deps: ['isAuthorizing'],
       fn() {
         return this.isAuthorizing;
-      }
-    }
+      },
+    },
   },
 
   session: {
@@ -46,12 +46,12 @@ const Authorization = WebexPlugin.extend({
      */
     isAuthorizing: {
       default: false,
-      type: 'boolean'
+      type: 'boolean',
     },
     ready: {
       default: false,
-      type: 'boolean'
-    }
+      type: 'boolean',
+    },
   },
 
   namespace: 'Credentials',
@@ -143,7 +143,9 @@ const Authorization = WebexPlugin.extend({
    */
   initiateImplicitGrant(options) {
     this.logger.info('authorization: initiating implicit grant flow');
-    this.webex.getWindow().location = this.webex.credentials.buildLoginUrl(Object.assign({response_type: 'token'}, options));
+    this.webex.getWindow().location = this.webex.credentials.buildLoginUrl(
+      Object.assign({response_type: 'token'}, options)
+    );
 
     return Promise.resolve();
   },
@@ -159,7 +161,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();
   },
@@ -189,25 +193,24 @@ const Authorization = WebexPlugin.extend({
       hydraUri += '/';
     }
 
-    hydraUri = hydraUri ||
-      process.env.HYDRA_SERVICE_URL ||
-      'https://api.ciscospark.com/v1/';
+    hydraUri = hydraUri || process.env.HYDRA_SERVICE_URL || 'https://api.ciscospark.com/v1/';
 
-    return this.webex.request({
-      method: 'POST',
-      uri: `${hydraUri}jwt/login`,
-      headers: {
-        authorization: jwt
-      }
-    })
+    return this.webex
+      .request({
+        method: 'POST',
+        uri: `${hydraUri}jwt/login`,
+        headers: {
+          authorization: jwt,
+        },
+      })
       .then(({body}) => ({
         access_token: body.token,
         token_type: 'Bearer',
-        expires_in: body.expiresIn
+        expires_in: body.expiresIn,
       }))
       .then((token) => {
         this.webex.credentials.set({
-          supertoken: token
+          supertoken: token,
         });
       })
       .then(() => this.webex.internal.services.initServiceCatalogs());
@@ -261,15 +264,16 @@ const Authorization = WebexPlugin.extend({
         'token_type',
         'expires_in',
         'refresh_token',
-        'refresh_token_expires_in'
+        'refresh_token_expires_in',
       ].forEach((key) => Reflect.deleteProperty(location.hash, key));
       if (!isEmpty(location.hash.state)) {
-        location.hash.state = base64.encode(JSON.stringify(omit(location.hash.state, 'csrf_token')));
+        location.hash.state = base64.encode(
+          JSON.stringify(omit(location.hash.state, 'csrf_token'))
+        );
         if (location.hash.state === EMPTY_OBJECT_STRING) {
           Reflect.deleteProperty(location.hash, 'state');
         }
-      }
-      else {
+      } else {
         Reflect.deleteProperty(location.hash, 'state');
       }
       location.hash = querystring.stringify(location.hash);
@@ -353,7 +357,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

@@ -11,6 +11,6 @@ export default {
      * @private
      * @type {string}
      */
-    clientType: 'public'
-  }
+    clientType: 'public',
+  },
 };

package/src/index.js

@@ -8,14 +8,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

@@ -10,35 +10,37 @@ import WebexCore from '@webex/webex-core';
 
 import pkg from '../../../package';
 
-const webex = window.webex = new WebexCore({
+const webex = (window.webex = new WebexCore({
   config: {
     credentials: {
       refreshCallback(webex, token) {
-        return webex.request({
-          method: 'POST',
-          uri: '/refresh',
-          body: {
-            // eslint-disable-next-line camelcase
-            refresh_token: token.refresh_token
-          }
-        })
+        return webex
+          .request({
+            method: 'POST',
+            uri: '/refresh',
+            body: {
+              // eslint-disable-next-line camelcase
+              refresh_token: token.refresh_token,
+            },
+          })
           .then((res) => res.body);
-      }
+      },
     },
     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';
       });
@@ -50,24 +52,23 @@ document.body.classList.add('ready');
 
 document.getElementById('initiate-implicit-grant').addEventListener('click', () => {
   webex.authorization.initiateLogin({
-    state: {name: pkg.name}
+    state: {name: pkg.name},
   });
 });
 
 document.getElementById('initiate-authorization-code-grant').addEventListener('click', () => {
   webex.config.credentials.clientType = 'confidential';
   webex.authorization.initiateLogin({
-    state: {name: pkg.name}
+    state: {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,22 +1,27 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Authorization Automation Test</title>
-</head>
-<body class="authorization-automation-test">
-  <button title="Login with Implicit Grant" id="initiate-implicit-grant">Login with Implicit Grant</button>
-  <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 Implicit Grant" id="initiate-implicit-grant">
+      Login with Implicit Grant
+    </button>
+    <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

@@ -18,98 +18,106 @@ describe('plugin-authorization-browser', function () {
     describe.skip('Authorization Code Grant', () => {
       let browser, user;
 
-      before(() => testUsers.create({count: 1})
-        .then((users) => {
+      before(() =>
+        testUsers.create({count: 1}).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'));
     });
   });
 });

package/test/automation/spec/implicit-grant.js

@@ -17,67 +17,74 @@ describe('plugin-authorization-browser', function () {
     describe.skip('Implicit Grant', () => {
       let browser, user;
 
-      before(() => testUsers.create({count: 1})
-        .then((users) => {
+      before(() =>
+        testUsers.create({count: 1}).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);
-        }));
+      after(
+        () =>
+          browser &&
+          browser.quit().catch((reason) => {
+            console.warn(reason);
+          })
+      );
 
-      it('authorizes a user', () => browser
-        .get(`${redirectUri}/${pkg.name}`)
-        .waitForElementByClassName('ready')
-        .title()
+      it('authorizes a user', () =>
+        browser
+          .get(`${redirectUri}/${pkg.name}`)
+          .waitForElementByClassName('ready')
+          .title()
           .should.eventually.become('Authorization Automation Test')
-        .waitForElementByCssSelector('[title="Login with Implicit Grant"]')
+          .waitForElementByCssSelector('[title="Login with Implicit Grant"]')
           .click()
-        .login(user)
-        .waitForElementByClassName('authorization-automation-test')
-        .waitForElementByCssSelector('#ping-complete:not(:empty)')
+          .login(user)
+          .waitForElementByClassName('authorization-automation-test')
+          .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')
+      it('is still logged in after reloading the page', () =>
+        browser
+          .waitForElementById('access-token')
           .text()
-            .should.eventually.not.be.empty
-        .url()
+          .should.eventually.not.be.empty.url()
           .then((url) => browser.get(url))
-        .sleep(500)
-        .waitForElementById('access-token')
-          .text()
-            .should.eventually.not.be.empty);
+          .sleep(500)
+          .waitForElementById('access-token')
+          .text().should.eventually.not.be.empty);
 
-      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 Implicit Grant"]')
+          .should.eventually.be.empty.waitForElementByCssSelector(
+            '[title="Login with Implicit Grant"]'
+          )
           .click()
-        .waitForElementById('IDToken1'));
+          .waitForElementById('IDToken1'));
     });
   });
 });

package/test/integration/spec/authorization.js

@@ -17,13 +17,13 @@ browserOnly(describe)('plugin-authorization-browser', () => {
         const userId = uuid.v4();
         const displayName = `test-${userId}`;
 
-        return createUser({displayName, userId})
-          .then(({jwt}) => {
-            const webex = new WebexCore();
+        return createUser({displayName, userId}).then(({jwt}) => {
+          const webex = new WebexCore();
 
-            return webex.authorization.requestAccessTokenFromJwt({jwt})
-              .then(() => assert.isTrue(webex.canAuthorize));
-          });
+          return webex.authorization
+            .requestAccessTokenFromJwt({jwt})
+            .then(() => assert.isTrue(webex.canAuthorize));
+        });
       });
 
       it('should call services#initServiceCatalogs()', () => {
@@ -39,37 +39,36 @@ browserOnly(describe)('plugin-authorization-browser', () => {
       });
     });
 
-    describe.skip('\'#refresh', () => {
+    describe.skip("'#refresh", () => {
       describe('when used with an appid access token', () => {
         it('refreshes the access token', () => {
           const userId = uuid.v4();
           const displayName = `test-${userId}`;
 
-          return createUser({displayName, userId})
-            .then(({jwt}) => {
-              const webex = new WebexCore({
-                config: {
-                  credentials: {
-                    jwtRefreshCallback() {
-                      return createUser({displayName, userId})
-                        .then(({jwt}) => jwt);
-                    }
-                  }
-                }
-              });
-              let token;
-
-              return webex.authorization.requestAccessTokenFromJwt({jwt})
-                .then(() => {
-                  token = webex.credentials.supertoken.access_token;
-                  assert.isTrue(webex.canAuthorize);
-                })
-                .then(() => webex.refresh())
-                .then(() => {
-                  assert.isTrue(webex.canAuthorize);
-                  assert.notEqual(webex.credentials.supertoken.access_token, token);
-                });
+          return createUser({displayName, userId}).then(({jwt}) => {
+            const webex = new WebexCore({
+              config: {
+                credentials: {
+                  jwtRefreshCallback() {
+                    return createUser({displayName, userId}).then(({jwt}) => jwt);
+                  },
+                },
+              },
             });
+            let token;
+
+            return webex.authorization
+              .requestAccessTokenFromJwt({jwt})
+              .then(() => {
+                token = webex.credentials.supertoken.access_token;
+                assert.isTrue(webex.canAuthorize);
+              })
+              .then(() => webex.refresh())
+              .then(() => {
+                assert.isTrue(webex.canAuthorize);
+                assert.notEqual(webex.credentials.supertoken.access_token, token);
+              });
+          });
         });
       });
     });