Update Customauth new interface

Author: hieu-w

packages/common-types/package.json

@@ -43,7 +43,7 @@
     "@babel/runtime": "7.x"
   },
   "dependencies": {
-    "@toruslabs/customauth": "^20.4.0",
+    "@toruslabs/customauth": "^21.0.0",
     "@toruslabs/eccrypto": "^6.0.2",
     "@toruslabs/torus.js": "^16.0.0",
     "bn.js": "^5.2.1",

packages/service-provider-torus/package.json

@@ -40,7 +40,7 @@
   "dependencies": {
     "@tkey/common-types": "^15.2.1-alpha.0",
     "@tkey/service-provider-base": "^15.2.1-alpha.0",
-    "@toruslabs/customauth": "^20.4.0",
+    "@toruslabs/customauth": "^21.0.0",
     "@toruslabs/torus.js": "^16.0.0",
     "bn.js": "^5.2.1",
     "elliptic": "^6.6.1"

packages/service-provider-torus/src/TorusServiceProvider.ts

@@ -1,14 +1,6 @@
 import { StringifiedType, TorusServiceProviderArgs } from "@tkey/common-types";
 import { ServiceProviderBase } from "@tkey/service-provider-base";
-import {
-  AggregateLoginParams,
-  CustomAuth,
-  CustomAuthArgs,
-  InitParams,
-  SubVerifierDetails,
-  TorusAggregateLoginResponse,
-  TorusLoginResponse,
-} from "@toruslabs/customauth";
+import { CustomAuth, CustomAuthArgs, CustomAuthLoginParams, InitParams, TorusLoginResponse } from "@toruslabs/customauth";
 import { Torus, TorusKey } from "@toruslabs/torus.js";
 import BN from "bn.js";
 
@@ -48,7 +40,7 @@ class TorusServiceProvider extends ServiceProviderBase {
   /**
    * Trigger login flow. Returns `null` in redirect mode.
    */
-  async triggerLogin(params: SubVerifierDetails): Promise<TorusLoginResponse | null> {
+  async triggerLogin(params: CustomAuthLoginParams): Promise<TorusLoginResponse | null> {
     const obj = await this.customAuthInstance.triggerLogin(params);
 
     // `obj` maybe `null` in redirect mode.
@@ -68,27 +60,6 @@ class TorusServiceProvider extends ServiceProviderBase {
     return obj;
   }
 
-  /**
-   * Trigger login flow. Returns `null` in redirect mode.
-   */
-  async triggerAggregateLogin(params: AggregateLoginParams): Promise<TorusAggregateLoginResponse> {
-    const obj = await this.customAuthInstance.triggerAggregateLogin(params);
-
-    if (obj) {
-      const localPrivKey = Torus.getPostboxKey(obj);
-      this.torusKey = obj;
-
-      if (!obj.metadata.upgraded) {
-        const { finalKeyData, oAuthKeyData } = obj;
-        const privKey = finalKeyData.privKey || oAuthKeyData.privKey;
-        this.migratableKey = new BN(privKey, "hex");
-      }
-
-      this.postboxKey = new BN(localPrivKey, "hex");
-    }
-    return obj;
-  }
-
   toJSON(): StringifiedType {
     return {
       ...super.toJSON(),

packages/tss/package.json

@@ -24,7 +24,7 @@
     "@tkey/common-types": "^15.2.1-alpha.0",
     "@tkey/core": "^15.2.1-alpha.0",
     "@tkey/service-provider-torus": "^15.2.1-alpha.0",
-    "@toruslabs/customauth": "^20.4.0",
+    "@toruslabs/customauth": "^21.0.0",
     "@toruslabs/http-helpers": "^8.1.1",
     "@toruslabs/rss-client": "^2.0.2",
     "@toruslabs/torus.js": "^16.0.0",

packages/tss/src/provider.ts

@@ -1,6 +1,6 @@
 import { Point, StringifiedType } from "@tkey/common-types";
 import { TorusServiceProvider } from "@tkey/service-provider-torus";
-import { AggregateLoginParams, SubVerifierDetails, TorusAggregateLoginResponse, TorusLoginResponse } from "@toruslabs/customauth";
+import { CustomAuthLoginParams, TorusLoginResponse } from "@toruslabs/customauth";
 import { PointHex } from "@toruslabs/rss-client";
 
 import { getExtendedVerifierId } from "./util";
@@ -81,25 +81,13 @@ export class TSSTorusServiceProvider extends TorusServiceProvider {
     return `${this.verifierName}\u001c${this.verifierId}`;
   }
 
-  async triggerLogin(params: SubVerifierDetails): Promise<TorusLoginResponse> {
+  async triggerLogin(params: CustomAuthLoginParams): Promise<TorusLoginResponse> {
     const obj = await super.triggerLogin(params);
 
     if (obj) {
-      const { verifier, verifierId } = obj.userInfo;
-      this.verifierName = verifier;
-      this.verifierId = verifierId;
-    }
-
-    return obj;
-  }
-
-  async triggerAggregateLogin(params: AggregateLoginParams): Promise<TorusAggregateLoginResponse> {
-    const obj = await super.triggerAggregateLogin(params);
-
-    if (obj) {
-      const { verifier, verifierId } = obj.userInfo[0];
-      this.verifierName = verifier;
-      this.verifierId = verifierId;
+      const { authConnectionId, userId } = obj.userInfo;
+      this.verifierName = authConnectionId;
+      this.verifierId = userId;
     }
 
     return obj;