@tomo-inc/cubist-wallet-sdk 0.0.11 → 0.0.16

package/dist/index.cjs

@@ -421,8 +421,40 @@ var CubeMfaService = class _CubeMfaService {
     const verifyStatus = receipt !== null ? "approved" : "pending";
     return { ...mfaInfo, verifyStatus, mfaRequired };
   }
-  async answerRegister(code) {
+  async answerRegister(code, challengeId) {
     const challenge = this.registerChallenge;
+    if (!challenge && challengeId) {
+      try {
+        if (this.apiClient && typeof this.apiClient.userTotpResetComplete === "function") {
+          const result = await this.apiClient.userTotpResetComplete(challengeId, code);
+          let receipt = null;
+          if (result) {
+            if (typeof result.data === "function") {
+              receipt = result.data();
+            } else if (result.data) {
+              receipt = result.data;
+            } else if (result.status === "ok" || result.success) {
+              receipt = { challengeId, completed: true, ...result };
+            } else {
+              receipt = result;
+            }
+          }
+          return {
+            success: true,
+            data: receipt || { challengeId, completed: true }
+          };
+        }
+        throw new Error(
+          "challenge is required. Please ensure registerTotp was called in the same instance, or provide the challenge object."
+        );
+      } catch (error) {
+        return {
+          success: false,
+          message: error?.message || "answer error",
+          error
+        };
+      }
+    }
     if (!challenge) {
       throw new Error("challenge is required");
     }
@@ -441,7 +473,7 @@ var CubeMfaService = class _CubeMfaService {
       };
     }
   }
-  async executeBizWithMfa(bizType, mfaInfo) {
+  async executeBizWithMfa(bizType, mfaInfo, useLocalMethods = false) {
     if (!bizType) {
       throw new Error("bizType is required");
     }
@@ -451,7 +483,7 @@ var CubeMfaService = class _CubeMfaService {
     if (!mfaInfo?.id) {
       throw new Error("mfa not exists, please create mfa first");
     }
-    const { success, data: receipt } = await this.approvalMfa(mfaInfo?.id || "") || {};
+    const { success, data: receipt } = await this.approvalMfa(mfaInfo?.id || "", useLocalMethods) || {};
     if (!success) {
       return {
         success: false,
@@ -468,7 +500,7 @@ var CubeMfaService = class _CubeMfaService {
     }
     if (bizType === "addFido") {
       const name = mfaInfo.request?.body?.name;
-      const res = await this.addFido(name, receipt);
+      const res = useLocalMethods ? await this.addFidoLocal(name, receipt) : await this.addFido(name, receipt);
       return {
         success: !!res,
         message: !res ? "addFido error" : "",
@@ -536,11 +568,11 @@ var CubeMfaService = class _CubeMfaService {
       message: "bizType is not supported"
     };
   }
-  async approvalMfa(mfaId) {
+  async approvalMfa(mfaId, useLocalMethods = false) {
     const apis = {
       totp: "approvalTotp",
       emailOtp: "approvalEmailOtp",
-      fido: "approvalFido"
+      fido: useLocalMethods ? "approvalFidoLocal" : "approvalFido"
     };
     const mfaType = this.mfaType;
     if (!mfaType || !apis[mfaType]) {
@@ -559,7 +591,11 @@ var CubeMfaService = class _CubeMfaService {
           receipt = await this.approvalEmailOtp(mfaId);
           break;
         case "fido":
-          receipt = await this.approvalFido(mfaId);
+          if (useLocalMethods) {
+            receipt = await this.approvalFidoLocal(mfaId);
+          } else {
+            receipt = await this.approvalFido(mfaId);
+          }
           break;
         default:
           return {
@@ -1025,6 +1061,10 @@ var CubeAccountService = class _CubeAccountService {
     return cubeIdentity;
   }
   //login + reg new user by wallet-api
+  setJwtToken(jwtToken) {
+    this.jwtToken = jwtToken;
+    this.config = { ...this.config, jwtToken };
+  }
   async loginOrRegister(oidcToken, options) {
     this.config = { ...this.config, oidcToken };
     const cubeIdentity = await this.getCubeIdentity();
@@ -1228,7 +1268,12 @@ var CubeConnect = async (config) => {
   if (!config.oidcToken) {
     throw new Error("oidcToken is required");
   }
-  await cubeAccount.loginOrRegister(config.oidcToken);
+  if (config.jwtToken) {
+    console.log("[CubeConnect] Using existing jwtToken, skipping loginOrRegister");
+    cubeAccount.setJwtToken(config.jwtToken);
+  } else {
+    await cubeAccount.loginOrRegister(config.oidcToken);
+  }
   await cubeAccount.init(config.oidcToken);
   const cubeMfaService = cubeAccount.cubeMfaService;
   const cubeExportService = cubeAccount.cubeExportService;

package/dist/index.d.cts

@@ -286,9 +286,9 @@ declare class CubeMfaService {
     setMfaType(mfaType: MfaType): void;
     setMfaAnswer(mfaAnswer: MfaAnswer): void;
     getMfaInfo(bizType?: BizType): Promise<MfaInfo | null>;
-    answerRegister(code: string): Promise<CubeRes>;
-    executeBizWithMfa(bizType: BizType, mfaInfo?: MfaInfo | null): Promise<CubeRes>;
-    approvalMfa(mfaId: string): Promise<CubeRes>;
+    answerRegister(code: string, challengeId?: string): Promise<CubeRes>;
+    executeBizWithMfa(bizType: BizType, mfaInfo?: MfaInfo | null, useLocalMethods?: boolean): Promise<CubeRes>;
+    approvalMfa(mfaId: string, useLocalMethods?: boolean): Promise<CubeRes>;
     private getPasskeyConfig;
     passkeyClear(): void;
     addFido(fidoName: string, receipt?: MfaReceipt): Promise<any>;
@@ -370,6 +370,7 @@ declare class CubeAccountService {
     constructor(config: CubeConfig);
     static getInstance(config?: CubeConfig): CubeAccountService;
     getCubeIdentity(): Promise<CubeIdentity | null>;
+    setJwtToken(jwtToken: string): void;
     loginOrRegister(oidcToken: string, options?: any): Promise<LoginRes>;
     updateUserInfo(userInfo: {
         nickname: string;

package/dist/index.d.ts

@@ -286,9 +286,9 @@ declare class CubeMfaService {
     setMfaType(mfaType: MfaType): void;
     setMfaAnswer(mfaAnswer: MfaAnswer): void;
     getMfaInfo(bizType?: BizType): Promise<MfaInfo | null>;
-    answerRegister(code: string): Promise<CubeRes>;
-    executeBizWithMfa(bizType: BizType, mfaInfo?: MfaInfo | null): Promise<CubeRes>;
-    approvalMfa(mfaId: string): Promise<CubeRes>;
+    answerRegister(code: string, challengeId?: string): Promise<CubeRes>;
+    executeBizWithMfa(bizType: BizType, mfaInfo?: MfaInfo | null, useLocalMethods?: boolean): Promise<CubeRes>;
+    approvalMfa(mfaId: string, useLocalMethods?: boolean): Promise<CubeRes>;
     private getPasskeyConfig;
     passkeyClear(): void;
     addFido(fidoName: string, receipt?: MfaReceipt): Promise<any>;
@@ -370,6 +370,7 @@ declare class CubeAccountService {
     constructor(config: CubeConfig);
     static getInstance(config?: CubeConfig): CubeAccountService;
     getCubeIdentity(): Promise<CubeIdentity | null>;
+    setJwtToken(jwtToken: string): void;
     loginOrRegister(oidcToken: string, options?: any): Promise<LoginRes>;
     updateUserInfo(userInfo: {
         nickname: string;

package/dist/index.js

@@ -414,8 +414,40 @@ var CubeMfaService = class _CubeMfaService {
     const verifyStatus = receipt !== null ? "approved" : "pending";
     return { ...mfaInfo, verifyStatus, mfaRequired };
   }
-  async answerRegister(code) {
+  async answerRegister(code, challengeId) {
     const challenge = this.registerChallenge;
+    if (!challenge && challengeId) {
+      try {
+        if (this.apiClient && typeof this.apiClient.userTotpResetComplete === "function") {
+          const result = await this.apiClient.userTotpResetComplete(challengeId, code);
+          let receipt = null;
+          if (result) {
+            if (typeof result.data === "function") {
+              receipt = result.data();
+            } else if (result.data) {
+              receipt = result.data;
+            } else if (result.status === "ok" || result.success) {
+              receipt = { challengeId, completed: true, ...result };
+            } else {
+              receipt = result;
+            }
+          }
+          return {
+            success: true,
+            data: receipt || { challengeId, completed: true }
+          };
+        }
+        throw new Error(
+          "challenge is required. Please ensure registerTotp was called in the same instance, or provide the challenge object."
+        );
+      } catch (error) {
+        return {
+          success: false,
+          message: error?.message || "answer error",
+          error
+        };
+      }
+    }
     if (!challenge) {
       throw new Error("challenge is required");
     }
@@ -434,7 +466,7 @@ var CubeMfaService = class _CubeMfaService {
       };
     }
   }
-  async executeBizWithMfa(bizType, mfaInfo) {
+  async executeBizWithMfa(bizType, mfaInfo, useLocalMethods = false) {
     if (!bizType) {
       throw new Error("bizType is required");
     }
@@ -444,7 +476,7 @@ var CubeMfaService = class _CubeMfaService {
     if (!mfaInfo?.id) {
       throw new Error("mfa not exists, please create mfa first");
     }
-    const { success, data: receipt } = await this.approvalMfa(mfaInfo?.id || "") || {};
+    const { success, data: receipt } = await this.approvalMfa(mfaInfo?.id || "", useLocalMethods) || {};
     if (!success) {
       return {
         success: false,
@@ -461,7 +493,7 @@ var CubeMfaService = class _CubeMfaService {
     }
     if (bizType === "addFido") {
       const name = mfaInfo.request?.body?.name;
-      const res = await this.addFido(name, receipt);
+      const res = useLocalMethods ? await this.addFidoLocal(name, receipt) : await this.addFido(name, receipt);
       return {
         success: !!res,
         message: !res ? "addFido error" : "",
@@ -529,11 +561,11 @@ var CubeMfaService = class _CubeMfaService {
       message: "bizType is not supported"
     };
   }
-  async approvalMfa(mfaId) {
+  async approvalMfa(mfaId, useLocalMethods = false) {
     const apis = {
       totp: "approvalTotp",
       emailOtp: "approvalEmailOtp",
-      fido: "approvalFido"
+      fido: useLocalMethods ? "approvalFidoLocal" : "approvalFido"
     };
     const mfaType = this.mfaType;
     if (!mfaType || !apis[mfaType]) {
@@ -552,7 +584,11 @@ var CubeMfaService = class _CubeMfaService {
           receipt = await this.approvalEmailOtp(mfaId);
           break;
         case "fido":
-          receipt = await this.approvalFido(mfaId);
+          if (useLocalMethods) {
+            receipt = await this.approvalFidoLocal(mfaId);
+          } else {
+            receipt = await this.approvalFido(mfaId);
+          }
           break;
         default:
           return {
@@ -1018,6 +1054,10 @@ var CubeAccountService = class _CubeAccountService {
     return cubeIdentity;
   }
   //login + reg new user by wallet-api
+  setJwtToken(jwtToken) {
+    this.jwtToken = jwtToken;
+    this.config = { ...this.config, jwtToken };
+  }
   async loginOrRegister(oidcToken, options) {
     this.config = { ...this.config, oidcToken };
     const cubeIdentity = await this.getCubeIdentity();
@@ -1221,7 +1261,12 @@ var CubeConnect = async (config) => {
   if (!config.oidcToken) {
     throw new Error("oidcToken is required");
   }
-  await cubeAccount.loginOrRegister(config.oidcToken);
+  if (config.jwtToken) {
+    console.log("[CubeConnect] Using existing jwtToken, skipping loginOrRegister");
+    cubeAccount.setJwtToken(config.jwtToken);
+  } else {
+    await cubeAccount.loginOrRegister(config.oidcToken);
+  }
   await cubeAccount.init(config.oidcToken);
   const cubeMfaService = cubeAccount.cubeMfaService;
   const cubeExportService = cubeAccount.cubeExportService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomo-inc/cubist-wallet-sdk",
-  "version": "0.0.11",
+  "version": "0.0.16",
   "author": "tomo.inc",
   "license": "MIT",
   "private": false,
@@ -20,7 +20,7 @@
     "axios": "^1.11.0",
     "crypto-js": "^4.2.0",
     "@tomo-inc/cubist-sig-sdk": "1.1.0",
-    "@tomo-inc/wallet-utils": "0.0.9"
+    "@tomo-inc/wallet-utils": "0.0.13"
   },
   "devDependencies": {
     "@types/crypto-js": "^4.2.2",

package/project.json

@@ -3,6 +3,13 @@
   "sourceRoot": "packages/cubist-wallet-sdk/src",
   "projectType": "library",
   "targets": {
+    "version:up": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/cubist-wallet-sdk",
+        "command": "npm version patch --no-git-tag-version"
+      }
+    },
     "build": {
       "executor": "nx:run-commands",
       "outputs": ["{projectRoot}/dist"],
@@ -53,6 +60,14 @@
         "command": "vitest",
         "cwd": "packages/cubist-wallet-sdk"
       }
+    },
+    "publish": {
+      "executor": "nx:run-commands",
+      "dependsOn": ["build"],
+      "options": {
+        "command": "pnpm publish --access public --no-git-checks --tag ${NPM_TAG:-latest}",
+        "cwd": "packages/cubist-wallet-sdk"
+      }
     }
   },
   "tags": ["npm:private", "scope:cubist-wallet-sdk", "type:library"]

package/src/cube-account.ts

@@ -101,6 +101,11 @@ export class CubeAccountService {
   }
 
   //login + reg new user by wallet-api
+  public setJwtToken(jwtToken: string): void {
+    this.jwtToken = jwtToken;
+    this.config = { ...this.config, jwtToken };
+  }
+
   public async loginOrRegister(oidcToken: string, options?: any): Promise<LoginRes> {
     this.config = { ...this.config, oidcToken };
     const cubeIdentity = await this.getCubeIdentity();

package/src/cube-connect.ts

@@ -8,7 +8,13 @@ export const CubeConnect = async (config: CubeConfig) => {
     throw new Error("oidcToken is required");
   }
 
-  await cubeAccount.loginOrRegister(config.oidcToken);
+  if (config.jwtToken) {
+    console.log("[CubeConnect] Using existing jwtToken, skipping loginOrRegister");
+    cubeAccount.setJwtToken(config.jwtToken);
+  } else {
+    await cubeAccount.loginOrRegister(config.oidcToken);
+  }
+
   await cubeAccount.init(config.oidcToken);
 
   const cubeMfaService = cubeAccount.cubeMfaService;

package/src/cube-mfa.ts

@@ -102,11 +102,48 @@ export class CubeMfaService {
     return { ...mfaInfo, verifyStatus, mfaRequired };
   }
 
-  public async answerRegister(code: string): Promise<CubeRes> {
+  public async answerRegister(code: string, challengeId?: string): Promise<CubeRes> {
     const challenge = this.registerChallenge;
+
+    if (!challenge && challengeId) {
+      try {
+        if (this.apiClient && typeof this.apiClient.userTotpResetComplete === "function") {
+          const result = await this.apiClient.userTotpResetComplete(challengeId, code);
+          let receipt = null;
+          if (result) {
+            if (typeof result.data === "function") {
+              receipt = result.data();
+            } else if (result.data) {
+              receipt = result.data;
+            } else if (result.status === "ok" || result.success) {
+              receipt = { challengeId, completed: true, ...result };
+            } else {
+              receipt = result;
+            }
+          }
+
+          return {
+            success: true,
+            data: receipt || { challengeId, completed: true },
+          };
+        }
+
+        throw new Error(
+          "challenge is required. Please ensure registerTotp was called in the same instance, or provide the challenge object.",
+        );
+      } catch (error: any) {
+        return {
+          success: false,
+          message: error?.message || "answer error",
+          error,
+        };
+      }
+    }
+
     if (!challenge) {
       throw new Error("challenge is required");
     }
+
     try {
       const receipt = (await challenge.answer(code)) || null;
       this.registerChallenge = null;
@@ -123,7 +160,11 @@ export class CubeMfaService {
     }
   }
 
-  public async executeBizWithMfa(bizType: BizType, mfaInfo?: MfaInfo | null): Promise<CubeRes> {
+  public async executeBizWithMfa(
+    bizType: BizType,
+    mfaInfo?: MfaInfo | null,
+    useLocalMethods = false,
+  ): Promise<CubeRes> {
     if (!bizType) {
       throw new Error("bizType is required");
     }
@@ -134,7 +175,7 @@ export class CubeMfaService {
       throw new Error("mfa not exists, please create mfa first");
     }
 
-    const { success, data: receipt } = (await this.approvalMfa(mfaInfo?.id || "")) || {};
+    const { success, data: receipt } = (await this.approvalMfa(mfaInfo?.id || "", useLocalMethods)) || {};
     if (!success) {
       return {
         success: false,
@@ -153,7 +194,8 @@ export class CubeMfaService {
 
     if (bizType === "addFido") {
       const name = mfaInfo.request?.body?.name;
-      const res = await this.addFido(name, receipt);
+      // Use addFidoLocal when useLocalMethods is true to avoid opening a new window
+      const res = useLocalMethods ? await this.addFidoLocal(name, receipt) : await this.addFido(name, receipt);
       return {
         success: !!res,
         message: !res ? "addFido error" : "",
@@ -229,11 +271,11 @@ export class CubeMfaService {
     };
   }
 
-  public async approvalMfa(mfaId: string): Promise<CubeRes> {
+  public async approvalMfa(mfaId: string, useLocalMethods = false): Promise<CubeRes> {
     const apis = {
       totp: "approvalTotp",
       emailOtp: "approvalEmailOtp",
-      fido: "approvalFido",
+      fido: useLocalMethods ? "approvalFidoLocal" : "approvalFido",
     };
     const mfaType: MfaType = this.mfaType;
 
@@ -253,7 +295,11 @@ export class CubeMfaService {
           receipt = await this.approvalEmailOtp(mfaId);
           break;
         case "fido":
-          receipt = await this.approvalFido(mfaId);
+          if (useLocalMethods) {
+            receipt = await this.approvalFidoLocal(mfaId);
+          } else {
+            receipt = await this.approvalFido(mfaId);
+          }
           break;
         default:
           return {