@webex/webex-core 2.60.1-next.10 → 2.60.1-next.11

package/dist/lib/batcher.js

@@ -286,7 +286,7 @@ var Batcher = _webexPlugin.default.extend({
   fingerprintResponse: function fingerprintResponse(item) {
     throw new Error('fingerprintResponse() must be implemented');
   },
-  version: "2.60.1-next.10"
+  version: "2.60.1-next.11"
 });
 var _default2 = exports.default = Batcher;
 //# sourceMappingURL=batcher.js.map

package/dist/lib/credentials/credentials.js

@@ -558,7 +558,7 @@ var Credentials = _webexPlugin.default.extend((_dec = (0, _common.oneFlight)({
       this.refresh();
     }
   },
-  version: "2.60.1-next.10"
+  version: "2.60.1-next.11"
 }, ((0, _applyDecoratedDescriptor2.default)(_obj, "getUserToken", [_dec, _dec2], (0, _getOwnPropertyDescriptor.default)(_obj, "getUserToken"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "initialize", [_dec3], (0, _getOwnPropertyDescriptor.default)(_obj, "initialize"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "invalidate", [_common.oneFlight, _dec4], (0, _getOwnPropertyDescriptor.default)(_obj, "invalidate"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "refresh", [_common.oneFlight, _dec5, _dec6], (0, _getOwnPropertyDescriptor.default)(_obj, "refresh"), _obj)), _obj)));
 var _default = exports.default = Credentials;
 //# sourceMappingURL=credentials.js.map

package/dist/lib/credentials/token.js

@@ -532,7 +532,7 @@ var Token = _webexPlugin.default.extend((_dec = (0, _common.oneFlight)({
       return res.body;
     });
   },
-  version: "2.60.1-next.10"
+  version: "2.60.1-next.11"
 }, ((0, _applyDecoratedDescriptor2.default)(_obj, "downscope", [_dec], (0, _getOwnPropertyDescriptor.default)(_obj, "downscope"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "refresh", [_common.oneFlight], (0, _getOwnPropertyDescriptor.default)(_obj, "refresh"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "revoke", [_common.oneFlight], (0, _getOwnPropertyDescriptor.default)(_obj, "revoke"), _obj)), _obj)));
 var _default = exports.default = Token;
 //# sourceMappingURL=token.js.map

package/dist/lib/services/services.js

@@ -1014,7 +1014,7 @@ var Services = _webexPlugin.default.extend({
       }
     });
   },
-  version: "2.60.1-next.10"
+  version: "2.60.1-next.11"
 });
 /* eslint-enable no-underscore-dangle */
 var _default = exports.default = Services;

package/dist/plugins/logger.js

@@ -57,7 +57,7 @@ var Logger = _webexPlugin.default.extend({
   info: wrapConsoleMethod('info'),
   debug: wrapConsoleMethod('debug'),
   trace: wrapConsoleMethod('trace'),
-  version: "2.60.1-next.10"
+  version: "2.60.1-next.11"
 });
 (0, _webexCore.registerPlugin)('logger', Logger);
 var _default = exports.default = Logger;

package/dist/webex-core.js

@@ -94,7 +94,7 @@ var MAX_FILE_SIZE_IN_MB = 2048;
  * @class
  */
 var WebexCore = _ampersandState.default.extend((_obj = {
-  version: "2.60.1-next.10",
+  version: "2.60.1-next.11",
   children: {
     internal: _webexInternalCore.default
   },
@@ -636,7 +636,7 @@ var WebexCore = _ampersandState.default.extend((_obj = {
     });
   }
 }, ((0, _applyDecoratedDescriptor2.default)(_obj, "_uploadPhaseUpload", [_common.retry], (0, _getOwnPropertyDescriptor.default)(_obj, "_uploadPhaseUpload"), _obj)), _obj));
-WebexCore.version = "2.60.1-next.10";
+WebexCore.version = "2.60.1-next.11";
 (0, _webexInternalCorePluginMixin.default)(_webexInternalCore.default, _config.default, interceptors);
 (0, _webexCorePluginMixin.default)(WebexCore, _config.default, interceptors);
 var _default = exports.default = WebexCore;

package/package.json

@@ -35,12 +35,12 @@
     "@webex/eslint-config-legacy": "0.0.0",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/test-helper-chai": "2.60.1-next.10",
-    "@webex/test-helper-make-local-url": "2.60.1-next.10",
-    "@webex/test-helper-mocha": "2.60.1-next.10",
-    "@webex/test-helper-mock-webex": "2.60.1-next.10",
-    "@webex/test-helper-refresh-callback": "2.60.1-next.10",
-    "@webex/test-helper-test-users": "2.60.1-next.10",
+    "@webex/test-helper-chai": "2.60.1-next.11",
+    "@webex/test-helper-make-local-url": "2.60.1-next.11",
+    "@webex/test-helper-mocha": "2.60.1-next.11",
+    "@webex/test-helper-mock-webex": "2.60.1-next.11",
+    "@webex/test-helper-refresh-callback": "2.60.1-next.11",
+    "@webex/test-helper-test-users": "2.60.1-next.11",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.24.0",
@@ -48,12 +48,12 @@
     "sinon": "^9.2.4"
   },
   "dependencies": {
-    "@webex/common": "2.60.1-next.10",
-    "@webex/common-timers": "2.60.1-next.10",
-    "@webex/http-core": "2.60.1-next.10",
-    "@webex/internal-plugin-device": "2.60.1-next.10",
-    "@webex/plugin-logger": "2.60.1-next.10",
-    "@webex/storage-adapter-spec": "2.60.1-next.10",
+    "@webex/common": "2.60.1-next.11",
+    "@webex/common-timers": "2.60.1-next.11",
+    "@webex/http-core": "2.60.1-next.11",
+    "@webex/internal-plugin-device": "2.60.1-next.11",
+    "@webex/plugin-logger": "2.60.1-next.11",
+    "@webex/storage-adapter-spec": "2.60.1-next.11",
     "ampersand-collection": "^2.0.2",
     "ampersand-events": "^2.0.2",
     "ampersand-state": "^5.0.3",
@@ -68,10 +68,10 @@
     "build:src": "webex-legacy-tools build -dest \"./dist\" -src \"./src\" -js -ts -maps",
     "deploy:npm": "yarn npm publish",
     "test": "yarn test:style && yarn test:unit && yarn test:integration && yarn test:browser",
-    "test:browser:broken": "webex-legacy-tools test --integration --unit --runner karma",
-    "test:integration:broken": "webex-legacy-tools test --integration --runner mocha",
+    "test:browser": "webex-legacy-tools test --integration --runner karma",
+    "test:integration": "webex-legacy-tools test --integration --runner mocha",
     "test:style": "eslint ./src/**/*.*",
     "test:unit": "webex-legacy-tools test --unit --runner jest"
   },
-  "version": "2.60.1-next.10"
+  "version": "2.60.1-next.11"
 }

package/test/integration/spec/credentials/credentials.js

@@ -110,12 +110,15 @@ describe('webex-core', () => {
         });
       });
 
-      browserOnly(it)('throws without a refresh callback', () => {
+      browserOnly(it)('throws without a refresh callback', async () => {
         const webex = new WebexCore({
           credentials: user.token,
         });
-
-        return assert.isRejected(webex.credentials.refresh());
+        await webex.credentials.refresh().then(() => {
+          assert(false, 'resolved, should have thrown');
+        }).catch((err) => {
+          assert(false);
+        });
       });
 
       browserOnly(it)('refreshes with a refresh callback', () => {

package/test/integration/spec/unit-browser/auth.js

@@ -0,0 +1,93 @@
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+/* eslint-disable camelcase */
+
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import sinon from 'sinon';
+import {browserOnly, nodeOnly} from '@webex/test-helper-mocha';
+import Logger from '@webex/plugin-logger';
+import MockWebex from '@webex/test-helper-mock-webex';
+import {AuthInterceptor, config, Credentials, WebexHttpError, Token} from '@webex/webex-core';
+import {cloneDeep, merge} from 'lodash';
+import Metrics from '@webex/internal-plugin-metrics';
+
+const {assert} = chai;
+
+chai.use(chaiAsPromised);
+sinon.assert.expose(chai.assert, {prefix: ''});
+
+describe('webex-core', () => {
+  describe('Interceptors', () => {
+    describe('AuthInterceptor', () => {
+      let interceptor, webex;
+
+      beforeEach(() => {
+        webex = new MockWebex({
+          children: {
+            credentials: Credentials,
+            logger: Logger,
+            metrics: Metrics,
+          },
+          config: merge(cloneDeep(config), {credentials: {client_secret: 'fake'}}),
+        });
+
+        webex.credentials.supertoken = new Token(
+          {
+            access_token: 'ST1',
+            token_type: 'Bearer',
+          },
+          {parent: webex}
+        );
+
+        interceptor = Reflect.apply(AuthInterceptor.create, webex, []);
+        sinon.stub(webex.internal.metrics, 'submitClientMetrics').callsFake(() => {});
+      });
+
+
+      describe('#onResponseError()', () => {
+        describe('when the server responds with 401', () => {
+          browserOnly(it)('refreshes the access token and replays the request', () => {
+            webex.config.credentials.refreshCallback = sinon.stub().returns(
+              Promise.resolve({
+                access_token: 'ST2',
+              })
+            );
+
+            webex.credentials.supertoken = new Token(
+              {
+                access_token: 'ST1',
+                refresh_token: 'RT1',
+              },
+              {parent: webex}
+            );
+
+            const err = new WebexHttpError.Unauthorized({
+              statusCode: 401,
+              options: {
+                headers: {
+                  trackingid: 'blarg',
+                },
+                uri: `${config.services.discovery.hydra}/ping`,
+              },
+              body: {
+                error: 'fake error',
+              },
+            });
+
+            assert.notCalled(webex.request);
+
+            return interceptor.onResponseError(err.options, err).then(() => {
+              // once for replay
+              assert.calledOnce(webex.request);
+              assert.equal(webex.credentials.supertoken.access_token, 'ST2');
+              assert.equal(webex.request.args[0][0].replayCount, 1);
+            });
+          });
+      });
+    });
+  });
+});
+});

package/test/integration/spec/unit-browser/token.js

@@ -0,0 +1,122 @@
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {assert} from '@webex/test-helper-chai';
+import sinon from 'sinon';
+import {nodeOnly, browserOnly} from '@webex/test-helper-mocha';
+import FakeTimers from '@sinonjs/fake-timers';
+import MockWebex from '@webex/test-helper-mock-webex';
+import {Token} from '@webex/webex-core';
+
+/* eslint camelcase: [0] */
+
+// eslint-disable-next-line no-empty-function
+function noop() {}
+
+describe('webex-core', () => {
+  describe('Credentials', () => {
+    describe('Token', () => {
+      let webex;
+
+      beforeEach(() => {
+        webex = new MockWebex();
+      });
+
+      function makeToken(options = {}) {
+        return new Token(
+          Object.assign(
+            {
+              access_token: 'AT',
+              expires_in: 10000,
+              token_type: 'Fake',
+              refresh_token: 'RT',
+              refresh_token_expires_in: 20000,
+            },
+            options
+          ),
+          {parent: webex}
+        );
+      }
+
+      describe('#canRefresh', () => {
+        browserOnly(it)('indicates if this token can be refreshed', () => {
+          let token = makeToken();
+
+          assert.isFalse(token.canRefresh);
+          token.unset('refresh_token');
+          assert.isFalse(token.canRefresh);
+
+          webex.config.credentials.refreshCallback = noop;
+          token = makeToken();
+          assert.isTrue(token.canRefresh);
+          token.unset('refresh_token');
+          assert.isFalse(token.canRefresh);
+        });
+      });
+
+      describe('#refresh()', () => {
+        browserOnly(it)('refreshes the access_token', () => {
+          const token = makeToken();
+
+          webex.config.credentials.refreshCallback = sinon.stub().returns(
+            Promise.resolve({
+              access_token: 'AT2',
+              expires_in: 10000,
+              token_type: 'Fake',
+            })
+          );
+
+          // FIXME this next line should be necessary. we need a better way to
+          // do config
+          token.trigger('change:config');
+
+          return token.refresh().then((token2) => {
+            assert.equal(token2.access_token, 'AT2');
+          });
+        });
+
+
+        browserOnly(it)('revokes the previous token when set', () => {
+          const token = makeToken();
+
+          sinon.spy(token, 'revoke');
+          webex.config.credentials.refreshCallback = sinon.stub();
+
+          webex.config.credentials.refreshCallback.onCall(0).returns(
+            Promise.resolve({
+              access_token: 'AT2',
+              expires_in: 10000,
+              token_type: 'Fake',
+            })
+          );
+
+          webex.config.credentials.refreshCallback.onCall(1).returns(
+            Promise.resolve({
+              access_token: 'AT3',
+              expires_in: 10000,
+              token_type: 'Fake',
+            })
+          );
+
+          // FIXME this next line should be necessary. we need a better way to
+          // do config
+          token.trigger('change:config');
+
+          return token
+            .refresh()
+            .then((token2) => {
+              assert.isTrue(token.canRefresh);
+              assert.notCalled(token.revoke);
+
+              return token2.refresh();
+            })
+            .then((token3) => {
+              assert.equal(token3.access_token, 'AT3');
+              assert.called(token.revoke);
+            });
+        });
+      });
+    });
+  });
+});