@ichaingo/with-login 1.4.30 → 1.4.32

package/dist/index.d.ts

@@ -13,12 +13,15 @@ export interface UseLoginResult {
     Trigger: React.FC<React.HTMLAttributes<HTMLDivElement>>;
     LoginModal: React.FC;
 }
+interface UseLoginProps {
+    loginSuccessCallback?: () => Promise<void>;
+}
 /**
  * 登录逻辑 + UI 全都在这个 hook 里面
  * - 返回 Trigger：包裹触发登录的元素
  * - 返回 LoginModal：实际渲染登录弹窗（使用 createPortal）
  */
-export declare function useLogin(): UseLoginResult;
+export declare function useLogin({ loginSuccessCallback }: UseLoginProps): UseLoginResult;
 interface WithLoginProps extends React.PropsWithChildren, React.HTMLAttributes<any> {
     children?: React.ReactNode;
 }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAOhE,eAAO,MAAM,OAAO,eAEnB,CAAC;AAEF,MAAM,WAAW,cAAc;IAE7B,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,IAAI,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IAEjB,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IACxD,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,IAAI,cAAc,CA2HzC;AAED,UAAU,cACR,SAAQ,KAAK,CAAC,iBAAiB,EAC7B,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,2CAS9D;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAOhE,eAAO,MAAM,OAAO,eAEnB,CAAC;AAEF,MAAM,WAAW,cAAc;IAE7B,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,IAAI,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IAEjB,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IACxD,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;CACtB;AACD,UAAU,aAAa;IACrB,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AACD;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,EAAC,oBAA8C,EAAC,EAAE,aAAa,GAAG,cAAc,CA8HxG;AAED,UAAU,cACR,SAAQ,KAAK,CAAC,iBAAiB,EAC7B,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,2CAS9D;AAED,eAAe,SAAS,CAAC"}

package/dist/index.js

@@ -1,181 +1,174 @@
 'use client';
-import { jsx as u, jsxs as w, Fragment as T } from "react/jsx-runtime";
-import { useState as x, useEffect as L, useCallback as f } from "react";
-import { createPortal as j } from "react-dom";
-import { useLocale as R } from "next-intl";
-import { twMerge as m } from "tailwind-merge";
-import { useTheme as b } from "@ichaingo/next-themes";
+import { jsx as p, jsxs as U, Fragment as R } from "react/jsx-runtime";
+import { useState as w, useCallback as u, useEffect as x } from "react";
+import { createPortal as k } from "react-dom";
+import { useLocale as B } from "next-intl";
+import { twMerge as C } from "tailwind-merge";
+import { useTheme as E } from "@ichaingo/next-themes";
 /*! js-cookie v3.0.5 | MIT */
-function h(e) {
-  for (var t = 1; t < arguments.length; t++) {
-    var i = arguments[t];
-    for (var a in i)
-      e[a] = i[a];
+function h(o) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = arguments[r];
+    for (var i in t)
+      o[i] = t[i];
   }
-  return e;
+  return o;
 }
-var z = {
-  read: function(e) {
-    return e[0] === '"' && (e = e.slice(1, -1)), e.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
+var M = {
+  read: function(o) {
+    return o[0] === '"' && (o = o.slice(1, -1)), o.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
   },
-  write: function(e) {
-    return encodeURIComponent(e).replace(
+  write: function(o) {
+    return encodeURIComponent(o).replace(
       /%(2[346BF]|3[AC-F]|40|5[BDE]|60|7[BCD])/g,
       decodeURIComponent
     );
   }
 };
-function C(e, t) {
-  function i(o, c, n) {
+function y(o, r) {
+  function t(n, s, e) {
     if (!(typeof document > "u")) {
-      n = h({}, t, n), typeof n.expires == "number" && (n.expires = new Date(Date.now() + n.expires * 864e5)), n.expires && (n.expires = n.expires.toUTCString()), o = encodeURIComponent(o).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
-      var s = "";
-      for (var r in n)
-        n[r] && (s += "; " + r, n[r] !== !0 && (s += "=" + n[r].split(";")[0]));
-      return document.cookie = o + "=" + e.write(c, o) + s;
+      e = h({}, r, e), typeof e.expires == "number" && (e.expires = new Date(Date.now() + e.expires * 864e5)), e.expires && (e.expires = e.expires.toUTCString()), n = encodeURIComponent(n).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
+      var a = "";
+      for (var c in e)
+        e[c] && (a += "; " + c, e[c] !== !0 && (a += "=" + e[c].split(";")[0]));
+      return document.cookie = n + "=" + o.write(s, n) + a;
     }
   }
-  function a(o) {
-    if (!(typeof document > "u" || arguments.length && !o)) {
-      for (var c = document.cookie ? document.cookie.split("; ") : [], n = {}, s = 0; s < c.length; s++) {
-        var r = c[s].split("="), d = r.slice(1).join("=");
+  function i(n) {
+    if (!(typeof document > "u" || arguments.length && !n)) {
+      for (var s = document.cookie ? document.cookie.split("; ") : [], e = {}, a = 0; a < s.length; a++) {
+        var c = s[a].split("="), d = c.slice(1).join("=");
         try {
-          var l = decodeURIComponent(r[0]);
-          if (n[l] = e.read(d, l), o === l)
+          var l = decodeURIComponent(c[0]);
+          if (e[l] = o.read(d, l), n === l)
             break;
         } catch {
         }
       }
-      return o ? n[o] : n;
+      return n ? e[n] : e;
     }
   }
   return Object.create(
     {
-      set: i,
-      get: a,
-      remove: function(o, c) {
-        i(
-          o,
+      set: t,
+      get: i,
+      remove: function(n, s) {
+        t(
+          n,
           "",
-          h({}, c, {
+          h({}, s, {
             expires: -1
           })
         );
       },
-      withAttributes: function(o) {
-        return C(this.converter, h({}, this.attributes, o));
+      withAttributes: function(n) {
+        return y(this.converter, h({}, this.attributes, n));
       },
-      withConverter: function(o) {
-        return C(h({}, this.converter, o), this.attributes);
+      withConverter: function(n) {
+        return y(h({}, this.converter, n), this.attributes);
       }
     },
     {
-      attributes: { value: Object.freeze(t) },
-      converter: { value: Object.freeze(e) }
+      attributes: { value: Object.freeze(r) },
+      converter: { value: Object.freeze(o) }
     }
   );
 }
-var B = C(z, { path: "/" });
-const $ = () => !!B.get("id_token");
-function O() {
-  const [e, t] = x(!1), [i, a] = x(!1), [o, c] = x(!1), n = R(), { resolvedTheme: s } = b();
-  L(() => {
-    a(!0);
-  }, []);
-  const r = i && s ? s : "light", d = `${process.env.NEXT_PUBLIC_AUTH_URL}/${n}/login?mode=dialog&theme=${r}`, l = f(() => {
-    t(!0), c(!1);
-  }, []), p = f(() => {
+var O = y(M, { path: "/" });
+const S = () => !!O.get("id_token");
+function z({ loginSuccessCallback: o = () => Promise.resolve() }) {
+  const [r, t] = w(!1), [i, n] = w(!1), [s, e] = w(!1), a = B(), { resolvedTheme: c } = E(), d = i && c ? c : "light", l = `${process.env.NEXT_PUBLIC_AUTH_URL}/${a}/login?mode=dialog&theme=${d}`, g = u(() => {
+    t(!0), e(!1);
+  }, []), m = u(() => {
     t(!1);
-  }, []), y = f((g) => {
-    t(g), g && c(!1);
+  }, []), I = u((f) => {
+    t(f), f && e(!1);
+  }, []);
+  x(() => {
+    r && i && e(!1);
+  }, [c, r, i]), x(() => {
+    n(!0);
+    const f = (v) => {
+      v.data.type === "closeLoginModal" && m(), v.data.type === "loginSuccess" && (m(), o && o());
+    };
+    return window.addEventListener("message", f), () => {
+      window.removeEventListener("message", f);
+    };
   }, []);
-  L(() => {
-    e && i && c(!1);
-  }, [s, e, i]);
-  const v = f(() => {
-    c(!0);
-  }, []), U = f(
-    ({ children: g, ...k }) => /* @__PURE__ */ u("div", { onClick: l, style: { cursor: "pointer" }, ...k, children: g }),
-    [l]
-  ), I = f(() => e ? j(
-    /* @__PURE__ */ w(
+  const L = u(() => {
+    e(!0);
+  }, []), T = u(
+    ({ children: f, ...v }) => /* @__PURE__ */ p("div", { onClick: g, style: { cursor: "pointer" }, ...v, children: f }),
+    [g]
+  ), j = u(() => r ? k(
+    /* @__PURE__ */ U(
       "div",
       {
-        className: m(
+        className: C(
           "fixed w-0 h-9 bg-[rgba(0,0,0,0.7)] z-1000",
-          e && "top-0 left-0 w-full h-full"
+          r && "top-0 left-0 w-full h-full"
         ),
         children: [
-          /* @__PURE__ */ u(
+          /* @__PURE__ */ p(
             "div",
             {
-              className: m(
+              className: C(
                 "absolute inset-0 transition-opacity duration-300",
-                o ? "opacity-0 pointer-events-none" : "opacity-100 z-30"
+                s ? "opacity-0 pointer-events-none" : "opacity-100 z-30"
               )
             }
           ),
-          /* @__PURE__ */ u(
+          /* @__PURE__ */ p(
             "iframe",
             {
-              src: d,
-              className: m(
+              src: l,
+              className: C(
                 "w-full h-full border-none relative z-10 transition-opacity duration-300",
-                o ? "opacity-100" : "opacity-0"
+                s ? "opacity-100" : "opacity-0"
               ),
               title: "Login",
-              onLoad: v,
+              onLoad: L,
               sandbox: "allow-scripts allow-forms allow-same-origin"
             },
-            `login-iframe-${r}`
-          ),
-          /* @__PURE__ */ u(
-            "button",
-            {
-              onClick: p,
-              className: m(
-                "absolute top-2 right-2 bg-transparent border-none text-2xl cursor-pointer z-20",
-                r === "dark" ? "text-white" : "text-gray-800"
-              ),
-              children: "×"
-            }
+            `login-iframe-${d}`
           )
         ]
       }
     ),
     document.body
   ) : null, [
-    p,
+    m,
+    d,
+    L,
+    s,
     r,
-    v,
-    o,
-    e,
-    d
+    l
   ]);
   return {
-    isOpen: e,
-    openLogin: l,
-    closeLogin: p,
-    setLoginOpen: y,
-    loginUrl: d,
-    currentTheme: r,
-    iframeLoaded: o,
-    handleIframeLoad: v,
+    isOpen: r,
+    openLogin: g,
+    closeLogin: m,
+    setLoginOpen: I,
+    loginUrl: l,
+    currentTheme: d,
+    iframeLoaded: s,
+    handleIframeLoad: L,
     mounted: i,
-    Trigger: U,
-    LoginModal: I
+    Trigger: T,
+    LoginModal: j
   };
 }
-function N({ children: e, ...t }) {
-  const { Trigger: i, LoginModal: a } = O();
-  return /* @__PURE__ */ w(T, { children: [
-    e && /* @__PURE__ */ u(i, { ...t, children: e }),
-    /* @__PURE__ */ u(a, {})
+function b({ children: o, ...r }) {
+  const { Trigger: t, LoginModal: i } = z();
+  return /* @__PURE__ */ U(R, { children: [
+    o && /* @__PURE__ */ p(t, { ...r, children: o }),
+    /* @__PURE__ */ p(i, {})
   ] });
 }
 export {
-  N as WithLogin,
-  N as default,
-  $ as isLogin,
-  O as useLogin
+  b as WithLogin,
+  b as default,
+  S as isLogin,
+  z as useLogin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ichaingo/with-login",
-  "version": "1.4.30",
+  "version": "1.4.32",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",