@0xchain/with-login 1.1.0-beta.4 → 1.1.0-beta.41

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024-present 0xchain
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { default as React } from 'react';
+export { ACCESS_TOKEN_COOKIE_KEYS, REFRESH_TOKEN_COOKIE_KEYS, getRuntimeLoginState, setRuntimeSession, } from '@0xchain/auth';
 export declare const isLogin: () => boolean;
 export declare enum LoginMessageType {
     CLOSE_LOGIN_MODAL = "closeLoginModal",
@@ -21,26 +22,16 @@ export interface LoginContextValue {
 }
 interface LoginProviderProps {
     children: React.ReactNode;
+    /** 显式传入时可不依赖 NextIntlClientProvider（仍建议包在 Intl 内） */
+    locale?: string;
     loginSuccessCallback?: () => Promise<void>;
 }
-/**
- * LoginProvider 组件：提供全局登录状态和功能
- */
-export declare function LoginProvider({ children, loginSuccessCallback }: LoginProviderProps): import("react/jsx-runtime").JSX.Element;
-/**
- * useLogin hook：消费 LoginContext
- */
+export declare function LoginProvider({ children, locale: localeProp, loginSuccessCallback, }: LoginProviderProps): import("react/jsx-runtime").JSX.Element;
 export declare function useLogin(): LoginContextValue;
 interface WithLoginProps extends React.PropsWithChildren, React.HTMLAttributes<HTMLElement> {
     children?: React.ReactNode;
     onClick?: () => void;
 }
-/**
- * 一个简单封装：
- * - children 作为触发区域
- * - 使用全局 LoginProvider 的登录功能
- * - 如果提供了 onClick，会在登录成功后调用
- */
 export declare function WithLogin({ children, onClick, ...rest }: WithLoginProps): import("react/jsx-runtime").JSX.Element | null;
 export default WithLogin;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA8E,MAAM,OAAO,CAAC;AAMnG,eAAO,MAAM,OAAO,eAGnB,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;IAEhC,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;IAEjB,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAExD,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,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AAKD;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,oBAA8C,EAAE,EAAE,kBAAkB,2CA0H7G;AAED;;GAEG;AACH,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;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,kDAevE;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;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,2CA4GpB;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

@@ -1,103 +1,191 @@
 'use client';
-import { jsx as m, jsxs as y } from "react/jsx-runtime";
-import I, { createContext as M, useState as w, useRef as N, useCallback as c, useEffect as p, useContext as R } from "react";
-import { useLocale as O } from "next-intl";
-import { twMerge as $ } from "tailwind-merge";
-import { useTheme as P } from "@0xchain/next-themes";
-import k from "js-cookie";
-const z = () => !!k.get("refresh_token");
-var A = /* @__PURE__ */ ((e) => (e.CLOSE_LOGIN_MODAL = "closeLoginModal", e.LOGIN_SUCCESS = "loginSuccess", e))(A || {}), B = /* @__PURE__ */ ((e) => (e.LOGIN = "login", e.REGISTER = "register", e))(B || {});
-const C = M(void 0);
-function F({ children: e, loginSuccessCallback: n = () => Promise.resolve() }) {
-  const [i, s] = w(!1), [l, h] = w(!1), [a, v] = w(null), _ = N(/* @__PURE__ */ new Set()), u = O(), { resolvedTheme: U } = P(), t = l && U ? U : "light", L = c((o) => {
-    const r = typeof window < "u" ? window.location.href : "", g = `${process.env.NEXT_PUBLIC_AUTH_URL}/${u}/login?mode=dialog&theme=${t}&redirect_uri=${r}`, f = `${process.env.NEXT_PUBLIC_AUTH_URL}/${u}/register?mode=dialog&theme=${t}&redirect_uri=${r}`;
-    s(!0), v(o === "register" ? f : g);
-  }, [t, u]), d = c(() => {
-    s(!1);
-  }, []), E = c((o) => {
-    s(o);
+import { jsx, jsxs } from "react/jsx-runtime";
+import React, { createContext, useState, useRef, useCallback, useEffect, useContext } from "react";
+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";
+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 isLogin = () => {
+  const runtime = getRuntimeLoginState();
+  if (typeof runtime === "boolean") return runtime;
+  return hasAnyToken();
+};
+var LoginMessageType = /* @__PURE__ */ ((LoginMessageType2) => {
+  LoginMessageType2["CLOSE_LOGIN_MODAL"] = "closeLoginModal";
+  LoginMessageType2["LOGIN_SUCCESS"] = "loginSuccess";
+  return LoginMessageType2;
+})(LoginMessageType || {});
+var OpenLoginType = /* @__PURE__ */ ((OpenLoginType2) => {
+  OpenLoginType2["LOGIN"] = "login";
+  OpenLoginType2["REGISTER"] = "register";
+  return OpenLoginType2;
+})(OpenLoginType || {});
+const LoginContext = createContext(void 0);
+function getStorageTheme(storageKey) {
+  const fromCookie = Cookies.get(storageKey);
+  if (fromCookie) return fromCookie;
+  try {
+    return window.localStorage.getItem(storageKey);
+  } catch {
+    return null;
+  }
+}
+function resolveThemeNow(resolvedTheme) {
+  if (resolvedTheme === "light" || resolvedTheme === "dark") return resolvedTheme;
+  if (typeof document !== "undefined" && document.documentElement.classList.contains("dark")) {
+    return "dark";
+  }
+  const storageKey = `${(process.env.NEXT_PUBLIC_BRAND || "ichatgo").toLowerCase()}-theme`;
+  const persisted = getStorageTheme(storageKey);
+  if (persisted === "dark" || persisted === "light") return persisted;
+  if (persisted === "system") {
+    return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+  }
+  return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+}
+function buildAuthUrl(locale, path, theme, redirectUri) {
+  return `${process.env.NEXT_PUBLIC_AUTH_URL}/${locale}/${path}?mode=dialog&theme=${theme}&redirect_uri=${encodeURIComponent(redirectUri)}`;
+}
+function LoginProvider({
+  children,
+  locale: localeProp,
+  loginSuccessCallback = () => Promise.resolve()
+}) {
+  const [isOpen, setIsOpen] = useState(false);
+  const [mounted, setMounted] = useState(false);
+  const [url, setUrl] = useState(null);
+  const callbacksRef = useRef(/* @__PURE__ */ new Set());
+  const localeFromIntl = useLocale();
+  const locale = localeProp ?? localeFromIntl;
+  const { resolvedTheme } = useTheme();
+  const currentTheme = mounted ? resolveThemeNow(resolvedTheme) : "light";
+  const openLogin = useCallback((type) => {
+    const redirectUri = typeof window !== "undefined" ? window.location.href : "";
+    const theme = resolveThemeNow(resolvedTheme);
+    const loginUrl = buildAuthUrl(locale, "login", theme, redirectUri);
+    const registerUrl = buildAuthUrl(locale, "register", theme, redirectUri);
+    setIsOpen(true);
+    setUrl(type === "register" ? registerUrl : loginUrl);
+  }, [locale, resolvedTheme]);
+  const closeLogin = useCallback(() => {
+    setIsOpen(false);
+    setUrl(null);
   }, []);
-  p(() => {
-    if (t) {
-      const o = typeof window < "u" ? window.location.href : "", r = `${process.env.NEXT_PUBLIC_AUTH_URL}/${u}/login?mode=dialog&theme=${t}&redirect_uri=${o}`;
-      v(r);
-    }
-  }, [t]), p(() => {
-    h(!0);
-    const o = (r) => {
-      var g, f;
-      ((g = r.data) == null ? void 0 : g.type) === "closeLoginModal" && d(), ((f = r.data) == null ? void 0 : f.type) === "loginSuccess" && (console.log("handleMessage", r.data.type), d(), window.location.reload());
+  const setLoginOpen = useCallback((open) => {
+    setIsOpen(open);
+    if (!open) setUrl(null);
+  }, []);
+  useEffect(() => {
+    setMounted(true);
+    const handleMessage = (event) => {
+      if (event.data?.type === "closeLoginModal") {
+        closeLogin();
+      }
+      if (event.data?.type === "loginSuccess") {
+        setRuntimeSession({
+          isLoggedIn: true,
+          hasAccessToken: hasAccessToken(),
+          hasRefreshToken: hasRefreshToken(),
+          accessTokenExpired: false,
+          claims: null
+        });
+        closeLogin();
+        window.location.reload();
+      }
     };
-    return window.addEventListener("message", o), () => {
-      window.removeEventListener("message", o);
+    window.addEventListener("message", handleMessage);
+    return () => {
+      window.removeEventListener("message", handleMessage);
     };
-  }, [d, n]);
-  const S = c((o) => (_.current.add(o), () => {
-    _.current.delete(o);
-  }), []), x = c(
-    ({ children: o, ...r }) => /* @__PURE__ */ m("div", { onClick: () => L(), style: { cursor: "pointer" }, ...r, children: o }),
-    [L]
-  ), T = I.useMemo(() => z() ? null : /* @__PURE__ */ m(
-    "div",
-    {
-      className: $(
-        " left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 w-full h-full bg-[rgba(0,0,0,0.7)] opacity-0 z-[-1]",
-        "transition-all duration-500 zoom-in-out fixed block",
-        i && "z-99999 opacity-100"
-      ),
-      children: a && /* @__PURE__ */ m(
-        "iframe",
-        {
-          src: a ?? "",
-          className: $(
-            "w-full h-full border-none relative z-10 transition-opacity duration-300",
-            "opacity-100"
-          ),
-          title: "Login",
-          sandbox: "allow-scripts allow-forms allow-same-origin"
-        },
-        `login-iframe-${t}`
-      )
-    }
-  ), [
-    t,
-    i,
-    a
-  ]), b = {
-    isOpen: i,
-    openLogin: L,
-    closeLogin: d,
-    setLoginOpen: E,
-    url: a,
-    currentTheme: t,
-    mounted: l,
-    Trigger: x,
-    registerLoginSuccessCallback: S
+  }, [closeLogin, loginSuccessCallback]);
+  const registerLoginSuccessCallback = useCallback((callback) => {
+    callbacksRef.current.add(callback);
+    return () => {
+      callbacksRef.current.delete(callback);
+    };
+  }, []);
+  const Trigger = useCallback(
+    ({ children: triggerChildren, ...rest }) => /* @__PURE__ */ jsx("div", { onClick: () => openLogin(), style: { cursor: "pointer" }, ...rest, children: triggerChildren }),
+    [openLogin]
+  );
+  const loginModalElement = React.useMemo(() => {
+    if (isLogin() || !isOpen || !url) return null;
+    return /* @__PURE__ */ jsx(
+      "div",
+      {
+        className: twMerge(
+          "fixed left-1/2 top-1/2 z-99999 block h-full w-full -translate-x-1/2 -translate-y-1/2",
+          "bg-[rgba(0,0,0,0.7)] opacity-100 transition-all duration-500 zoom-in-out"
+        ),
+        children: /* @__PURE__ */ jsx(
+          "iframe",
+          {
+            src: url,
+            className: "relative z-10 h-full w-full border-none opacity-100 transition-opacity duration-300",
+            title: "Login",
+            sandbox: "allow-scripts allow-forms allow-same-origin"
+          }
+        )
+      }
+    );
+  }, [isOpen, url]);
+  const value = {
+    isOpen,
+    openLogin,
+    closeLogin,
+    setLoginOpen,
+    url,
+    currentTheme,
+    mounted,
+    Trigger,
+    registerLoginSuccessCallback
   };
-  return /* @__PURE__ */ y(C.Provider, { value: b, children: [
-    e,
-    T
+  return /* @__PURE__ */ jsxs(LoginContext.Provider, { value, children: [
+    children,
+    loginModalElement
   ] });
 }
-function G() {
-  const e = R(C);
-  if (e === void 0)
+function useLogin() {
+  const context = useContext(LoginContext);
+  if (context === void 0) {
     throw new Error("useLogin must be used within a LoginProvider");
-  return e;
+  }
+  return context;
 }
-function J({ children: e, onClick: n, ...i }) {
-  const { Trigger: s, registerLoginSuccessCallback: l } = G();
-  return p(() => {
-    if (n)
-      return l(n);
-  }, [n, l]), e ? /* @__PURE__ */ m(s, { ...i, children: e }) : null;
+function WithLogin({ children, onClick, ...rest }) {
+  const { Trigger, registerLoginSuccessCallback } = useLogin();
+  useEffect(() => {
+    if (onClick) {
+      const unregister = registerLoginSuccessCallback(onClick);
+      return unregister;
+    }
+    return void 0;
+  }, [onClick, registerLoginSuccessCallback]);
+  if (!children) return null;
+  return /* @__PURE__ */ jsx(Trigger, { ...rest, children });
 }
 export {
-  A as LoginMessageType,
-  F as LoginProvider,
-  B as OpenLoginType,
-  J as WithLogin,
-  J as default,
-  z as isLogin,
-  G as useLogin
+  ACCESS_TOKEN_COOKIE_KEYS2 as ACCESS_TOKEN_COOKIE_KEYS,
+  LoginMessageType,
+  LoginProvider,
+  OpenLoginType,
+  REFRESH_TOKEN_COOKIE_KEYS2 as REFRESH_TOKEN_COOKIE_KEYS,
+  WithLogin,
+  WithLogin as default,
+  getRuntimeLoginState2 as getRuntimeLoginState,
+  isLogin,
+  setRuntimeSession2 as setRuntimeSession,
+  useLogin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/with-login",
-  "version": "1.1.0-beta.4",
+  "version": "1.1.0-beta.41",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,16 +17,34 @@
     "dist",
     "!**/*.tsbuildinfo"
   ],
+  "peerDependencies": {
+    "@0xchain/next-themes": "1.0.0",
+    "js-cookie": "3.0.5",
+    "next": "16.1.6",
+    "next-intl": "4.13.0",
+    "react": "19.1.1",
+    "react-dom": "19.1.1",
+    "tailwind-merge": "3.3.1"
+  },
   "devDependencies": {
+    "@0xchain/next-themes": "1.0.0",
+    "@types/js-cookie": "3.0.6",
+    "js-cookie": "3.0.5",
+    "next": "16.1.6",
+    "next-intl": "4.13.0",
+    "react": "19.1.1",
+    "react-dom": "19.1.1",
     "rollup-plugin-preserve-use-client": "3.0.1",
-    "@types/js-cookie": "3.0.6"
+    "tailwind-merge": "3.3.1"
   },
   "dependencies": {
-    "tailwind-merge": "3.3.1",
-    "@0xchain/next-themes": "1.0.0",
-    "next-intl": "4.6.1",
-    "next": "15.5.6",
-    "js-cookie": "3.0.5"
+    "@0xchain/auth": "1.1.0-beta.41",
+    "@0xchain/i18n": "1.1.0-beta.41"
+  },
+  "nx": {
+    "tags": [
+      "type:feature"
+    ]
   },
   "publishConfig": {
     "access": "public"