versacall-core-library-react 2.0.64 → 2.0.66

package/dist/components/CoreTable/CoreTable.js

@@ -245,7 +245,7 @@ var CoreTable = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleOnSort",
     value: function handleOnSort(orderBy) {
-      console.log('orderBy', orderBy);
+      // console.log('orderBy', orderBy);
       this.setState(function (prevState) {
         var order = prevState.orderBy === orderBy && prevState.order === 'desc' ? 'asc' : 'desc';
         return {

package/dist/context/Authentication/AuthenticationProvider.js

@@ -99,7 +99,8 @@ var AuthenticationProvider = /*#__PURE__*/function (_Component) {
     _this = _super.call(this, props);
     _this.state = {
       authenticated: false,
-      token: null
+      token: null,
+      apiKey: null
     };
 
     if (props.test) {
@@ -107,6 +108,7 @@ var AuthenticationProvider = /*#__PURE__*/function (_Component) {
       _this.state.token = _constants.testToken;
     } else {
       var token = getToken();
+      var apiKey = (0, _functions.getParameterByName)('apiKey');
 
       if (token !== null) {
         _this.state.authenticated = true;
@@ -119,6 +121,8 @@ var AuthenticationProvider = /*#__PURE__*/function (_Component) {
           _this.state.authenticated = param.authenticated;
           _this.state.token = param.token;
         }
+      } else if (apiKey && apiKey.length > 0) {
+        _this.state.apiKey = apiKey; // TODO - Make call to get token from Api Key...
       } else {
         _this.redirectToLogin();
       }
@@ -187,6 +191,7 @@ var AuthenticationProvider = /*#__PURE__*/function (_Component) {
   }, {
     key: "didChange",
     value: function didChange(prevContext) {
+      // NOTE: Might also need to check apiKey...
       return !compareTokens(this.state.token, prevContext.token);
     }
   }, {
@@ -218,7 +223,12 @@ var AuthenticationProvider = /*#__PURE__*/function (_Component) {
         headers: {
           Authorization: "Bearer ".concat(this.state.token.token)
         }
-      });
+      }); // NOTE: If we have an ApiKey, might want to include a "X-API-Key" header...
+
+      if (this.state.apiKey) {
+        configurationCombined.headers['X-API-Key'] = this.state.apiKey;
+      }
+
       return new Promise(function (resolve, reject) {
         (0, _axios.default)(configurationCombined).then(function (results) {
           resolve(results);
@@ -270,7 +280,9 @@ var AuthenticationProvider = /*#__PURE__*/function (_Component) {
   }, {
     key: "redirectToLogin",
     value: function redirectToLogin() {
-      window.location = "".concat(this.props.core.baseUrl, "/login?redirect=").concat(window.location);
+      // Need to encode the redirect URL since we are passing it as a parameter
+      var redirect = encodeURIComponent(window.location);
+      window.location = "".concat(this.props.core.baseUrl, "/login?redirect=").concat(redirect);
     }
   }, {
     key: "render",
@@ -279,11 +291,13 @@ var AuthenticationProvider = /*#__PURE__*/function (_Component) {
 
       var _this$state = this.state,
           authenticated = _this$state.authenticated,
-          token = _this$state.token;
+          token = _this$state.token,
+          apiKey = _this$state.apiKey;
       return /*#__PURE__*/_react.default.createElement(_AuthenticationContext.default.Provider, {
         value: {
           authenticated: authenticated,
           token: token,
+          apiKey: apiKey,
           logout: function logout() {
             return _this3.logout();
           },

package/package.json

@@ -2,10 +2,10 @@
   "versacall": {
     "title": "Versacall Core Library React",
     "applicationType": "react-library",
-    "build": 64
+    "build": 66
   },
   "name": "versacall-core-library-react",
-  "version": "2.0.64",
+  "version": "2.0.66",
   "description": "Versacall Core Library",
   "main": "dist/index.js",
   "module": "dist/index.js",