@oxyhq/services 0.0.79 → 0.0.81

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,kGAyI/B,CAAC"}

package/dist/components/auth/AccountSwitcherModal.js

@@ -4,30 +4,20 @@ import { useEffect, useState } from "react";
 import { motion } from "framer-motion";
 import useOxySession from "../../hooks/useOxySession";
 import { forwardRef } from "react";
-import { HiOutlinePlus } from "react-icons/hi";
-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 +31,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();
         }
     };
@@ -55,23 +44,37 @@ export const AccountSwitcherModal = forwardRef((props, ref) => {
             ease: "easeInOut",
             duration: 0.2,
         }, className: styles.container, role: "group", onClick: handleBackdropClick, ref: ref },
+        React.createElement("div", { className: "w-full max-w-md mx-auto bg-white shadow-lg rounded-xl" },
+            React.createElement("div", { className: "flex justify-between items-center p-4 border-b" },
+                React.createElement("div", { className: "flex items-center space-x-2" },
+                    React.createElement(Avatar, { userImage: session?.user?.avatar, className: "h-10 w-10 rounded-full object-center", draggable: false, alt: "avatar" }),
+                    React.createElement("p", { className: "text-sm font-medium" }, session?.user?.email)),
+                React.createElement("button", { className: "p-2 hover:bg-gray-100 rounded-full" }, "Close")),
+            React.createElement("div", { className: "p-4 space-y-4" },
+                React.createElement("h2", { className: "text-2xl font-bold" }, "Hi, Shiv!"),
+                React.createElement("button", { className: "w-full py-2 px-4 border border-gray-300 rounded-md text-blue-600 hover:bg-gray-50" }, "Manage your Google Account"),
+                React.createElement("button", { className: "w-full py-2 px-4 border border-gray-300 rounded-md text-left flex justify-between items-center hover:bg-gray-50" }, "Show more accounts"),
+                React.createElement("div", { className: "pt-2" },
+                    React.createElement("p", { className: "text-sm text-gray-500 mb-2" }, "More from Oxy Services"),
+                    React.createElement("div", { className: "space-y-2" }, [
+                        { icon: null, text: "Search history", rightText: "Saving" },
+                        { icon: null, text: "Delete last 15 minutes" },
+                        { icon: null, text: "Interests" },
+                        { icon: null, text: "Search personalisation" },
+                        { icon: null, text: "SafeSearch", rightText: "Blurring on" },
+                        { icon: null, text: "Language", rightText: "English" },
+                    ].map((item, index) => (React.createElement("button", { key: index, className: "w-full py-2 px-4 flex items-center justify-start hover:bg-gray-100 rounded-md" },
+                        item.icon &&
+                            React.createElement(item.icon, {
+                                className: "h-5 w-5 mr-3",
+                            }),
+                        React.createElement("span", { className: "flex-grow text-left" }, item.text),
+                        item.rightText && (React.createElement("span", { className: "text-sm text-gray-500" }, item.rightText)))))))),
+            React.createElement("div", { className: "flex justify-between p-4 border-t" },
+                React.createElement("button", { className: "w-1/2 py-2 px-4 flex items-center justify-center hover:bg-gray-100 rounded-md" }, "More settings"),
+                React.createElement("button", { className: "w-1/2 py-2 px-4 flex items-center justify-center hover:bg-gray-100 rounded-md" }, "Help"))),
         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),
-        React.createElement("div", { className: "h-20 w-20 rounded-full border" },
-            React.createElement(Avatar, { userImage: session?.user?.avatar, className: "h-full w-full rounded-full object-center", draggable: false, alt: "avatar" })),
-        React.createElement("h2", { className: "md:text-2xl text-xl font-normal" },
-            "Hi, ",
-            session?.user?.name,
-            "!"),
-        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" }),
-                React.createElement("span", null, "Add account")),
-            React.createElement("button", { className: "md:w-44 flex w-36 items-center space-x-2 rounded-r-full bg-white py-3 pl-3  hover:bg-zinc-200" },
-                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("a", { href: "https://oxy.so/company/transparency/policies/privacy", target: "_blank", rel: "noopener noreferrer" }, "Privacy policy"),
             React.createElement("span", { className: "-mt-[3px]" }, " . "),

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.81",
   "description": "",
   "homepage": "https://oxy.so/",
   "main": "./dist/index.js",