authscape 1.0.359 → 1.0.370

package/index.js

@@ -9,10 +9,10 @@ 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 _router = require("next/router");
 var _styles = require("@mui/material/styles");
 var _material = require("@mui/material");
 var _head = _interopRequireDefault(require("next/head"));
+var _navigation = require("next/navigation");
 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; }
@@ -52,30 +52,59 @@ function AuthScapeApp(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     loadingLogin = _useState8[0],
     setLoadingLogin = _useState8[1];
-  var router = (0, _router.useRouter)();
-  (0, _react.useEffect)(function () {}, [loadedUser]);
-  (0, _react.useEffect)(function () {
-    if (loadedUser && router.isReady) {
-      if (process.env.googleAnalytics4 != null) {
-        init(process.env.googleAnalytics4);
-      }
-      if (router.query.r != null) {
-        localStorage.setItem("ref", router.query.r);
-      }
-
-      // sign in validation
-      if (router.query.code != null) {
-        setLoadingLogin(true);
-        signInValidator(router.query.code);
-      } else {
-        if (enforceLoggedIn) {
-          if (currentUser == null) {
-            authService().login();
-          }
+  var validateCode = function validateCode() {
+    if (queryCode != null) {
+      setLoadingLogin(true);
+      signInValidator(queryCode);
+    } else {
+      if (enforceLoggedIn) {
+        if (currentUser == null) {
+          authService().login();
         }
       }
     }
-  }, [loadedUser, router.isReady]);
+  };
+  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])
+
   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"
@@ -2976,6 +3005,7 @@ 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"));
@@ -3151,7 +3181,7 @@ function SpreadsheetViewer(_ref) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return apiService().get(url);
+                return (0, _authscape.apiService)().get(url);
               case 2:
                 response = _context.sent;
                 if (response != null && response.status == 200) {
@@ -3179,7 +3209,7 @@ function SpreadsheetViewer(_ref) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return apiService().get("/AuthScapeSpreadSheet/GetActiveSessions?documentId=" + documentId);
+            return (0, _authscape.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.359",
+  "version": "1.0.370",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -27,9 +27,6 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@dnd-kit/core": "^6.1.0",
-    "@dnd-kit/sortable": "^8.0.0",
-    "@dnd-kit/utilities": "^3.2.2",
     "@microsoft/signalr": "^8.0.0",
     "@monaco-editor/react": "^4.5.1",
     "@silevis/reactgrid": "^4.1.3",
@@ -38,12 +35,12 @@
     "axios": "^1.6.1",
     "draft-js": "^0.11.7",
     "draftjs-to-html": "^0.9.1",
-    "eslint-config-next": "^13.3.2",
+    "eslint-config-next": "^14.1.0",
     "ga-4-react": "^0.1.281",
     "html2canvas": "^1.4.1",
     "js-file-download": "^0.4.12",
     "jspdf": "^2.5.1",
-    "next": "^13.3.2",
+    "next": "^14.1.0",
     "nookies": "^2.5.2",
     "query-string": "^7.1.1",
     "react-color": "^2.19.3",

package/src/components/AuthScapeApp.js

@@ -2,10 +2,10 @@ import React, { useEffect, useState, useRef } from 'react';
 import CircularProgress from '@mui/material/CircularProgress';
 import Backdrop from '@mui/material/Backdrop';
 import { ToastContainer, toast } from 'react-toastify';
-import { useRouter } from 'next/router';
 import { ThemeProvider } from '@mui/material/styles';
 import { Box } from '@mui/material';
 import Head from "next/head";
+import { useSearchParams } from 'next/navigation';
 
 export function AuthScapeApp({Component, pageProps, muiTheme = {}, enforceLoggedIn = false, enableAuth = true, onAuthenticationLoaded = null, children = null}) {
 
@@ -13,46 +13,68 @@ export function AuthScapeApp({Component, pageProps, muiTheme = {}, enforceLogged
     const [loadedUser, setLoadedUser] = useState(false);
     const [currentUser, setCurrentUser] = useState(null);
     const [loadingLogin, setLoadingLogin] = useState(false);
-    const router = useRouter();
-
-    useEffect(() => {
-        
-    }, [loadedUser]);
 
 
-    useEffect(() => {
 
-        if (loadedUser && router.isReady)
+    const validateCode = () => {
+        if (queryCode != null)
         {
-            if (process.env.googleAnalytics4 != null)
-            {
-                init(process.env.googleAnalytics4);
-            }
-        
-            if (router.query.r != null)
-            {
-                localStorage.setItem("ref", router.query.r);
-            }
-
-            // sign in validation
-            if (router.query.code != null)
-            {
-                setLoadingLogin(true);
-                signInValidator(router.query.code);
-            }
-            else
+            setLoadingLogin(true);
+            signInValidator(queryCode);
+        }
+        else
+        {
+            if (enforceLoggedIn)
             {
-                if (enforceLoggedIn)
+                if (currentUser == null)
                 {
-                    if (currentUser == null)
-                    {
-                        authService().login();
-                    }
+                    authService().login();
                 }
             }
         }
+    }
+
+    const searchParams = useSearchParams();
+    const queryRef = searchParams.get('ref');
+    const 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])
+    // }, [loadedUser, router.isReady])
 
 
     return (

package/src/components/spreadsheet/spreadsheetViewer.js

@@ -1,6 +1,7 @@
 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';