@youidian/sdk 3.2.1 → 3.3.0

package/dist/index.js

@@ -301,9 +301,6 @@ function buildLoginUrl(params, options, launchPayload) {
     if (parentOrigin) {
       url.searchParams.set("origin", parentOrigin);
     }
-    if (launchPayload.callbackUrl) {
-      url.searchParams.set("callbackUrl", launchPayload.callbackUrl);
-    }
     return appendLoginLaunchHash(url.toString(), launchPayload);
   } catch (_error) {
     const searchParams = new URLSearchParams();
@@ -316,9 +313,6 @@ function buildLoginUrl(params, options, launchPayload) {
     if (parentOrigin) {
       searchParams.set("origin", parentOrigin);
     }
-    if (launchPayload.callbackUrl) {
-      searchParams.set("callbackUrl", launchPayload.callbackUrl);
-    }
     const query = searchParams.toString();
     if (!query) {
       return appendLoginLaunchHash(finalUrl, launchPayload);
@@ -339,6 +333,11 @@ function extractLoginResult(data) {
     legacyCasdoorId: data.legacyCasdoorId,
     loginToken: data.loginToken,
     name: data.name,
+    username: data.username,
+    phoneCountryCode: data.phoneCountryCode,
+    phoneNumber: data.phoneNumber,
+    phoneE164: data.phoneE164,
+    phoneVerifiedAt: data.phoneVerifiedAt,
     userId: data.userId,
     wechatOpenId: data.wechatOpenId,
     wechatUnionId: data.wechatUnionId
@@ -399,6 +398,23 @@ function publishLoginCallback(state, data) {
   } catch {
   }
 }
+function safeIsPopupClosed(popup) {
+  if (!popup) return true;
+  try {
+    return popup.closed;
+  } catch {
+    logLoginDebug("Unable to read popup.closed; treating popup as open");
+    return false;
+  }
+}
+function safeClosePopup(popup) {
+  if (!popup) return;
+  try {
+    popup.close();
+  } catch {
+    logLoginDebug("Unable to close popup");
+  }
+}
 function cleanLoginCallbackUrl(url) {
   url.searchParams.delete(LOGIN_CALLBACK_MARKER);
   url.searchParams.delete(LOGIN_CALLBACK_STATE_PARAM);
@@ -407,7 +423,7 @@ function cleanLoginCallbackUrl(url) {
   url.hash = returnHash ? `#${returnHash}` : "";
   return url.toString();
 }
-function handleLoginCallbackIfPresent() {
+function handleLoginCallbackIfPresent(options) {
   if (typeof window === "undefined") {
     return false;
   }
@@ -433,12 +449,19 @@ function handleLoginCallbackIfPresent() {
     window.history.replaceState(null, "", cleanLoginCallbackUrl(url));
   } catch {
   }
-  window.setTimeout(() => {
-    try {
-      window.close();
-    } catch {
-    }
-  }, 30);
+  if (options?.autoClose === true) {
+    window.setTimeout(() => {
+      try {
+        window.close();
+      } catch {
+      }
+    }, 30);
+    return true;
+  }
+  try {
+    document.documentElement.style.visibility = "";
+  } catch {
+  }
   return true;
 }
 function logLoginDebug(message, details) {
@@ -453,12 +476,13 @@ function logLoginWarn(message, details) {
   if (typeof console === "undefined") return;
   console.warn(LOGIN_UI_LOG_PREFIX, message, details || {});
 }
-var LoginUI = class {
+var LoginUI = class extends HostedFrameModal {
   constructor() {
+    super(...arguments);
     __publicField(this, "popup", null);
     __publicField(this, "callbackChannel", null);
     __publicField(this, "callbackStorageHandler", null);
-    __publicField(this, "messageHandler", null);
+    __publicField(this, "popupMessageHandler", null);
     __publicField(this, "closeMonitor", null);
     __publicField(this, "completed", false);
   }
@@ -469,15 +493,15 @@ var LoginUI = class {
     if (typeof window !== "undefined" && this.callbackStorageHandler) {
       window.removeEventListener("storage", this.callbackStorageHandler);
     }
-    if (typeof window !== "undefined" && this.messageHandler) {
-      window.removeEventListener("message", this.messageHandler);
+    if (typeof window !== "undefined" && this.popupMessageHandler) {
+      window.removeEventListener("message", this.popupMessageHandler);
     }
     this.callbackChannel = null;
     this.callbackStorageHandler = null;
     if (typeof window !== "undefined" && this.closeMonitor) {
       window.clearInterval(this.closeMonitor);
     }
-    this.messageHandler = null;
+    this.popupMessageHandler = null;
     this.closeMonitor = null;
     this.popup = null;
     this.completed = false;
@@ -520,12 +544,12 @@ var LoginUI = class {
       case "LOGIN_CLOSE":
         if (options?.autoClose === false) {
           logLoginInfo(
-            "Login popup requested close; autoClose disabled, keeping popup open"
+            "Login surface requested close; autoClose disabled, keeping it open"
           );
           options?.onClose?.();
           break;
         }
-        logLoginInfo("Login popup requested close; autoClose enabled");
+        logLoginInfo("Login surface requested close; autoClose enabled");
         this.close();
         options?.onClose?.();
         break;
@@ -559,17 +583,15 @@ var LoginUI = class {
   }
   close() {
     logLoginInfo("close() called", {
+      hasModal: Boolean(this.modal),
       hasPopup: Boolean(this.popup),
-      popupClosed: this.popup?.closed ?? true
+      popupClosed: safeIsPopupClosed(this.popup)
     });
-    if (this.popup && !this.popup.closed) {
-      this.popup.close();
-    }
+    safeClosePopup(this.popup);
+    super.close();
     this.cleanup();
   }
-  openLogin(params, options) {
-    if (typeof window === "undefined") return;
-    if (this.popup && !this.popup.closed) return;
+  buildOpenContext(params, options) {
     const callbackState = createLoginCallbackState();
     const launchPayload = buildLoginLaunchPayload(
       params,
@@ -577,6 +599,54 @@ var LoginUI = class {
       callbackState
     );
     const finalUrl = buildLoginUrl(params, options, launchPayload);
+    return { callbackState, finalUrl, launchPayload };
+  }
+  openLoginModal(params, options) {
+    if (typeof document === "undefined") return;
+    if (this.modal) return;
+    const { callbackState, finalUrl, launchPayload } = this.buildOpenContext(
+      params,
+      options
+    );
+    const loginOrigin = getOrigin(finalUrl);
+    logLoginInfo("Opening hosted login iframe modal", {
+      appId: params.appId,
+      callbackState,
+      callbackUrl: launchPayload.callbackUrl || null,
+      hasCallbackUrl: Boolean(launchPayload.callbackUrl),
+      loginUrl: finalUrl,
+      allowedOrigin: options?.allowedOrigin || null,
+      autoClose: options?.autoClose ?? true,
+      displayMode: "modal",
+      pageUrl: typeof window !== "undefined" ? window.location.href : null,
+      parentOrigin: launchPayload.origin || null
+    });
+    this.completed = false;
+    this.listenForLoginCallback(callbackState, options);
+    this.openHostedFrame(finalUrl, {
+      allowedOrigin: options?.allowedOrigin || loginOrigin || void 0,
+      height: "min(760px, 94vh)",
+      onCloseButton: () => {
+        options?.onCancel?.();
+        options?.onClose?.();
+      },
+      onMessage: (data, container) => {
+        if (data.type === "LOGIN_RESIZE" && data.height) {
+          const maxHeight = window.innerHeight * 0.94;
+          container.style.height = `${Math.min(data.height, maxHeight)}px`;
+        }
+        this.handleLoginEvent(data, options);
+      },
+      width: "min(520px, 100%)"
+    });
+  }
+  openLoginPopup(params, options) {
+    if (typeof window === "undefined") return;
+    if (this.popup && !safeIsPopupClosed(this.popup)) return;
+    const { callbackState, finalUrl, launchPayload } = this.buildOpenContext(
+      params,
+      options
+    );
     logLoginInfo("Opening hosted login popup", {
       appId: params.appId,
       callbackState,
@@ -585,6 +655,7 @@ var LoginUI = class {
       loginUrl: finalUrl,
       allowedOrigin: options?.allowedOrigin || null,
       autoClose: options?.autoClose ?? true,
+      displayMode: "popup",
       pageUrl: typeof window !== "undefined" ? window.location.href : null,
       parentOrigin: launchPayload.origin || null
     });
@@ -619,7 +690,7 @@ var LoginUI = class {
     this.listenForLoginCallback(callbackState, options);
     const allowedOrigin = options?.allowedOrigin;
     const popupOrigin = getOrigin(finalUrl);
-    this.messageHandler = (event) => {
+    this.popupMessageHandler = (event) => {
       if (allowedOrigin && allowedOrigin !== "*" && event.origin !== allowedOrigin) {
         logLoginWarn("Ignored message due to allowedOrigin mismatch", {
           allowedOrigin,
@@ -645,26 +716,37 @@ var LoginUI = class {
       });
       this.handleLoginEvent(data, options);
     };
-    window.addEventListener("message", this.messageHandler);
-    this.closeMonitor = window.setInterval(() => {
-      if (!this.popup || this.popup.closed) {
-        const shouldTreatAsCancel = !this.completed;
-        logLoginInfo("Detected popup closed", {
-          shouldTreatAsCancel
-        });
-        this.cleanup();
-        if (shouldTreatAsCancel) {
-          options?.onCancel?.();
+    window.addEventListener("message", this.popupMessageHandler);
+    if (options?.monitorPopupClosed === true) {
+      this.closeMonitor = window.setInterval(() => {
+        if (!this.popup || safeIsPopupClosed(this.popup)) {
+          const shouldTreatAsCancel = !this.completed;
+          logLoginInfo("Detected popup closed", {
+            shouldTreatAsCancel
+          });
+          this.cleanup();
+          if (shouldTreatAsCancel) {
+            options?.onCancel?.();
+          }
+          options?.onClose?.();
         }
-        options?.onClose?.();
-      }
-    }, 500);
+      }, 500);
+    }
+  }
+  openLogin(params, options) {
+    if (typeof window === "undefined") return;
+    const displayMode = options?.displayMode ?? "modal";
+    if (displayMode === "popup") {
+      this.openLoginPopup(params, options);
+      return;
+    }
+    this.openLoginModal(params, options);
   }
 };
 function createLoginUI() {
   return new LoginUI();
 }
-handleLoginCallbackIfPresent();
+handleLoginCallbackIfPresent({ autoClose: false });
 
 // src/client.ts
 var PaymentUI = class extends HostedFrameModal {
@@ -700,7 +782,10 @@ var PaymentUI = class extends HostedFrameModal {
         );
       }
     }
-    const finalUrl = applyLocaleToUrl(checkoutUrl, options?.locale);
+    const finalUrl = applyLocaleToUrl(
+      checkoutUrl,
+      getAutoResolvedLocale(options?.locale)
+    );
     this.openHostedFrame(finalUrl, {
       allowedOrigin: options?.allowedOrigin,
       onCloseButton: () => options?.onCancel?.(),
@@ -857,7 +942,7 @@ var PaymentClient = class {
       let decrypted = decipher.update(encryptedData, "hex", "utf8");
       decrypted += decipher.final("utf8");
       return JSON.parse(decrypted);
-    } catch (error) {
+    } catch {
       throw new Error(
         "Failed to decrypt payment callback: Invalid secret or tampered data."
       );
@@ -1024,6 +1109,43 @@ var PaymentClient = class {
     }
     return this.request("POST", "/login/tokens/verify", { token: token.trim() });
   }
+  /**
+   * Send a phone verification code for binding a phone number to a hosted login user.
+   */
+  async sendPhoneVerificationCode(params) {
+    const userId = params.userId?.trim();
+    const phoneNumber = params.phoneNumber?.trim();
+    if (!userId) throw new Error("userId is required");
+    if (!phoneNumber) throw new Error("phoneNumber is required");
+    return this.request(
+      "POST",
+      `/login/users/${encodeURIComponent(userId)}/phone/code`,
+      {
+        phoneCountryCode: params.phoneCountryCode || params.countryCode,
+        phoneNumber
+      }
+    );
+  }
+  /**
+   * Bind a verified phone number to a hosted login user, merging existing accounts when needed.
+   */
+  async bindPhoneNumber(params) {
+    const userId = params.userId?.trim();
+    const phoneNumber = params.phoneNumber?.trim();
+    const code = params.code?.trim();
+    if (!userId) throw new Error("userId is required");
+    if (!phoneNumber) throw new Error("phoneNumber is required");
+    if (!code) throw new Error("code is required");
+    return this.request(
+      "POST",
+      `/login/users/${encodeURIComponent(userId)}/phone/bind`,
+      {
+        code,
+        phoneCountryCode: params.phoneCountryCode || params.countryCode,
+        phoneNumber
+      }
+    );
+  }
 };
 export {
   LoginUI,