@kineticdata/react 5.1.1 → 6.0.0

package/lib/components/common/authentication/AuthInterceptor.js

@@ -1,11 +1,16 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import axios from 'axios';
+"use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
+var _axios = _interopRequireDefault(require("axios"));
 var AuthInterceptor = /*#__PURE__*/function () {
   function AuthInterceptor(store, unauthenticatedAction, authenticatedSelector, cancelledSelector) {
-    _classCallCheck(this, AuthInterceptor);
-
+    (0, _classCallCheck2["default"])(this, AuthInterceptor);
     this.store = store;
     this.unauthenticatedAction = unauthenticatedAction;
     this.authenticatedSelector = authenticatedSelector;
@@ -14,19 +19,15 @@ var AuthInterceptor = /*#__PURE__*/function () {
     this.handleRejected = this.handleRejected.bind(this);
     this.authenticate = this.authenticate.bind(this);
   }
-
-  _createClass(AuthInterceptor, [{
+  (0, _createClass2["default"])(AuthInterceptor, [{
     key: "authenticate",
     value: function authenticate() {
       var _this = this;
-
       this.store.dispatch(this.unauthenticatedAction());
-
       if (this.authenticatedSelector(this.store.getState()) || this.cancelledSelector(this.store.getState())) {
         console.error('AuthInterceptor found invalid state when handling unauthenticated ' + 'response. The selectors given (authenticated and cancelled) should ' + 'both return false initially and then return true once the user has ' + 'successfully authenticated or cancelled respectively.');
         return Promise.reject();
       }
-
       return new Promise(function (resolve, reject) {
         var unsub = _this.store.subscribe(function () {
           if (_this.authenticatedSelector(_this.store.getState())) {
@@ -43,20 +44,17 @@ var AuthInterceptor = /*#__PURE__*/function () {
     key: "handleRejected",
     value: function handleRejected(error) {
       var _this2 = this;
-
       if (error.response && error.response.status === 401 && !error.response.config.__bypassAuthInterceptor) {
         if (!this.authPromise) {
           this.authPromise = this.authenticate();
-          this.authPromise["finally"](function () {
-            _this2.authPromise = null;
-          });
         }
-
         return new Promise(function (resolve, reject) {
           _this2.authPromise.then(function () {
-            axios(error.response.config).then(resolve)["catch"](reject);
+            (0, _axios["default"])(error.response.config).then(resolve)["catch"](reject);
           })["catch"](function () {
             reject(error);
+          })["finally"](function () {
+            _this2.authPromise = null;
           });
         });
       } else {
@@ -64,8 +62,6 @@ var AuthInterceptor = /*#__PURE__*/function () {
       }
     }
   }]);
-
   return AuthInterceptor;
 }();
-
-export { AuthInterceptor as default };
+exports["default"] = AuthInterceptor;

package/lib/components/common/authentication/AuthInterceptor.test.js

@@ -1,24 +1,23 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import AuthInterceptor from './AuthInterceptor';
-import axios from 'axios';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
+var _AuthInterceptor = _interopRequireDefault(require("./AuthInterceptor"));
+var _axios = _interopRequireDefault(require("axios"));
 jest.mock('axios');
 var store;
-
 var unauthenticatedAction = function unauthenticatedAction() {
   return {
     type: 'TIMED_OUT'
   };
 };
-
 var authenticatedSelector = function authenticatedSelector(state) {
   return state.authenticated;
 };
-
 var cancelledSelector = function cancelledSelector(state) {
   return state.cancelled;
 };
-
 describe('AuthInterceptor', function () {
   beforeEach(function () {
     store = {
@@ -34,7 +33,6 @@ describe('AuthInterceptor', function () {
       },
       subscribe: function subscribe(listener) {
         var _this = this;
-
         this.listeners.push(listener);
         return function () {
           _this.listeners = _this.listeners.filter(function (l) {
@@ -45,29 +43,29 @@ describe('AuthInterceptor', function () {
       actions: [],
       listeners: []
     };
-    axios.mockReset();
+    _axios["default"].mockReset();
   });
   describe('constructor', function () {
     test('sets properties', function () {
-      var authInterceptor = new AuthInterceptor(store, unauthenticatedAction, authenticatedSelector, cancelledSelector);
+      var authInterceptor = new _AuthInterceptor["default"](store, unauthenticatedAction, authenticatedSelector, cancelledSelector);
       expect(authInterceptor.store).toBe(store);
       expect(authInterceptor.unauthenticatedAction).toBe(unauthenticatedAction);
       expect(authInterceptor.authenticatedSelector).toBe(authenticatedSelector);
       expect(authInterceptor.cancelledSelector).toBe(cancelledSelector);
     });
     test('autPromise should be null', function () {
-      var authInterceptor = new AuthInterceptor(store, unauthenticatedAction, authenticatedSelector, cancelledSelector);
+      var authInterceptor = new _AuthInterceptor["default"](store, unauthenticatedAction, authenticatedSelector, cancelledSelector);
       expect(authInterceptor.authPromise).toBeNull();
     });
   });
   describe('handleRejected', function () {
-    test('returns rejected promise with the given error if not 401', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    test('returns rejected promise with the given error if not 401', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
       var authInterceptor, error;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              authInterceptor = new AuthInterceptor(store, unauthenticatedAction, authenticatedSelector, cancelledSelector);
+              authInterceptor = new _AuthInterceptor["default"](store, unauthenticatedAction, authenticatedSelector, cancelledSelector);
               error = {
                 response: {
                   status: 400
@@ -75,10 +73,8 @@ describe('AuthInterceptor', function () {
               };
               _context.next = 4;
               return expect(authInterceptor.handleRejected(error)).rejects.toBe(error);
-
             case 4:
               expect(authInterceptor.authPromise).toBeNull();
-
             case 5:
             case "end":
               return _context.stop();
@@ -86,16 +82,15 @@ describe('AuthInterceptor', function () {
         }
       }, _callee);
     })));
-    test('performs authentication workflow with successful login', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    test('performs authentication workflow with successful login', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2() {
       var authInterceptor, error, rejectedCall;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              authInterceptor = new AuthInterceptor(store, unauthenticatedAction, authenticatedSelector, cancelledSelector); // Mock an axios return value.
-
-              axios.mockReturnValue(Promise.resolve('Hello World')); // Make a call to handleRejected that will trigger the auth functionality.
-
+              authInterceptor = new _AuthInterceptor["default"](store, unauthenticatedAction, authenticatedSelector, cancelledSelector); // Mock an axios return value.
+              _axios["default"].mockReturnValue(Promise.resolve('Hello World'));
+              // Make a call to handleRejected that will trigger the auth functionality.
               error = {
                 response: {
                   status: 401,
@@ -106,27 +101,24 @@ describe('AuthInterceptor', function () {
               };
               rejectedCall = authInterceptor.handleRejected(error); // It should dispatch the redux action using the action creator passed to
               // the controller and start to listen to the store for success or cancel.
-
               expect(store.actions).toEqual([{
                 type: 'TIMED_OUT'
               }]);
               expect(store.listeners.length).toBe(1);
-              expect(authInterceptor.authPromise).not.toBeNull(); // Simulate sucessful authentication and call the listener.
-
+              expect(authInterceptor.authPromise).not.toBeNull();
+              // Simulate sucessful authentication and call the listener.
               store.state.authenticated = true;
-              store.listeners[0](); // The promse should be resolved with the axios resolved value.  Also
+              store.listeners[0]();
+              // The promse should be resolved with the axios resolved value.  Also
               // ensure that axios was called and that the listener is unsubscribed.
-
               _context2.next = 11;
               return expect(rejectedCall).resolves.toBe('Hello World');
-
             case 11:
-              expect(axios.mock.calls).toEqual([[{
+              expect(_axios["default"].mock.calls).toEqual([[{
                 url: 'foo'
               }]]);
               expect(store.listeners.length).toBe(0);
               expect(authInterceptor.authPromise).toBeNull();
-
             case 14:
             case "end":
               return _context2.stop();
@@ -134,14 +126,13 @@ describe('AuthInterceptor', function () {
         }
       }, _callee2);
     })));
-    test('performs authentication workflow with cancelled login', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    test('performs authentication workflow with cancelled login', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee3() {
       var authInterceptor, error, rejectedCall;
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return (0, _regeneratorRuntime2["default"])().wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              authInterceptor = new AuthInterceptor(store, unauthenticatedAction, authenticatedSelector, cancelledSelector); // Make a call to handleRejected that will trigger the auth functionality.
-
+              authInterceptor = new _AuthInterceptor["default"](store, unauthenticatedAction, authenticatedSelector, cancelledSelector); // Make a call to handleRejected that will trigger the auth functionality.
               error = {
                 response: {
                   status: 401,
@@ -152,25 +143,22 @@ describe('AuthInterceptor', function () {
               };
               rejectedCall = authInterceptor.handleRejected(error); // It should dispatch the redux action using the action creator passed to
               // the controller and start to listen to the store for success or cancel.
-
               expect(store.actions).toEqual([{
                 type: 'TIMED_OUT'
               }]);
               expect(store.listeners.length).toBe(1);
-              expect(authInterceptor.authPromise).not.toBeNull(); // Simulate cancel and call the listener.
-
+              expect(authInterceptor.authPromise).not.toBeNull();
+              // Simulate cancel and call the listener.
               store.state.cancelled = true;
-              store.listeners[0](); // The promse should be rejected with the original error object.  Also
+              store.listeners[0]();
+              // The promse should be rejected with the original error object.  Also
               // ensure that axios is not called and that the listener is unsubscribed.
-
               _context3.next = 10;
               return expect(rejectedCall).rejects.toBe(error);
-
             case 10:
-              expect(axios.mock.calls).toEqual([]);
+              expect(_axios["default"].mock.calls).toEqual([]);
               expect(store.listeners.length).toBe(0);
               expect(authInterceptor.authPromise).toBeNull();
-
             case 13:
             case "end":
               return _context3.stop();
@@ -178,16 +166,15 @@ describe('AuthInterceptor', function () {
         }
       }, _callee3);
     })));
-    test('creates one authPromise for multiple calls', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    test('creates one authPromise for multiple calls', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee4() {
       var authInterceptor, error, authPromise1, authPromise2;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return (0, _regeneratorRuntime2["default"])().wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              authInterceptor = new AuthInterceptor(store, unauthenticatedAction, authenticatedSelector, cancelledSelector); // Should be null initially.
-
-              expect(authInterceptor.authPromise).toBeNull(); // Call handleRejected with the error object, should return a promise.
-
+              authInterceptor = new _AuthInterceptor["default"](store, unauthenticatedAction, authenticatedSelector, cancelledSelector); // Should be null initially.
+              expect(authInterceptor.authPromise).toBeNull();
+              // Call handleRejected with the error object, should return a promise.
               error = {
                 response: {
                   status: 401,
@@ -196,16 +183,15 @@ describe('AuthInterceptor', function () {
                   }
                 }
               };
-              authInterceptor.handleRejected(error); // Should now be set after a call to handleRejected.
-
+              authInterceptor.handleRejected(error);
+              // Should now be set after a call to handleRejected.
               authPromise1 = authInterceptor.authPromise;
-              expect(authPromise1).not.toBeNull(); // Second call to handleRejected should not change the value of the
+              expect(authPromise1).not.toBeNull();
+              // Second call to handleRejected should not change the value of the
               // authPromise.
-
               authInterceptor.handleRejected(error);
               authPromise2 = authInterceptor.authPromise;
               expect(authPromise1).toBe(authPromise2);
-
             case 9:
             case "end":
               return _context4.stop();
@@ -213,13 +199,13 @@ describe('AuthInterceptor', function () {
         }
       }, _callee4);
     })));
-    test('returns original error if authenticated selector returns true initially', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+    test('returns original error if authenticated selector returns true initially', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee5() {
       var authInterceptor, error;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      return (0, _regeneratorRuntime2["default"])().wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
-              authInterceptor = new AuthInterceptor(store, unauthenticatedAction, authenticatedSelector, cancelledSelector);
+              authInterceptor = new _AuthInterceptor["default"](store, unauthenticatedAction, authenticatedSelector, cancelledSelector);
               error = {
                 response: {
                   status: 401,
@@ -231,10 +217,8 @@ describe('AuthInterceptor', function () {
               store.state.authenticated = true;
               _context5.next = 5;
               return expect(authInterceptor.handleRejected(error)).rejects.toBe(error);
-
             case 5:
               expect(authInterceptor.authPromise).toBeNull();
-
             case 6:
             case "end":
               return _context5.stop();
@@ -242,13 +226,13 @@ describe('AuthInterceptor', function () {
         }
       }, _callee5);
     })));
-    test('returns original error if cancelled selector returns true initially', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+    test('returns original error if cancelled selector returns true initially', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee6() {
       var authInterceptor, error;
-      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+      return (0, _regeneratorRuntime2["default"])().wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
-              authInterceptor = new AuthInterceptor(store, unauthenticatedAction, authenticatedSelector, cancelledSelector);
+              authInterceptor = new _AuthInterceptor["default"](store, unauthenticatedAction, authenticatedSelector, cancelledSelector);
               error = {
                 response: {
                   status: 401,
@@ -260,10 +244,8 @@ describe('AuthInterceptor', function () {
               store.state.cancelled = true;
               _context6.next = 5;
               return expect(authInterceptor.handleRejected(error)).rejects.toBe(error);
-
             case 5:
               expect(authInterceptor.authPromise).toBeNull();
-
             case 6:
             case "end":
               return _context6.stop();