@0xchain/with-login 1.1.0-beta.61 → 1.1.0-beta.63

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAON,MAAM,OAAO,CAAC;AAaf,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,eAAe,CAAC;AAcvB,eAAO,MAAM,OAAO,eAInB,CAAC;AAEF,oBAAY,gBAAgB;IAC1B,iBAAiB,oBAAoB;IACrC,aAAa,iBAAiB;CAC/B;AAED,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IACxD,4BAA4B,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC;CACpF;AAED,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,qDAAqD;IACrD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AAuCD,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,MAAM,EAAE,UAAU,EAClB,oBAA8C,GAC/C,EAAE,kBAAkB,2CAgHpB;AAED,wBAAgB,QAAQ,IAAI,iBAAiB,CAM5C;AAED,UAAU,cACR,SAAQ,KAAK,CAAC,iBAAiB,EAC7B,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,kDAcvE;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAON,MAAM,OAAO,CAAC;AAYf,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,eAAe,CAAC;AAMvB,eAAO,MAAM,OAAO,eAInB,CAAC;AAEF,oBAAY,gBAAgB;IAC1B,iBAAiB,oBAAoB;IACrC,aAAa,iBAAiB;CAC/B;AAED,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IACxD,4BAA4B,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC;CACpF;AAED,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,qDAAqD;IACrD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AAuDD,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,MAAM,EAAE,UAAU,EAClB,oBAA8C,GAC/C,EAAE,kBAAkB,2CA0HpB;AAED,wBAAgB,QAAQ,IAAI,iBAAiB,CAM5C;AAED,UAAU,cACR,SAAQ,KAAK,CAAC,iBAAiB,EAC7B,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,kDAcvE;AAED,eAAe,SAAS,CAAC"}

package/dist/index.js

@@ -5,23 +5,15 @@ import { useLocale } from "@0xchain/i18n/react";
 import { twMerge } from "tailwind-merge";
 import { useTheme } from "@0xchain/next-themes";
 import Cookies from "js-cookie";
-import { getRuntimeLoginState, setRuntimeSession, REFRESH_TOKEN_COOKIE_KEYS, ACCESS_TOKEN_COOKIE_KEYS } from "@0xchain/auth";
-import { ACCESS_TOKEN_COOKIE_KEYS as ACCESS_TOKEN_COOKIE_KEYS2, REFRESH_TOKEN_COOKIE_KEYS as REFRESH_TOKEN_COOKIE_KEYS2, getRuntimeLoginState as getRuntimeLoginState2, setRuntimeSession as setRuntimeSession2 } from "@0xchain/auth";
+import { getRuntimeLoginState, getClientSession, setRuntimeSession } from "@0xchain/auth";
+import { ACCESS_TOKEN_COOKIE_KEYS, REFRESH_TOKEN_COOKIE_KEYS, getRuntimeLoginState as getRuntimeLoginState2, setRuntimeSession as setRuntimeSession2 } from "@0xchain/auth";
 import { normalizeTokenPayload, setToken } from "@0xchain/token";
-function pickCookieValue(keys) {
-  for (const key of keys) {
-    const value = Cookies.get(key);
-    if (value) return value;
-  }
-  return null;
-}
-const hasRefreshToken = () => !!pickCookieValue(REFRESH_TOKEN_COOKIE_KEYS);
-const hasAccessToken = () => !!pickCookieValue(ACCESS_TOKEN_COOKIE_KEYS);
-const hasAnyToken = () => hasRefreshToken() || hasAccessToken();
+const hasAccessToken = () => getClientSession().hasAccessToken;
+const hasRefreshToken = () => getClientSession().hasRefreshToken;
 const isLogin = () => {
   const runtime = getRuntimeLoginState();
   if (typeof runtime === "boolean") return runtime;
-  return hasAnyToken();
+  return getClientSession().isLoggedIn;
 };
 var LoginMessageType = /* @__PURE__ */ ((LoginMessageType2) => {
   LoginMessageType2["CLOSE_LOGIN_MODAL"] = "closeLoginModal";
@@ -59,6 +51,20 @@ function resolveThemeNow(resolvedTheme) {
 function buildAuthUrl(locale, path, theme, redirectUri) {
   return `${process.env.NEXT_PUBLIC_AUTH_URL}/${locale}/${path}?mode=dialog&theme=${theme}&redirect_uri=${encodeURIComponent(redirectUri)}`;
 }
+function resolveAllowedMessageOrigins() {
+  const origins = [];
+  if (typeof window !== "undefined" && window.location?.origin) {
+    origins.push(window.location.origin);
+  }
+  const authUrl = process.env.NEXT_PUBLIC_AUTH_URL;
+  if (authUrl) {
+    try {
+      origins.push(new URL(authUrl).origin);
+    } catch {
+    }
+  }
+  return Array.from(new Set(origins));
+}
 function LoginProvider({
   children,
   locale: localeProp,
@@ -90,14 +96,21 @@ function LoginProvider({
   }, []);
   useEffect(() => {
     setMounted(true);
+    const allowedOrigins = resolveAllowedMessageOrigins();
     const handleMessage = (event) => {
+      if (!allowedOrigins.includes(event.origin)) {
+        return;
+      }
       if (event.data?.type === "closeLoginModal") {
         closeLogin();
       }
       if (event.data?.type === "loginSuccess") {
         const tokens = normalizeTokenPayload(event.data?.data);
-        if (tokens) {
+        const hasCompleteToken = Boolean(tokens?.access_token) && Boolean(tokens?.refresh_token) && typeof tokens?.expires_in === "number";
+        if (tokens && hasCompleteToken) {
           setToken(tokens);
+        } else {
+          return;
         }
         setRuntimeSession({
           isLoggedIn: true,
@@ -182,11 +195,11 @@ function WithLogin({ children, onClick, ...rest }) {
   return /* @__PURE__ */ jsx(Trigger, { ...rest, children });
 }
 export {
-  ACCESS_TOKEN_COOKIE_KEYS2 as ACCESS_TOKEN_COOKIE_KEYS,
+  ACCESS_TOKEN_COOKIE_KEYS,
   LoginMessageType,
   LoginProvider,
   OpenLoginType,
-  REFRESH_TOKEN_COOKIE_KEYS2 as REFRESH_TOKEN_COOKIE_KEYS,
+  REFRESH_TOKEN_COOKIE_KEYS,
   WithLogin,
   WithLogin as default,
   getRuntimeLoginState2 as getRuntimeLoginState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/with-login",
-  "version": "1.1.0-beta.61",
+  "version": "1.1.0-beta.63",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -38,9 +38,9 @@
     "tailwind-merge": "3.3.1"
   },
   "dependencies": {
-    "@0xchain/auth": "1.1.0-beta.61",
-    "@0xchain/token": "1.1.0-beta.61",
-    "@0xchain/i18n": "1.1.0-beta.61"
+    "@0xchain/token": "1.1.0-beta.63",
+    "@0xchain/i18n": "1.1.0-beta.63",
+    "@0xchain/auth": "1.1.0-beta.63"
   },
   "nx": {
     "tags": [