adds more userinfo

Author: chaitanyapotti

src/Web3Auth.ts

@@ -182,9 +182,16 @@ export class Web3Auth extends SafeEventEmitter<Web3AuthSfaEvents> implements IWe
 
     const { chainNamespace, chainId } = this.coreOptions.chainConfig || {};
     if (!this.authInstance || !this.privKeyProvider) throw WalletInitializationError.notReady();
-    const accounts = await this.privKeyProvider.provider.request<unknown, string[]>({
-      method: chainNamespace === CHAIN_NAMESPACES.EIP155 ? "eth_accounts" : "getAccounts",
-    });
+    const [accounts, publicKey] = await Promise.all([
+      this.privKeyProvider.provider.request<unknown, string[]>({
+        method: chainNamespace === CHAIN_NAMESPACES.EIP155 ? "eth_accounts" : "getAccounts",
+      }),
+      this.privKeyProvider.provider.request<unknown, string[]>({
+        method: "public_key",
+      }),
+    ]);
+    // const thresholdPrivKey = this._getBasePrivKey();
+
     if (accounts && accounts.length > 0) {
       const existingToken = getSavedToken(accounts[0] as string, "SFA");
       if (existingToken) {
@@ -202,8 +209,33 @@ export class Web3Auth extends SafeEventEmitter<Web3AuthSfaEvents> implements IWe
         version: "1",
         nonce: Math.random().toString(36).slice(2),
         issuedAt: new Date().toISOString(),
+        email: userInfo.email,
+        name: userInfo.name,
+        profileImage: userInfo.profileImage,
+        aggregateVerifier: userInfo.aggregateVerifier,
+        verifier: userInfo.verifier,
+        verifierId: userInfo.verifierId,
+        typeOfLogin: userInfo.typeOfLogin || "jwt",
+        oAuthIdToken: userInfo.oAuthIdToken,
+        oAuthAccessToken: userInfo.oAuthAccessToken,
+        wallets: [] as unknown[],
+        signatures: [] as unknown[],
       };
 
+      if (this.coreOptions.usePnPKey) {
+        payload.wallets.push({
+          public_key: publicKey,
+          type: "web3auth_app_key",
+          curve: chainNamespace === CHAIN_NAMESPACES.EIP155 ? KEY_TYPE.SECP256K1 : KEY_TYPE.ED25519,
+        });
+      } else {
+        payload.wallets.push({
+          public_key: publicKey,
+          type: "web3auth_threshold_key",
+          curve: chainNamespace === CHAIN_NAMESPACES.EIP155 ? KEY_TYPE.SECP256K1 : KEY_TYPE.ED25519,
+        });
+      }
+
       const challenge = await signChallenge(payload, chainNamespace);
       const signedMessage = await this._getSignedMessage(challenge, accounts, chainNamespace);
       const idToken = await verifySignedChallenge(
@@ -415,18 +447,26 @@ export class Web3Auth extends SafeEventEmitter<Web3AuthSfaEvents> implements IWe
     let finalPrivKey = privKey.padStart(64, "0");
     // get app scoped keys.
     if (this.coreOptions.usePnPKey) {
-      const pnpPrivKey = subkey(finalPrivKey, Buffer.from(this.coreOptions.clientId, "base64"));
-      finalPrivKey = pnpPrivKey.padStart(64, "0");
+      finalPrivKey = this.getSubKey(finalPrivKey);
     }
     if (this.coreOptions.chainConfig.chainNamespace === CHAIN_NAMESPACES.SOLANA) {
-      if (!this.privKeyProvider.getEd25519Key) {
-        throw WalletLoginError.fromCode(5000, "Private key provider is not valid, Missing getEd25519Key function");
-      }
-      finalPrivKey = this.privKeyProvider.getEd25519Key(finalPrivKey);
+      finalPrivKey = this.getEd25519Key(finalPrivKey);
     }
     return finalPrivKey;
   }
 
+  private getSubKey(privKey: string) {
+    const pnpPrivKey = subkey(privKey, Buffer.from(this.coreOptions.clientId, "base64"));
+    return pnpPrivKey.padStart(64, "0");
+  }
+
+  private getEd25519Key(privKey: string) {
+    if (!this.privKeyProvider.getEd25519Key) {
+      throw WalletLoginError.fromCode(5000, "Private key provider is not valid, Missing getEd25519Key function");
+    }
+    return this.privKeyProvider.getEd25519Key(privKey);
+  }
+
   private async getTorusKey(loginParams: LoginParams): Promise<string> {
     const { verifier, verifierId, idToken, subVerifierInfoArray } = loginParams;