@misiki/gocommerce-connector 0.4.6 → 0.4.8

package/dist/services/index.cjs

@@ -132,6 +132,7 @@ function toMe(c) {
     avatar: null,
     role: "USER",
     emailVerified: c.email_verified,
+    phoneVerified: !!c.phone_verified,
     storeId: null
   };
 }
@@ -954,6 +955,7 @@ function toUser(c) {
     email: c.email,
     emailVerified: c.email_verified,
     phone: c.phone || null,
+    phoneVerified: !!c.phone_verified,
     firstName: firstName || "",
     lastName: rest.join(" "),
     name: c.name,
@@ -2064,11 +2066,24 @@ var orderService = new OrderService();
 
 // src/services/user-service.ts
 var UserService = class extends BaseService {
-  /** Email and password. The answer is the user object the storefront keeps in its `me` cookie. */
-  async login({ email, password }) {
+  /**
+   * Email and password. The answer is the user object the storefront keeps in its `me` cookie.
+   * With `phone` and `phoneToken` from `verifyOtp({ askIfNew: true })`, the phone is added to
+   * the account as it signs in (D123).
+   */
+  async login({
+    email,
+    password,
+    phone,
+    phoneToken
+  }) {
     const auth = await this.account("/x/identity/login", {
       method: "POST",
-      body: { email: String(email ?? "").trim(), password: String(password ?? "") }
+      body: {
+        email: String(email ?? "").trim(),
+        password: String(password ?? ""),
+        ...phoneToken ? { phone: String(phone ?? "").trim(), phone_token: phoneToken } : {}
+      }
     });
     return this.signedIn(auth);
   }
@@ -2201,7 +2216,7 @@ var AuthService = class extends UserService {
   async loginMethod() {
     try {
       const method = (await this.facts.plugins()).get("identity")?.settings?.login_method;
-      return method === "phone_otp" ? "phone_otp" : "email_password";
+      return method === "phone_otp" || method === "email_or_phone" ? method : "email_password";
     } catch {
       return "email_password";
     }
@@ -2240,11 +2255,29 @@ var AuthService = class extends UserService {
     });
     return { expiresInMinutes: res?.expires_in_minutes ?? 10 };
   }
-  /** Signs in the account on `phone` with the code it was sent, opening one the first time. */
-  async verifyOtp({ phone, otp }) {
-    const auth = await this.account("/x/identity/otp/verify", {
+  /**
+   * Signs in the account on `phone` with the code it was sent, opening one the first time.
+   * With `askIfNew`, on a store that signs in either way, a phone with no account opens none:
+   * the answer is `{ newPhone: true, phoneToken }`, and the storefront asks "Already have an
+   * account?" — `login` with the token adds the phone to it, `openPhoneAccount` opens a new one (D123).
+   */
+  async verifyOtp({ phone, otp, askIfNew }) {
+    const res = await this.account("/x/identity/otp/verify", {
       method: "POST",
-      body: { phone: String(phone ?? "").trim(), code: String(otp ?? "").trim() }
+      body: {
+        phone: String(phone ?? "").trim(),
+        code: String(otp ?? "").trim(),
+        ...askIfNew ? { ask_if_new: true } : {}
+      }
+    });
+    if ("new_phone" in res && res.new_phone) return { newPhone: true, phoneToken: res.phone_token };
+    return this.signedIn(res);
+  }
+  /** Opens a new account on a phone `verifyOtp({ askIfNew: true })` proved, and signs it in (D123). */
+  async openPhoneAccount({ phone, phoneToken }) {
+    const auth = await this.account("/x/identity/otp/new-account", {
+      method: "POST",
+      body: { phone: String(phone ?? "").trim(), phone_token: phoneToken }
     });
     return this.signedIn(auth);
   }
@@ -2259,6 +2292,25 @@ var ProfileService = class extends UserService {
   async save(profile) {
     return this.updateProfile(profile);
   }
+  /** Texts a code to a phone the signed-in shopper wants to add (D118). */
+  async requestPhoneLink({ phone }) {
+    const res = await this.account("/x/identity/me/phone", {
+      method: "POST",
+      auth: true,
+      body: { phone: String(phone ?? "").trim() }
+    });
+    return { expiresInMinutes: res?.expires_in_minutes ?? 10 };
+  }
+  /** Adds the phone with its code; from then on it signs in to this account too. */
+  async verifyPhoneLink({ phone, otp }) {
+    const c = await this.account("/x/identity/me/phone/verify", {
+      method: "POST",
+      auth: true,
+      body: { phone: String(phone ?? "").trim(), code: String(otp ?? "").trim() }
+    });
+    updateMe(c);
+    return toUser(c);
+  }
 };
 var userService = new UserService();
 var authService = new AuthService();
@@ -2608,7 +2660,7 @@ var StoreService = class extends BaseService {
       // The one way this store signs customers in (D116), which the sign-in
       // form reads as PHONE or EMAIL. Without the accounts module the static
       // record says.
-      ...plugins.has("identity") ? { loginType: plugins.get("identity")?.settings?.login_method === "phone_otp" ? "PHONE" : "EMAIL" } : {}
+      ...plugins.has("identity") ? { loginType: LOGIN_TYPES[String(plugins.get("identity")?.settings?.login_method)] ?? "EMAIL" } : {}
     };
   }
 };
@@ -2627,6 +2679,7 @@ function regionName(code) {
     return code;
   }
 }
+var LOGIN_TYPES = { phone_otp: "PHONE", email_or_phone: "BOTH", email_password: "EMAIL" };
 
 // src/services/page-service.ts
 var PageService = class extends BaseService {