authscape 1.0.370 → 1.0.372

package/index.js

@@ -6,17 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AuthScapeApp = AuthScapeApp;
 var _react = _interopRequireWildcard(require("react"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
-var _Backdrop = _interopRequireDefault(require("@mui/material/Backdrop"));
 var _reactToastify = require("react-toastify");
 var _styles = require("@mui/material/styles");
-var _material = require("@mui/material");
 var _head = _interopRequireDefault(require("next/head"));
 var _navigation = require("next/navigation");
+var _axios = _interopRequireDefault(require("axios"));
+var _queryString = _interopRequireDefault(require("query-string"));
+var _nookies = require("nookies");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+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); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -25,118 +28,169 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function AuthScapeApp(_ref) {
   var Component = _ref.Component,
+    layout = _ref.layout,
     pageProps = _ref.pageProps,
     _ref$muiTheme = _ref.muiTheme,
     muiTheme = _ref$muiTheme === void 0 ? {} : _ref$muiTheme,
     _ref$enforceLoggedIn = _ref.enforceLoggedIn,
     enforceLoggedIn = _ref$enforceLoggedIn === void 0 ? false : _ref$enforceLoggedIn,
     _ref$enableAuth = _ref.enableAuth,
-    enableAuth = _ref$enableAuth === void 0 ? true : _ref$enableAuth,
-    _ref$onAuthentication = _ref.onAuthenticationLoaded,
-    onAuthenticationLoaded = _ref$onAuthentication === void 0 ? null : _ref$onAuthentication,
-    _ref$children = _ref.children,
-    children = _ref$children === void 0 ? null : _ref$children;
+    enableAuth = _ref$enableAuth === void 0 ? true : _ref$enableAuth;
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
-    isLoading = _useState2[0],
-    setIsLoading = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    loadedUser = _useState4[0],
-    setLoadedUser = _useState4[1];
-  var _useState5 = (0, _react.useState)(null),
-    _useState6 = _slicedToArray(_useState5, 2),
-    currentUser = _useState6[0],
-    setCurrentUser = _useState6[1];
-  var _useState7 = (0, _react.useState)(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    loadingLogin = _useState8[0],
-    setLoadingLogin = _useState8[1];
-  var validateCode = function validateCode() {
-    if (queryCode != null) {
-      setLoadingLogin(true);
-      signInValidator(queryCode);
-    } else {
-      if (enforceLoggedIn) {
-        if (currentUser == null) {
-          authService().login();
-        }
-      }
-    }
-  };
+    frontEndLoadedState = _useState2[0],
+    setFrontEndLoadedState = _useState2[1];
+  var loadingAuth = (0, _react.useRef)(false);
+  var frontEndLoaded = (0, _react.useRef)(false);
+  var signedInUser = (0, _react.useRef)(null);
+  var queryCodeUsed = (0, _react.useRef)(null);
   var searchParams = (0, _navigation.useSearchParams)();
   var queryRef = searchParams.get('ref');
   var queryCode = searchParams.get('code');
-  validateCode(queryCode);
-
-  // const router = useRouter();
-
-  // useEffect(() => {
-
-  //     if (loadedUser && router.isReady)
-  //     {
-  //         if (process.env.googleAnalytics4 != null)
-  //         {
-  //             init(process.env.googleAnalytics4);
-  //         }
-
-  //         if (queryRef != null)
-  //         {
-  //             localStorage.setItem("ref", queryRef);
-  //         }
-
-  //         // sign in validation
-  //         if (queryCode != null)
-  //         {
-  //             setLoadingLogin(true);
-  //             signInValidator(queryCode);
-  //         }
-  //         else
-  //         {
-  //             if (enforceLoggedIn)
-  //             {
-  //                 if (currentUser == null)
-  //                 {
-  //                     authService().login();
-  //                 }
-  //             }
-  //         }
-  //     }
-
-  // }, [loadedUser, router.isReady])
-
+  var pathname = (0, _navigation.usePathname)();
+  var signInValidator = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(queryCode) {
+      var codeVerifier, headers, queryString, response, domainHost, redirectUri;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(queryCodeUsed.current != queryCode)) {
+              _context.next = 4;
+              break;
+            }
+            queryCodeUsed.current = queryCode;
+            _context.next = 5;
+            break;
+          case 4:
+            return _context.abrupt("return");
+          case 5:
+            codeVerifier = window.localStorage.getItem("verifier");
+            if (!(queryCode != null && codeVerifier != null)) {
+              _context.next = 28;
+              break;
+            }
+            headers = {
+              'Content-Type': 'application/x-www-form-urlencoded'
+            };
+            queryString = _queryString["default"].stringify({
+              code: queryCode,
+              grant_type: "authorization_code",
+              redirect_uri: window.location.origin + "/signin-oidc",
+              client_id: process.env.client_id,
+              client_secret: process.env.client_secret,
+              code_verifier: codeVerifier
+            });
+            _context.prev = 9;
+            _context.next = 12;
+            return _axios["default"].post(process.env.authorityUri + '/connect/token', queryString, {
+              headers: headers
+            });
+          case 12:
+            response = _context.sent;
+            domainHost = window.location.hostname.split('.').slice(-2).join('.');
+            window.localStorage.removeItem("verifier");
+            _context.next = 17;
+            return (0, _nookies.setCookie)(null, "access_token", response.data.access_token, {
+              maxAge: 2147483647,
+              path: '/',
+              domain: domainHost,
+              secure: true
+            });
+          case 17:
+            _context.next = 19;
+            return (0, _nookies.setCookie)(null, "expires_in", response.data.expires_in, {
+              maxAge: 2147483647,
+              path: '/',
+              domain: domainHost,
+              secure: true
+            });
+          case 19:
+            _context.next = 21;
+            return (0, _nookies.setCookie)(null, "refresh_token", response.data.refresh_token, {
+              maxAge: 2147483647,
+              path: '/',
+              domain: domainHost,
+              secure: true
+            });
+          case 21:
+            redirectUri = localStorage.getItem("redirectUri");
+            localStorage.clear();
+            if (redirectUri != null) {
+              window.location.href = redirectUri;
+            } else {
+              window.location.href = "/";
+            }
+            _context.next = 28;
+            break;
+          case 26:
+            _context.prev = 26;
+            _context.t0 = _context["catch"](9);
+          case 28:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[9, 26]]);
+    }));
+    return function signInValidator(_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var validateUserSignedIn = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var usr;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            loadingAuth.current = true;
+            if (!enableAuth) {
+              _context2.next = 6;
+              break;
+            }
+            _context2.next = 4;
+            return apiService().GetCurrentUser();
+          case 4:
+            usr = _context2.sent;
+            if (usr != null) {
+              signedInUser.current = usr;
+            }
+          case 6:
+            setFrontEndLoadedState(true);
+            frontEndLoaded.current = true;
+          case 8:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function validateUserSignedIn() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  if (queryCode != null) {
+    signInValidator(queryCode);
+  } else {
+    if (!loadingAuth.current) {
+      validateUserSignedIn();
+    }
+  }
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_head["default"], null, /*#__PURE__*/_react["default"].createElement("meta", {
     name: "viewport",
-    content: "width=device-width, initial-scale=1"
+    content: "width=device-width, initial-scale=0.86, maximum-scale=5.0, minimum-scale=0.86"
   }), pageProps != null && pageProps.oemCompanyId != null && /*#__PURE__*/_react["default"].createElement("link", {
     href: process.env.apiUri + "/api/WhiteLabel/GetDataFromRecord?oemCompanyId=" + pageProps.oemCompanyId,
     rel: "stylesheet"
   })), /*#__PURE__*/_react["default"].createElement(_styles.ThemeProvider, {
     theme: muiTheme
-  }, loadingLogin && /*#__PURE__*/_react["default"].createElement(_material.Box, null, "Please wait. Loading..."), !loadingLogin && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(AuthorizationComponent, {
-    setCurrentUser: setCurrentUser,
-    isEnabled: enableAuth,
-    userLoaded: function userLoaded(signedInUser) {
-      setLoadedUser(true);
-      if (onAuthenticationLoaded != null) {
-        onAuthenticationLoaded(signedInUser);
-      }
-    }
-  }, children == null && /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
-    currentUser: currentUser,
-    toast: _reactToastify.toast,
-    setIsLoading: setIsLoading,
-    loadedUser: loadedUser,
-    logEvent: logEvent
-  })), children != null && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, children)), /*#__PURE__*/_react["default"].createElement(_Backdrop["default"], {
-    sx: {
-      color: '#fff',
-      zIndex: 99999
-    },
-    open: isLoading
-  }, /*#__PURE__*/_react["default"].createElement(_CircularProgress["default"], {
-    color: "inherit"
-  })), /*#__PURE__*/_react["default"].createElement(_reactToastify.ToastContainer, null))), loadedUser && process.env.microsoftClarityTrackingCode != null && process.env.staging == "production" && /*#__PURE__*/_react["default"].createElement("script", {
+  }, frontEndLoadedState != null && frontEndLoadedState && pathname != "/signin-oidc" && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, layout != null && layout({
+    children: /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
+      currentUser: signedInUser.current,
+      toast: _reactToastify.toast
+    })),
+    currentUser: signedInUser.current
+  }), layout == null && /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
+    currentUser: signedInUser.current,
+    toast: _reactToastify.toast
+  }))), /*#__PURE__*/_react["default"].createElement(_reactToastify.ToastContainer, null)), frontEndLoaded.current && process.env.microsoftClarityTrackingCode != null && process.env.staging == "production" && /*#__PURE__*/_react["default"].createElement("script", {
     dangerouslySetInnerHTML: {
       __html: "\n                        (function(c,l,a,r,i,t,y){\n                            c[a] = c[a] || function () { (c[a].q = c[a].q || []).push(arguments) };\n                            t=l.createElement(r);\n                            t.async=1;\n                            t.src=\"https://www.clarity.ms/tag/\"+i;\n                            y=l.getElementsByTagName(r)[0];\n                            y.parentNode.insertBefore(t,y);\n                        })(window, document, \"clarity\", \"script\", \"" + process.env.microsoftClarityTrackingCode + "\");"
     }
@@ -3005,7 +3059,6 @@ exports.SpreadsheetViewer = SpreadsheetViewer;
 var _material = require("@mui/material");
 var _react = _interopRequireWildcard(require("react"));
 var _reactgrid = require("@silevis/reactgrid");
-var _authscape = require("authscape");
 var _reactDeviceDetect = require("react-device-detect");
 var signalR = _interopRequireWildcard(require("@microsoft/signalr"));
 var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
@@ -3181,7 +3234,7 @@ function SpreadsheetViewer(_ref) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return (0, _authscape.apiService)().get(url);
+                return apiService().get(url);
               case 2:
                 response = _context.sent;
                 if (response != null && response.status == 200) {
@@ -3209,7 +3262,7 @@ function SpreadsheetViewer(_ref) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return (0, _authscape.apiService)().get("/AuthScapeSpreadSheet/GetActiveSessions?documentId=" + documentId);
+            return apiService().get("/AuthScapeSpreadSheet/GetActiveSessions?documentId=" + documentId);
           case 2:
             response = _context2.sent;
             sessionData = response.data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.370",
+  "version": "1.0.372",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,6 @@
     "@stripe/stripe-js": "^1.32.0",
     "js-file-download": "^0.4.12",
     "nookies": "^2.5.2",
-    "react": "^18.2.0",
     "react-data-table-component": "^7.5.2",
     "react-dom": "^18.2.0"
   },
@@ -23,12 +22,17 @@
     "@babel/core": "^7.22.1",
     "@babel/preset-env": "^7.22.2",
     "@babel/preset-react": "^7.0.0",
-    "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "dependencies": {
+    "@emotion/react": "^11.11.3",
+    "@emotion/styled": "^11.11.0",
     "@microsoft/signalr": "^8.0.0",
     "@monaco-editor/react": "^4.5.1",
+    "@mui/icons-material": "^5.15.10",
+    "@mui/material": "^5.15.10",
+    "@mui/x-data-grid": "^6.19.4",
+    "@mui/x-date-pickers": "^6.19.4",
     "@silevis/reactgrid": "^4.1.3",
     "@stripe/react-stripe-js": "^1.9.0",
     "@stripe/stripe-js": "^1.32.0",
@@ -43,13 +47,15 @@
     "next": "^14.1.0",
     "nookies": "^2.5.2",
     "query-string": "^7.1.1",
+    "react": "^18.2.0",
     "react-color": "^2.19.3",
     "react-cool-onclickoutside": "^1.7.0",
     "react-data-table-component": "^7.5.2",
     "react-device-detect": "^2.2.3",
     "react-draft-wysiwyg": "^1.15.0",
-    "react-hook-form": "^7.44.2",
+    "react-hook-form": "^7.50.1",
     "react-toastify": "^9.1.3",
+    "styled-components": "^5.3.6",
     "use-places-autocomplete": "^4.0.0"
   }
 }

package/src/components/AuthScapeApp.js

@@ -1,86 +1,142 @@
-import React, { useEffect, useState, useRef } from 'react';
-import CircularProgress from '@mui/material/CircularProgress';
-import Backdrop from '@mui/material/Backdrop';
+import React, {useState, useRef} from 'react';
 import { ToastContainer, toast } from 'react-toastify';
 import { ThemeProvider } from '@mui/material/styles';
-import { Box } from '@mui/material';
 import Head from "next/head";
-import { useSearchParams } from 'next/navigation';
+import { useSearchParams, usePathname } from 'next/navigation';
+import axios from 'axios';
+import querystring from "query-string";
+import { setCookie } from 'nookies'
 
-export function AuthScapeApp({Component, pageProps, muiTheme = {}, enforceLoggedIn = false, enableAuth = true, onAuthenticationLoaded = null, children = null}) {
+export function AuthScapeApp ({Component, layout, pageProps, muiTheme = {}, enforceLoggedIn = false, enableAuth = true}) {
 
-    const [isLoading, setIsLoading] = useState(false);
-    const [loadedUser, setLoadedUser] = useState(false);
-    const [currentUser, setCurrentUser] = useState(null);
-    const [loadingLogin, setLoadingLogin] = useState(false);
+    const [frontEndLoadedState, setFrontEndLoadedState] = useState(false);
 
+    const loadingAuth = useRef(false);
+    const frontEndLoaded = useRef(false);
+    const signedInUser = useRef(null);
 
+    const queryCodeUsed = useRef(null);
 
-    const validateCode = () => {
-        if (queryCode != null)
+    const searchParams = useSearchParams();
+    const queryRef = searchParams.get('ref');
+    const queryCode = searchParams.get('code');
+
+    
+
+    const pathname = usePathname();
+
+
+    const signInValidator = async (queryCode) => {
+ 
+        if (queryCodeUsed.current != queryCode)
         {
-            setLoadingLogin(true);
-            signInValidator(queryCode);
+            queryCodeUsed.current = queryCode;
         }
         else
         {
-            if (enforceLoggedIn)
+            return;
+        }
+
+        let codeVerifier = window.localStorage.getItem("verifier");
+        if (queryCode != null && codeVerifier != null)
             {
-                if (currentUser == null)
+              const headers = {'Content-Type': 'application/x-www-form-urlencoded'}
+      
+              let queryString = querystring.stringify({
+                code: queryCode,
+                grant_type: "authorization_code",
+                redirect_uri: window.location.origin + "/signin-oidc",
+                client_id: process.env.client_id,
+                client_secret: process.env.client_secret,
+                code_verifier: codeVerifier
+              });
+      
+              try
+              {
+                let response = await axios.post(process.env.authorityUri + '/connect/token', queryString, {
+                    headers: headers
+                });
+        
+                let domainHost = window.location.hostname.split('.').slice(-2).join('.');
+                window.localStorage.removeItem("verifier");
+        
+                await setCookie(null, "access_token", response.data.access_token,
+                {
+                    maxAge: 2147483647,
+                    path: '/',
+                    domain: domainHost,
+                    secure: true
+                });
+            
+                await setCookie(null, "expires_in", response.data.expires_in,
+                {
+                    maxAge: 2147483647,
+                    path: '/',
+                    domain: domainHost,
+                    secure: true
+                });
+            
+                await setCookie(null, "refresh_token", response.data.refresh_token,
+                {
+                    maxAge: 2147483647,
+                    path: '/',
+                    domain: domainHost,
+                    secure: true
+                });
+        
+        
+                let redirectUri = localStorage.getItem("redirectUri")
+                localStorage.clear();
+                if (redirectUri != null)
+                {
+                    window.location.href = redirectUri;
+                }
+                else
                 {
-                    authService().login();
+                    window.location.href = "/";
                 }
             }
+            catch(exp)
+            {
+                //alert(exp)
+            }
         }
     }
 
-    const searchParams = useSearchParams();
-    const queryRef = searchParams.get('ref');
-    const queryCode = searchParams.get('code');
-    validateCode(queryCode);
 
-    // const router = useRouter();
+    const validateUserSignedIn = async () => {
 
+        loadingAuth.current = true;
 
-    // useEffect(() => {
-
-    //     if (loadedUser && router.isReady)
-    //     {
-    //         if (process.env.googleAnalytics4 != null)
-    //         {
-    //             init(process.env.googleAnalytics4);
-    //         }
+        if (enableAuth)
+        {
+          let usr = await apiService().GetCurrentUser();
+          if (usr != null)
+          {
+            signedInUser.current = usr;
+          }
+        }
         
-    //         if (queryRef != null)
-    //         {
-    //             localStorage.setItem("ref", queryRef);
-    //         }
-
-    //         // sign in validation
-    //         if (queryCode != null)
-    //         {
-    //             setLoadingLogin(true);
-    //             signInValidator(queryCode);
-    //         }
-    //         else
-    //         {
-    //             if (enforceLoggedIn)
-    //             {
-    //                 if (currentUser == null)
-    //                 {
-    //                     authService().login();
-    //                 }
-    //             }
-    //         }
-    //     }
-    
-    // }, [loadedUser, router.isReady])
+        setFrontEndLoadedState(true);
+        frontEndLoaded.current = true;
+    }
 
+    if (queryCode != null)
+    {
+        signInValidator(queryCode);
+    }
+    else
+    {
+        if (!loadingAuth.current)
+        {
+            validateUserSignedIn();
+        }
+    }
 
     return (
         <>
             <Head>
-                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                <meta name="viewport" content="width=device-width, initial-scale=0.86, maximum-scale=5.0, minimum-scale=0.86"></meta>
                 {(pageProps != null && pageProps.oemCompanyId != null) &&
                     <link
                         href={process.env.apiUri + "/api/WhiteLabel/GetDataFromRecord?oemCompanyId=" + pageProps.oemCompanyId}
@@ -90,43 +146,23 @@ export function AuthScapeApp({Component, pageProps, muiTheme = {}, enforceLogged
             </Head>
 
             <ThemeProvider theme={muiTheme}>
-
-                {loadingLogin &&
-                <Box>
-                    Please wait. Loading...
-                </Box>
-                }
-
-                {!loadingLogin &&
+                {frontEndLoadedState != null && frontEndLoadedState && pathname != "/signin-oidc" &&
                 <>
-                    <AuthorizationComponent setCurrentUser={setCurrentUser} isEnabled={enableAuth} userLoaded={(signedInUser) => {
-                        setLoadedUser(true);
-                        
-                        if (onAuthenticationLoaded != null)
-                        {
-                            onAuthenticationLoaded(signedInUser);
-                        }
-                    }}>
-                        {children == null &&
-                            <Component {...pageProps} currentUser={currentUser} toast={toast} setIsLoading={setIsLoading} loadedUser={loadedUser} logEvent={logEvent} />
-                        }
-                        {children != null &&
-                        <>
-                            {children}
-                        </>
-                        }
-                    </AuthorizationComponent>
-
-                    <Backdrop sx={{ color: '#fff', zIndex: 99999 }} open={isLoading}>
-                        <CircularProgress color="inherit" />
-                    </Backdrop>
-
-                    <ToastContainer />
+                    {layout != null && layout({
+                        children: <Component {...pageProps} currentUser={signedInUser.current} toast={toast} />,
+                        currentUser: signedInUser.current
+                    })}
+
+                    {layout == null &&
+                        <Component {...pageProps} currentUser={signedInUser.current} toast={toast} />   
+                    }
                 </>
                 }
+                <ToastContainer />
+
             </ThemeProvider>
 
-            {(loadedUser && process.env.microsoftClarityTrackingCode != null && process.env.staging == "production") &&
+            {(frontEndLoaded.current && process.env.microsoftClarityTrackingCode != null && process.env.staging == "production") &&
                 <script
                 dangerouslySetInnerHTML={{
                     __html: `

package/src/components/spreadsheet/spreadsheetViewer.js

@@ -1,7 +1,6 @@
 import { Box, Button } from '@mui/material';
 import React, { useEffect, useState, useRef } from 'react';
 import { ReactGrid, Column, Row } from "@silevis/reactgrid";
-import { apiService } from 'authscape';
 import {isMacOs} from 'react-device-detect';
 import * as signalR from '@microsoft/signalr';
 import Avatar from '@mui/material/Avatar';