authscape 1.0.84 → 1.0.90

package/.babelrc

@@ -1,3 +1,3 @@
-{
-    "presets": ["@babel/preset-react", "@babel/preset-env"]
+{
+    "presets": ["@babel/preset-react", "@babel/preset-env"]
 }

package/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.Datatable = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -245,7 +245,7 @@ var Datatable = /*#__PURE__*/function (_Component) {
   return Datatable;
 }(_react.Component);
 
-exports["default"] = Datatable;
+exports.Datatable = Datatable;
 
 _defineProperty(Datatable, "defaultProps", {
   options: {}
@@ -318,7 +318,7 @@ exports.apiService = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
-var _querystring = _interopRequireDefault(require("querystring"));
+var _queryString = _interopRequireDefault(require("query-string"));
 
 var _jsFileDownload = _interopRequireDefault(require("js-file-download"));
 
@@ -391,7 +391,7 @@ var setupDefaultOptions = /*#__PURE__*/function () {
 
 var RefreshToken = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(originalRequest, instance) {
-    var accessToken, refreshToken, response, domain;
+    var accessToken, refreshToken, response;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -399,7 +399,7 @@ var RefreshToken = /*#__PURE__*/function () {
             accessToken = (0, _nextCookies["default"])(null).access_token || '';
             refreshToken = (0, _nextCookies["default"])(null).refresh_token || '';
             _context2.next = 4;
-            return instance.post(process.env.AUTHORITYURI + "/connect/token", _querystring["default"].stringify({
+            return instance.post(process.env.AUTHORITYURI + "/connect/token", _queryString["default"].stringify({
               grant_type: 'refresh_token',
               client_id: process.env.client_id,
               client_secret: process.env.client_secret,
@@ -415,39 +415,38 @@ var RefreshToken = /*#__PURE__*/function () {
             response = _context2.sent;
 
             if (!(response != null && response.status == 200)) {
-              _context2.next = 14;
+              _context2.next = 13;
               break;
             }
 
             originalRequest.headers['Authorization'] = 'Bearer ' + response.data.access_token;
-            domain = getCookieDomain();
-            _context2.next = 10;
+            _context2.next = 9;
             return (0, _nookies.setCookie)(null, "access_token", response.data.access_token, {
               maxAge: 2147483647,
               path: '/',
-              domain: domain,
+              domain: process.env.cookieDomain,
               secure: true
             });
 
-          case 10:
-            _context2.next = 12;
+          case 9:
+            _context2.next = 11;
             return (0, _nookies.setCookie)(null, "expires_in", response.data.expires_in, {
               maxAge: 2147483647,
               path: '/',
-              domain: domain,
+              domain: process.env.cookieDomain,
               secure: true
             });
 
-          case 12:
-            _context2.next = 14;
+          case 11:
+            _context2.next = 13;
             return (0, _nookies.setCookie)(null, "refresh_token", response.data.refresh_token, {
               maxAge: 2147483647,
               path: '/',
-              domain: domain,
+              domain: process.env.cookieDomain,
               secure: true
             });
 
-          case 14:
+          case 13:
           case "end":
             return _context2.stop();
         }
@@ -1140,7 +1139,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _axios = _interopRequireDefault(require("axios"));
 
-var _querystring = _interopRequireDefault(require("querystring"));
+var _queryString = _interopRequireDefault(require("query-string"));
 
 var _nookies = require("nookies");
 
@@ -1173,7 +1172,7 @@ var signInValidator = /*#__PURE__*/function () {
             headers = {
               'Content-Type': 'application/x-www-form-urlencoded'
             };
-            queryString = _querystring["default"].stringify({
+            queryString = _queryString["default"].stringify({
               code: queryCode,
               grant_type: "authorization_code",
               redirect_uri: window.location.origin + "/signin-oidc",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.84",
+  "version": "1.0.90",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -15,10 +15,9 @@
     "next": "^12.2.0",
     "next-cookies": "^2.0.3",
     "nookies": "^2.5.2",
-    "querystring": "^0.2.1",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-data-table-component": "^7.5.2"
+    "react-data-table-component": "^7.5.2",
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.1.5",
@@ -34,7 +33,7 @@
     "next": "^12.2.0",
     "next-cookies": "^2.0.3",
     "nookies": "^2.5.2",
-    "querystring": "^0.2.1",
+    "query-string": "^7.1.1",
     "react-data-table-component": "^7.5.2"
   }
 }

package/src/components/{dataTable.js → Datatable.js}

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 //import {apiService} from 'authscape';
 import DataTable, {createTheme} from "react-data-table-component";
 
-export default class Datatable extends Component {
+export class Datatable extends Component {
 
     static defaultProps = {
         options: {}

package/src/index.js

@@ -1,13 +1,13 @@
-import React, { Component } from 'react';
-
-export default class DummyComponent extends Component {
-
-    render () {
-
-        return (
-            <div>I am a dummy react npm module</div>
-        )
-
-    }
-
+import React, { Component } from 'react';
+
+export default class DummyComponent extends Component {
+
+    render () {
+
+        return (
+            <div>I am a dummy react npm module</div>
+        )
+
+    }
+
 }

package/src/services/apiService.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import querystring from 'querystring';
+import querystring from 'query-string';
 import fileDownload from 'js-file-download';
 import cookies from 'next-cookies';
 import { setCookie, destroyCookie } from 'nookies';
@@ -59,13 +59,11 @@ const RefreshToken = async (originalRequest, instance) => {
     {
         originalRequest.headers['Authorization'] = 'Bearer ' + response.data.access_token;
 
-        let domain = getCookieDomain();
-
         await setCookie(null, "access_token", response.data.access_token,
         {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
+            domain: process.env.cookieDomain,
             secure: true
         });
     
@@ -73,7 +71,7 @@ const RefreshToken = async (originalRequest, instance) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
+            domain: process.env.cookieDomain,
             secure: true
         });
     
@@ -81,7 +79,7 @@ const RefreshToken = async (originalRequest, instance) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
+            domain: process.env.cookieDomain,
             secure: true
         });
     }
@@ -217,6 +215,10 @@ export const apiService = (ctx = {}) => {
                     {
                         return response.data;
                     }
+                    // else if (response != null && response.status == 401)
+                    // {
+                    //     // call the login window maybe?
+                    // }
                 }
 
             } catch(exp) {

package/src/services/signInValidator.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import axios from 'axios';
-import querystring from "querystring";
+import querystring from "query-string";
 import { setCookie } from 'nookies';
 
 export const signInValidator = async (queryCode) => {