@oxyhq/services 0.0.69 → 0.0.71

package/dist/components/auth/AccountSwitcherModal.d.ts

@@ -1,5 +1,7 @@
 import * as React from "react";
-export declare const AccountSwitcherModal: React.ForwardRefExoticComponent<{
+interface AccountSwitcherModalProps {
     onClose: () => void;
-} & React.RefAttributes<HTMLButtonElement>>;
+}
+export declare const AccountSwitcherModal: React.ForwardRefExoticComponent<AccountSwitcherModalProps & React.RefAttributes<HTMLDivElement>>;
+export {};
 //# sourceMappingURL=AccountSwitcherModal.d.ts.map

package/dist/components/auth/AccountSwitcherModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountSwitcherModal.d.ts","sourceRoot":"","sources":["../../../src/components/auth/AccountSwitcherModal.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAyB/B,eAAO,MAAM,oBAAoB;aAEpB,MAAM,IAAI;2CAoFrB,CAAC"}
+{"version":3,"file":"AccountSwitcherModal.d.ts","sourceRoot":"","sources":["../../../src/components/auth/AccountSwitcherModal.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAyB/B,UAAU,yBAAyB;IACjC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,eAAO,MAAM,oBAAoB,kGA0G/B,CAAC"}

package/dist/components/auth/AccountSwitcherModal.js

@@ -9,8 +9,9 @@ import { PiSignOutBold } from "react-icons/pi";
 import { AiOutlineClose } from "react-icons/ai";
 import { Avatar } from "../../features/profile";
 import getUserById from "../../hooks/getUserById";
-import styles from "./styles/session-owner-modal.module.css";
-export const AccountSwitcherModal = forwardRef(({ onClose }, ref) => {
+import styles from "./styles/account-switcher-modal.module.css";
+export const AccountSwitcherModal = forwardRef((props, ref) => {
+    const { onClose } = props;
     const { session } = useOxySession();
     const [user, setUser] = useState(null);
     const [error, setError] = useState(null);
@@ -44,7 +45,7 @@ export const AccountSwitcherModal = forwardRef(({ onClose }, ref) => {
     return (React.createElement(motion.div, { initial: { opacity: 0, y: "100%" }, animate: { opacity: 1, y: 0 }, exit: { opacity: 0, y: "100%" }, transition: {
             ease: "easeInOut",
             duration: 0.2,
-        }, className: styles.container, role: "group", onClick: handleBackdropClick },
+        }, className: styles.container, role: "group", onClick: handleBackdropClick, ref: ref },
         React.createElement("button", { className: "absolute right-3 top-3 rounded-full bg-indigo-50 p-1 hover:bg-zinc-200", onClick: onClose },
             React.createElement(AiOutlineClose, { className: "h-5 w-5 rounded-full stroke-2 text-zinc-700" })),
         React.createElement("p", null, session?.user?.email),
@@ -54,7 +55,7 @@ export const AccountSwitcherModal = forwardRef(({ onClose }, ref) => {
             "Hi, ",
             session?.user?.name,
             "!"),
-        React.createElement("button", { className: "rounded-full border border-black px-7 py-2 text-blue-500 hover:bg-[#d3dfee]" }, "Manage your Oxy Account"),
+        React.createElement("a", { href: "https://accounts.oxy.so", target: "_blank", rel: "noopener noreferrer", className: "rounded-full border border-black px-7 py-2 text-blue-500 hover:bg-[#d3dfee]" }, "Manage your Oxy Account"),
         React.createElement("div", { className: "flex space-x-1" },
             React.createElement("button", { className: "md:w-44 flex w-36 items-center space-x-2 rounded-l-full bg-white py-3 pl-3  hover:bg-zinc-200" },
                 React.createElement(HiOutlinePlus, { className: "h-7 w-7 rounded-full bg-indigo-50 p-1 text-blue-500" }),
@@ -63,9 +64,8 @@ export const AccountSwitcherModal = forwardRef(({ onClose }, ref) => {
                 React.createElement(PiSignOutBold, { className: "h-6 w-6" }),
                 React.createElement("span", null, "Sign out"))),
         React.createElement("div", { className: "flex h-10 items-center space-x-2 text-xs" },
-            React.createElement("span", null, "Privacy policy"),
+            React.createElement("a", { href: "https://oxy.so/company/transparency/policies/privacy", target: "_blank", rel: "noopener noreferrer" }, "Privacy policy"),
             React.createElement("span", { className: "-mt-[3px]" }, " . "),
-            " ",
-            React.createElement("span", null, "Terms of service"))));
+            React.createElement("a", { href: "https://oxy.so/company/transparency/policies/terms-of-service", target: "_blank", rel: "noopener noreferrer" }, "Terms of service"))));
 });
 AccountSwitcherModal.displayName = "AccountSwitcherModal";

package/dist/components/auth/SessionOwnerButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionOwnerButton.d.ts","sourceRoot":"","sources":["../../../src/components/auth/SessionOwnerButton.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,eAAO,MAAM,kBAAkB,yBAuD9B,CAAC"}
+{"version":3,"file":"SessionOwnerButton.d.ts","sourceRoot":"","sources":["../../../src/components/auth/SessionOwnerButton.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,eAAO,MAAM,kBAAkB,yBAoD9B,CAAC"}

package/dist/components/auth/SessionOwnerButton.js

@@ -31,5 +31,5 @@ export const SessionOwnerButton = () => {
             React.createElement("div", { className: "hidden fill-secondary-100 xxl:inline [&>svg]:size-h2" },
                 React.createElement(DotIcon, null))),
         React.createElement(AnimatePresence, null, isModalOpen && (React.createElement(Modal, { onClose: () => setIsModalOpen(false), background: "none", minViewportWidth: 500 },
-            React.createElement(AccountSwitcherModal, { ref: buttonRef, onClose: () => setIsModalOpen(false) }))))));
+            React.createElement(AccountSwitcherModal, { onClose: () => setIsModalOpen(false) }))))));
 };

package/dist/components/auth/styles/account-switcher-modal.module.css

@@ -0,0 +1,35 @@
+.container {
+  width: 300px;
+  background-color: var(--clr-background);
+  box-shadow: 0 0rem 10px -2px var(--clr-tertiary);
+  border-radius: 1rem;
+  padding: 0.8em 0;
+  overflow: hidden;
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  a {
+    font-size: var(--fs-milli);
+    font-weight: var(--fw-700);
+    display: block;
+    padding: 0.8em 1em;
+    cursor: pointer;
+    transition: background-color 0.1s ease-in-out;
+    &:hover {
+      background-color: var(--clr-trends-hover);
+    }
+    &:active {
+      background-color: var(--clr-trends-active);
+    }
+    &:focus-visible {
+      background-color: var(--clr-trends-hover);
+      outline: 2px solid var(--clr-primary-disabled);
+      outline-offset: -2px;
+    }
+  }
+}
+
+/*# sourceMappingURL=account-switcher-modal.module.css.map */

package/dist/components/auth/styles/account-switcher-modal.module.css.map

@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../../../src/components/auth/styles/account-switcher-modal.module.css"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;IACE;IACA;IACA;IACA;IACA;IACA;IAEA;MACE;;IAGF;MACE;;IAGF;MACE;MACA;MACA","file":"account-switcher-modal.module.css"}

package/dist/hooks/get-user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-user.d.ts","sourceRoot":"","sources":["../../src/hooks/get-user.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,OAAO,OAAc,MAAM,GAAG,SAAS,iBAsBnD,CAAC"}
+{"version":3,"file":"get-user.d.ts","sourceRoot":"","sources":["../../src/hooks/get-user.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,OAAO,OAAc,MAAM,GAAG,SAAS,iBA0BnD,CAAC"}

package/dist/hooks/get-user.js

@@ -1,28 +1,31 @@
 import axios from "axios";
 import { OXY_AUTH_URL } from "../config";
 export const getUser = async (id) => {
+    if (!id) {
+        throw new Error("User ID is required");
+    }
     try {
         const response = await axios.get(OXY_AUTH_URL + `/api/users/${id}`);
         return response.data;
     }
     catch (error) {
-        if (error.response) {
-            // The request was made and the server responded with a status code
-            // that falls out of the range of 2xx
-            console.log(error.response.data);
-            console.log(error.response.status);
-            console.log(error.response.headers);
-        }
-        else if (error.request) {
-            // The request was made but no response was received
-            // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
-            // http.ClientRequest in node.js
-            console.log(error.request);
+        if (axios.isAxiosError(error)) {
+            if (error.response) {
+                // Server responded with a status code outside of 2xx
+                throw new Error(`Server responded with status ${error.response.status}: ${error.response.data}`);
+            }
+            else if (error.request) {
+                // Request was made but no response received
+                throw new Error("No response received from server");
+            }
+            else {
+                // Error setting up the request
+                throw new Error(`Axios error: ${error.message}`);
+            }
         }
         else {
-            // Something happened in setting up the request that triggered an Error
-            console.log("Error", error.message);
+            // Non-Axios error
+            throw error;
         }
-        console.log(error.config);
     }
 };

package/dist/hooks/useOxySession.d.ts

@@ -12,6 +12,8 @@ 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;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"}
+{"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"}

package/dist/hooks/useOxySession.js

@@ -3,71 +3,58 @@ import axios from "axios";
 import { create } from "zustand";
 import localforage from "localforage";
 import { OXY_AUTH_URL } from "../config";
-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;
-                }
-                // Get the session ID from the URL parameters if it exists
+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);
-                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 {
-                    // 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" });
+                clientKey = urlParams.get("clientKey");
+            }
+            if (!clientKey) {
+                clientKey = await localforage.getItem("clientKey");
             }
-            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 {
+                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}`;
+                }
+                else if (error.request) {
+                    errorMessage = "Network error: No response received from server.";
                 }
                 else {
-                    set({
-                        error: "An unknown error occurred while loading the session data.",
-                        status: "error",
-                    });
+                    errorMessage = `Axios error: ${error.message}`;
                 }
             }
-        },
-    };
-});
+            else if (error instanceof Error) {
+                errorMessage = `Error: ${error.message}`;
+            }
+            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.69",
+  "version": "0.0.71",
   "description": "",
   "homepage": "https://oxy.so/",
   "main": "./dist/index.js",