authscape 1.0.86 → 1.0.92

package/index.js

@@ -318,12 +318,10 @@ 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"));
 
-var _nextCookies = _interopRequireDefault(require("next-cookies"));
-
 var _nookies = require("nookies");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -340,7 +338,6 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-// import Helper from "./helper";
 var setupDefaultOptions = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var ctx,
@@ -351,11 +348,11 @@ var setupDefaultOptions = /*#__PURE__*/function () {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            ctx = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            ctx = _args.length > 0 && _args[0] !== undefined ? _args[0] : null;
             defaultOptions = {};
 
-            if (Helper().isObjectEmpty(ctx)) {
-              accessToken = (0, _nextCookies["default"])(ctx).access_token || '';
+            if (ctx == null) {
+              accessToken = (0, _nookies.parseCookies)().access_token || '';
 
               if (accessToken !== null && accessToken !== undefined && accessToken != "") {
                 defaultOptions = {
@@ -391,15 +388,15 @@ 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) {
           case 0:
-            accessToken = (0, _nextCookies["default"])(null).access_token || '';
-            refreshToken = (0, _nextCookies["default"])(null).refresh_token || '';
+            accessToken = (0, _nookies.parseCookies)().access_token || '';
+            refreshToken = (0, _nookies.parseCookies)().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 +412,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();
         }
@@ -461,7 +457,7 @@ var RefreshToken = /*#__PURE__*/function () {
 }();
 
 var apiService = function apiService() {
-  var ctx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var ctx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var env = process.env.STAGE;
 
   if (env == "development") {
@@ -515,17 +511,17 @@ var apiService = function apiService() {
               // Do something 
               if (error.response.config.url.includes("/connect/token")) // remove the access and refresh if invalid
                 {
-                  (0, _nookies.destroyCookie)(ctx, "access_token", {
+                  (0, _nookies.destroyCookie)(null, "access_token", {
                     maxAge: 2147483647,
                     path: '/',
                     domain: process.env.cookieDomain
                   });
-                  (0, _nookies.destroyCookie)(ctx, "refresh_token", {
+                  (0, _nookies.destroyCookie)(null, "refresh_token", {
                     maxAge: 2147483647,
                     path: '/',
                     domain: process.env.cookieDomain
                   });
-                  (0, _nookies.destroyCookie)(ctx, "expires_in", {
+                  (0, _nookies.destroyCookie)(null, "expires_in", {
                     maxAge: 2147483647,
                     path: '/',
                     domain: process.env.cookieDomain
@@ -722,7 +718,7 @@ var apiService = function apiService() {
             switch (_context8.prev = _context8.next) {
               case 0:
                 _context8.prev = 0;
-                accessToken = (0, _nextCookies["default"])(ctx).access_token || null;
+                accessToken = (0, _nookies.parseCookies)().access_token || null;
 
                 if (!accessToken) {
                   _context8.next = 11;
@@ -730,7 +726,7 @@ var apiService = function apiService() {
                 }
 
                 _context8.next = 5;
-                return setupDefaultOptions(ctx);
+                return setupDefaultOptions(null);
 
               case 5:
                 defaultOptions = _context8.sent;
@@ -748,17 +744,19 @@ var apiService = function apiService() {
                 return _context8.abrupt("return", response.data);
 
               case 11:
-                _context8.next = 15;
+                _context8.next = 16;
                 break;
 
               case 13:
                 _context8.prev = 13;
                 _context8.t0 = _context8["catch"](0);
+                //return -1;
+                console.log(_context8.t0.message);
 
-              case 15:
+              case 16:
                 return _context8.abrupt("return", null);
 
-              case 16:
+              case 17:
               case "end":
                 return _context8.stop();
             }
@@ -1109,26 +1107,6 @@ var authService = function authService() {
 exports.authService = authService;
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Helper = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var Helper = function Helper() {
-  return {
-    isObjectEmpty: function isObjectEmpty(obj) {
-      return Object.keys(obj).length == 0;
-    }
-  };
-};
-
-exports.Helper = Helper;
-"use strict";
-
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
@@ -1140,7 +1118,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 +1151,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.86",
+  "version": "1.0.92",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -13,12 +13,10 @@
     "axios": "^0.27.2",
     "js-file-download": "^0.4.12",
     "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",
@@ -32,9 +30,8 @@
     "axios": "^0.27.2",
     "js-file-download": "^0.4.12",
     "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/services/apiService.js

@@ -1,16 +1,14 @@
 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';
-// import Helper from "./helper";
+import { parseCookies, setCookie, destroyCookie } from 'nookies';
 
-const setupDefaultOptions = async (ctx = {}) => {
+const setupDefaultOptions = async (ctx = null) => {
 
     let defaultOptions = {};
-    if (Helper().isObjectEmpty(ctx))
+    if (ctx == null)
     {
-        let accessToken = cookies(ctx).access_token || '';
+        let accessToken = parseCookies().access_token || '';
 
         if (accessToken !== null && accessToken !== undefined && accessToken != "") {
             defaultOptions = {
@@ -39,8 +37,8 @@ const setupDefaultOptions = async (ctx = {}) => {
 
 const RefreshToken = async (originalRequest, instance) => {
 
-    let accessToken = cookies(null).access_token || '';
-    let refreshToken = cookies(null).refresh_token || '';
+    let accessToken = parseCookies().access_token || '';
+    let refreshToken = parseCookies().refresh_token || '';
 
     let response = await instance.post(process.env.AUTHORITYURI + "/connect/token",
         querystring.stringify({
@@ -59,13 +57,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 +69,7 @@ const RefreshToken = async (originalRequest, instance) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
+            domain: process.env.cookieDomain,
             secure: true
         });
     
@@ -81,13 +77,13 @@ const RefreshToken = async (originalRequest, instance) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
+            domain: process.env.cookieDomain,
             secure: true
         });
     }
 }
 
-export const apiService = (ctx = {}) => {
+export const apiService = (ctx = null) => {
 
     let env = process.env.STAGE;
     if (env == "development")
@@ -114,7 +110,7 @@ export const apiService = (ctx = {}) => {
 
                 if (error.response.status === 401 && !originalConfig._retry) {
                     originalConfig._retry = true;
-            
+
                     // Do something, call refreshToken() request for example;
                     await RefreshToken(originalConfig, instance);
 
@@ -127,19 +123,19 @@ export const apiService = (ctx = {}) => {
 
                     if (error.response.config.url.includes("/connect/token")) // remove the access and refresh if invalid
                     {
-                        destroyCookie(ctx, "access_token", {
+                        destroyCookie(null, "access_token", {
                             maxAge: 2147483647,
                             path: '/',
                             domain: process.env.cookieDomain
                         });
 
-                        destroyCookie(ctx, "refresh_token", {
+                        destroyCookie(null, "refresh_token", {
                             maxAge: 2147483647,
                             path: '/',
                             domain: process.env.cookieDomain
                         });
 
-                        destroyCookie(ctx, "expires_in", {
+                        destroyCookie(null, "expires_in", {
                             maxAge: 2147483647,
                             path: '/',
                             domain: process.env.cookieDomain
@@ -208,19 +204,25 @@ export const apiService = (ctx = {}) => {
 
             try
             {
-                let accessToken = cookies(ctx).access_token || null;
+                let accessToken = parseCookies().access_token || null;
+
                 if (accessToken)
                 {
-                    let defaultOptions = await setupDefaultOptions(ctx);
+                    let defaultOptions = await setupDefaultOptions(null);
                     const response = await instance.get('/UserManagement', defaultOptions);
                     if (response != null && response.status == 200)
                     {
                         return response.data;
                     }
+                    // else if (response != null && response.status == 401)
+                    // {
+                    //     // call the login window maybe?
+                    // }
                 }
 
             } catch(exp) {
                 //return -1;
+                console.log(exp.message);
             }
             return null;    
         },

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) => {

package/src/services/helper.js

@@ -1,11 +0,0 @@
-import React from 'react';
-
-export const Helper = () => {
-
-    return {
-
-        isObjectEmpty: (obj) => {
-            return Object.keys(obj).length == 0;
-        }
-    }
-}