authscape 1.0.14 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.14",
+  "version": "1.0.19",
   "description": "",
   "type": "module",
   "main": "index.js",

package/services/apiService.js

@@ -5,12 +5,12 @@ import cookies from 'next-cookies';
 import { parseCookies, setCookie, destroyCookie } from 'nookies';
 import { GetEnvironment } from "./BaseUri";
 
-const setupDefaultOptions = async (ctx = null) => {
+const setupDefaultOptions = async (ctx = {}) => {
 
     let defaultOptions = {};
     
-    if (ctx == null)
-    {
+    // if (ctx == {})
+    // {
         let accessToken = cookies(ctx).access_token || '';
 
         // let accessToken = window.localStorage.getItem("access_token");
@@ -28,14 +28,14 @@ const setupDefaultOptions = async (ctx = null) => {
                 },
             };
         }
-    }
-    else
-    {
-        defaultOptions = {
-            headers: {
-            },
-        };
-    }
+    // }
+    // else
+    // {
+    //     defaultOptions = {
+    //         headers: {
+    //         },
+    //     };
+    // }
 
     return defaultOptions;
 }
@@ -90,7 +90,7 @@ const RefreshToken = async (originalRequest, instance) => {
     }
 }
 
-const apiService = (ctx = null) => {
+const apiService = (ctx = {}) => {
 
     let env = GetEnvironment();
     if (env == "development")

package/services/authorizationComponent.js

@@ -5,23 +5,29 @@ export default function AuthorizationComponent({children, setCurrentUser, userLo
 
     const [loaded, setLoaded] = useState(false);
 
-    useEffect(async () => {
+
+    const validateUserSignedIn = async () => {
+
+      setLoaded(true);
+
+      let usr = await apiService().GetCurrentUser();
+      if (usr != null)
+      {
+        setCurrentUser(usr);
+      }
+      else
+      {
+        setCurrentUser(null);
+      }
+
+      userLoaded();
+    }
+
+    useEffect(() => {
 
         if (!loaded)
         {
-            setLoaded(true);
-
-            let usr = await apiService().GetCurrentUser();
-            if (usr != null)
-            {
-              setCurrentUser(usr);
-            }
-            else
-            {
-              setCurrentUser(null);
-            }
-
-            userLoaded();
+            validateUserSignedIn();
         }
 
     }, [loaded]);