@oxyhq/services 0.0.71 → 0.0.72

package/dist/hooks/useOxySession.d.ts

@@ -12,8 +12,6 @@ interface SessionModel {
         role: UserRole;
         isOAuth: boolean;
         isTwoFactorEnabled: boolean;
-        lastLogin: string;
-        permissions: string[];
     };
 }
 type SessionState = {

package/dist/hooks/useOxySession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOxySession.d.ts","sourceRoot":"","sources":["../../src/hooks/useOxySession.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,UAAU,YAAY;IACpB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,QAAQ,CAAC;QACf,OAAO,EAAE,OAAO,CAAC;QACjB,kBAAkB,EAAE,OAAO,CAAC;QAC5B,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,EAAE,CAAC;KACvB,CAAC;CACH;AAED,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;IACX,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,eAAe,2EAiDzB,CAAC;AAEJ,iBAAS,aAAa;;;;EAQrB;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"useOxySession.d.ts","sourceRoot":"","sources":["../../src/hooks/useOxySession.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,UAAU,YAAY;IACpB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,QAAQ,CAAC;QACf,OAAO,EAAE,OAAO,CAAC;QACjB,kBAAkB,EAAE,OAAO,CAAC;KAC7B,CAAC;CACH;AAED,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;IACX,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,eAAe,2EA4D1B,CAAC;AAEH,iBAAS,aAAa;;;;EAQrB;AAED,eAAe,aAAa,CAAC"}

package/dist/hooks/useOxySession.js

@@ -3,58 +3,71 @@ import axios from "axios";
 import { create } from "zustand";
 import localforage from "localforage";
 import { OXY_AUTH_URL } from "../config";
-export const useSessionStore = create((set) => ({
-    session: null,
-    status: "idle",
-    error: null,
-    fetchSessionData: async () => {
-        set({ status: "loading" });
-        try {
-            let clientKey = null;
-            if (typeof window !== "undefined") {
-                const urlParams = new URLSearchParams(window.location.search);
-                clientKey = urlParams.get("clientKey");
-            }
-            if (!clientKey) {
-                clientKey = await localforage.getItem("clientKey");
-            }
-            else {
-                await localforage.setItem("clientKey", clientKey);
-            }
-            if (!clientKey) {
-                throw new Error("Client key not found.");
-            }
-            const response = await axios.get(`${OXY_AUTH_URL}/api/session/${clientKey}`);
-            if (response.status !== 200) {
-                throw new Error(`Unexpected response status: ${response.status}`);
-            }
-            set({ session: response.data, status: "success", error: null });
-        }
-        catch (error) {
-            let errorMessage = "An error occurred while loading the session data.";
-            if (axios.isAxiosError(error)) {
-                if (error.response) {
-                    errorMessage = `API error: ${error.response.status} ${error.response.statusText}`;
+export const useSessionStore = create((set) => {
+    let isFirstFetch = true;
+    return {
+        session: null,
+        status: "loading",
+        error: null,
+        fetchSessionData: async () => {
+            try {
+                if (isFirstFetch) {
+                    set({ status: "loading" });
+                    isFirstFetch = false;
                 }
-                else if (error.request) {
-                    errorMessage = "Network error: No response received from server.";
+                // Get the session ID from the URL parameters if it exists
+                const urlParams = new URLSearchParams(window.location.search);
+                let clientKey = urlParams.get("clientKey");
+                // If the session ID was not found in the URL parameters, get it from local storage
+                if (!clientKey) {
+                    clientKey = await localforage.getItem("clientKey");
                 }
                 else {
-                    errorMessage = `Axios error: ${error.message}`;
+                    // If the session ID was found in the URL parameters, set it in local storage
+                    await localforage.setItem("clientKey", clientKey);
+                }
+                const response = await axios.get(OXY_AUTH_URL + "/api/session/" + clientKey);
+                if (response.status !== 200) {
+                    throw new Error(`Unexpected response status: ${response.status}`);
                 }
+                set({ session: response.data, status: "success" });
             }
-            else if (error instanceof Error) {
-                errorMessage = `Error: ${error.message}`;
+            catch (error) {
+                if (axios.isAxiosError(error)) {
+                    if (error.response) {
+                        set({
+                            error: `Network error: ${error.message}, Status code: ${error.response.status}`,
+                            status: "error",
+                        });
+                    }
+                    else if (error.request) {
+                        set({
+                            error: "Network error: No response received from server.",
+                            status: "error",
+                        });
+                    }
+                    else {
+                        set({
+                            error: `Network error: ${error.message}`,
+                            status: "error",
+                        });
+                    }
+                }
+                else {
+                    set({
+                        error: "An unknown error occurred while loading the session data.",
+                        status: "error",
+                    });
+                }
             }
-            set({ error: errorMessage, status: "error", session: null });
-        }
-    },
-}));
+        },
+    };
+});
 function useOxySession() {
     const { session, status, error, fetchSessionData } = useSessionStore();
     useEffect(() => {
         fetchSessionData();
-    }, [fetchSessionData]);
+    }, []);
     return { session, status, error };
 }
 export default useOxySession;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "0.0.71",
+  "version": "0.0.72",
   "description": "",
   "homepage": "https://oxy.so/",
   "main": "./dist/index.js",