@oxyhq/services 0.0.79 → 0.0.80

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;AA0B/B,UAAU,yBAAyB;IACjC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,eAAO,MAAM,oBAAoB,kGAiH/B,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,25 +9,17 @@ import { PiSignOutBold } from "react-icons/pi";
 import { AiOutlineClose } from "react-icons/ai";
 import { Avatar } from "../../features/profile";
 import getUserById from "../../hooks/getUserById";
-import useCrossDomainStorage from "../../hooks/useCrossDomainStorage";
 import styles from "./styles/account-switcher-modal.module.css";
 export const AccountSwitcherModal = forwardRef((props, ref) => {
     const { onClose } = props;
     const { session } = useOxySession();
-    const { get, set } = useCrossDomainStorage();
     const [user, setUser] = useState(null);
     const [error, setError] = useState(null);
     useEffect(() => {
         const fetchUser = async () => {
             try {
-                const clientKey = get("clientKey");
-                if (clientKey) {
-                    const fetchedUser = await getUserById(clientKey);
-                    setUser(fetchedUser);
-                }
-                else {
-                    setError("Client key is missing");
-                }
+                const fetchedUser = await getUserById(session?.user?.id);
+                setUser(fetchedUser);
             }
             catch (error) {
                 if (error instanceof Error) {
@@ -41,13 +33,12 @@ export const AccountSwitcherModal = forwardRef((props, ref) => {
         if (session) {
             fetchUser();
         }
-    }, [session, get]);
+    }, [session]);
     if (!session)
         return null;
     const handleBackdropClick = (e) => {
         e.stopPropagation();
         if (e.currentTarget === e.target) {
-            set("clientKey", "");
             onClose();
         }
     };

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

@@ -1 +1 @@
-{"version":3,"file":"SignInButton.d.ts","sourceRoot":"","sources":["../../../src/components/auth/SignInButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,eAAO,MAAM,YAAY,8BAItB;IACD,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,sBAmBA,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"SignInButton.d.ts","sourceRoot":"","sources":["../../../src/components/auth/SignInButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,eAAO,MAAM,YAAY,8BAItB;IACD,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,sBAgBA,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/components/auth/SignInButton.js

@@ -1,13 +1,10 @@
 import React from "react";
 import styles from "./styles/sign-in-button.module.css";
 import { OxyLogo } from "../assets/oxy-logo";
-import useCrossDomainStorage from "../../hooks/useCrossDomainStorage";
 export const SignInButton = ({ icon = React.createElement(OxyLogo, null), text = "Sign in with Oxy", callback = typeof window !== "undefined" ? window.location.href : "", }) => {
-    const { set } = useCrossDomainStorage();
     const onClick = () => {
         if (typeof window !== "undefined") {
             const redirectUrl = `https://auth.oxy.so/?callback=${encodeURIComponent(callback)}`;
-            set("clientKey", ""); // Clear the clientKey before redirecting
             window.location.href = redirectUrl;
         }
     };

package/dist/hooks/getClientKey.d.ts

@@ -0,0 +1,2 @@
+export declare const getClientKey: () => Promise<unknown>;
+//# sourceMappingURL=getClientKey.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getClientKey.d.ts","sourceRoot":"","sources":["../../src/hooks/getClientKey.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,wBAuBxB,CAAC"}

package/dist/hooks/getClientKey.js

@@ -0,0 +1,19 @@
+export const getClientKey = async () => {
+    const iframe = document.createElement("iframe");
+    iframe.src = "https://auth.oxy.so/share-session";
+    iframe.style.display = "none";
+    document.body.appendChild(iframe);
+    return new Promise((resolve) => {
+        const messageHandler = (event) => {
+            if (event.origin === "https://auth.oxy.so" && event.data.clientKey) {
+                window.removeEventListener("message", messageHandler);
+                document.body.removeChild(iframe);
+                resolve(event.data.clientKey);
+            }
+        };
+        window.addEventListener("message", messageHandler);
+        iframe.onload = () => {
+            iframe.contentWindow?.postMessage({ action: "getClientKey" }, "https://auth.oxy.so");
+        };
+    });
+};

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;AAGpC,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,2EA8D1B,CAAC;AAEH,iBAAS,aAAa;;;;EAQrB;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"useOxySession.d.ts","sourceRoot":"","sources":["../../src/hooks/useOxySession.ts"],"names":[],"mappings":"AAOA,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,2EAmD1B,CAAC;AAEH,iBAAS,aAAa;;;;EAQrB;AAED,eAAe,aAAa,CAAC"}

package/dist/hooks/useOxySession.js

@@ -1,8 +1,8 @@
 import { useEffect } from "react";
 import axios from "axios";
 import { create } from "zustand";
+import { getClientKey } from "./getClientKey";
 import { OXY_AUTH_URL } from "../config";
-import useCrossDomainStorage from "./useCrossDomainStorage";
 export const useSessionStore = create((set) => {
     let isFirstFetch = true;
     return {
@@ -15,19 +15,8 @@ export const useSessionStore = create((set) => {
                     set({ status: "loading" });
                     isFirstFetch = false;
                 }
-                // 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) {
-                    const { get } = useCrossDomainStorage();
-                    clientKey = get("clientKey");
-                }
-                else {
-                    // If the session ID was found in the URL parameters, set it in local storage
-                    const { set } = useCrossDomainStorage();
-                    set("clientKey", clientKey);
-                }
+                // Get the client key using the getClientKey function
+                let clientKey = await getClientKey();
                 const response = await axios.get(OXY_AUTH_URL + "/api/session/" + clientKey);
                 if (response.status !== 200) {
                     throw new Error(`Unexpected response status: ${response.status}`);

package/package.json

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