authscape 1.0.19 → 1.0.24

package/package.json

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

package/services/apiService.js

@@ -2,19 +2,17 @@ import axios from 'axios'
 import querystring from 'querystring';
 import fileDownload from 'js-file-download';
 import cookies from 'next-cookies';
-import { parseCookies, setCookie, destroyCookie } from 'nookies';
+import { setCookie, destroyCookie } from 'nookies';
 import { GetEnvironment } from "./BaseUri";
+import helper from "./helper";
 
 const setupDefaultOptions = async (ctx = {}) => {
 
     let defaultOptions = {};
-    
-    // if (ctx == {})
-    // {
+    if (helper().isObjectEmpty(ctx))
+    {
         let accessToken = cookies(ctx).access_token || '';
 
-        // let accessToken = window.localStorage.getItem("access_token");
-
         if (accessToken !== null && accessToken !== undefined && accessToken != "") {
             defaultOptions = {
                 headers: {
@@ -28,14 +26,14 @@ const setupDefaultOptions = async (ctx = {}) => {
                 },
             };
         }
-    // }
-    // else
-    // {
-    //     defaultOptions = {
-    //         headers: {
-    //         },
-    //     };
-    // }
+    }
+    else
+    {
+        defaultOptions = {
+            headers: {
+            },
+        };
+    }
 
     return defaultOptions;
 }
@@ -99,7 +97,6 @@ const apiService = (ctx = {}) => {
     }
 
     let baseUri = process.env.APIURI + "/api";
-    let AuthUri = process.env.AUTHORITYURI;
 
     const instance = axios.create({
         baseURL: baseUri,
@@ -208,53 +205,6 @@ const apiService = (ctx = {}) => {
                 return error.response;
             }
         },
-        login: async () => {
-
-            await signinRedirect(ctx);
-        },
-        logout: async () => {
-
-            let cookieDomain = process.env.cookieDomain;
-
-            destroyCookie(ctx, "access_token", {
-                maxAge: 2147483647,
-                path: '/',
-                domain: cookieDomain
-            });
-
-            destroyCookie(ctx, "refresh_token", {
-                maxAge: 2147483647,
-                path: '/',
-                domain: cookieDomain
-            });
-
-            destroyCookie(ctx, "expires_in", {
-                maxAge: 2147483647,
-                path: '/',
-                domain: cookieDomain
-            });
-
-            setTimeout(() => {
-                window.location.href = AuthUri + "/connect/logout?redirect=" + window.location.href;
-            }, 500);
-
-        },
-        signUp: (redirectUrl = null) => {
-
-            let url = "";
-            if (redirectUrl == null)
-            {
-                url = AuthUri + "/Account/Register?redirectUrl=" + window.location.href;
-                localStorage.setItem("redirectUri", window.location.href);
-            }
-            else
-            {
-                url = AuthUri + "/Account/Register?redirectUrl=" + redirectUrl;
-                localStorage.setItem("redirectUri", redirectUrl);
-            }
-
-            window.location.href = url;
-        },
         GetCurrentUser: async () => {
 
             try

package/services/authService.js

@@ -1,6 +1,5 @@
 import React from 'react';
-import axios from 'axios';
-import querystring from 'querystring';
+import { destroyCookie } from 'nookies';
 
 const authService = () => {
 
@@ -58,7 +57,51 @@ const authService = () => {
             }
             
             window.location.href = loginUri;
-        }
+        },
+        signUp: (redirectUrl = null) => {
+
+            let url = "";
+            if (redirectUrl == null)
+            {
+                url = AuthUri + "/Account/Register?redirectUrl=" + window.location.href;
+                localStorage.setItem("redirectUri", window.location.href);
+            }
+            else
+            {
+                url = AuthUri + "/Account/Register?redirectUrl=" + redirectUrl;
+                localStorage.setItem("redirectUri", redirectUrl);
+            }
+
+            window.location.href = url;
+        },
+        logout: async () => {
+
+            let AuthUri = process.env.AUTHORITYURI;
+            let cookieDomain = process.env.cookieDomain;
+
+            destroyCookie(ctx, "access_token", {
+                maxAge: 2147483647,
+                path: '/',
+                domain: cookieDomain
+            });
+
+            destroyCookie(ctx, "refresh_token", {
+                maxAge: 2147483647,
+                path: '/',
+                domain: cookieDomain
+            });
+
+            destroyCookie(ctx, "expires_in", {
+                maxAge: 2147483647,
+                path: '/',
+                domain: cookieDomain
+            });
+
+            setTimeout(() => {
+                window.location.href = AuthUri + "/connect/logout?redirect=" + window.location.href;
+            }, 500);
+
+        },
     }
 }
 

package/services/helper.js

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