passkey-kit 0.0.26 → 0.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "type": "module",
   "main": "src/index.ts",
   "types": "types/index.d.ts",

package/src/index.ts

@@ -121,20 +121,47 @@ export class PasskeyAccount {
                 this.sudoKeyId = startRegistrationResponse.id
         }
 
-        return this.getKey(startRegistrationResponse)
+        const { publicKeyObject } = this.getPublicKeyObject(startRegistrationResponse.response.attestationObject);
+
+        const publicKey = Buffer.from([
+            4, // (0x04 prefix) https://en.bitcoin.it/wiki/Elliptic_Curve_Digital_Signature_Algorithm
+            ...publicKeyObject.get('-2')!,
+            ...publicKeyObject.get('-3')!
+        ])
+
+        return {
+            keyId: base64url.toBuffer(startRegistrationResponse.id),
+            publicKey
+        }
     }
 
-    public async connectWallet() {
-        const startAuthenticationResponse = await startAuthentication({
-            challenge: base64url("sorobanisbest"),
-            // rpId: undefined,
-            userVerification: "discouraged",
-        });
+    public async connectWallet(id?: string) {
+        /* TODO 
+            - Support passing in a contractId as well as a keyId
+                Maybe not as we wouldn't have a keyId which could have interesting consequences
+                Also not sure what the use case would be for this where keyId wouldn't also be possible and better
+        */
+        
+        // @ts-ignore 
+        // https://github.com/stellar/js-stellar-base/issues/750
+        // if (id && StrKey.isValidContract(id)) {
+
+        // } else {
+
+        // }
+
+        const startAuthenticationResponse = id
+            ? { id }
+            : await startAuthentication({
+                challenge: base64url("sorobanisbest"),
+                // rpId: undefined,
+                userVerification: "discouraged",
+            });
 
         if (!this.keyId)
             this.keyId = startAuthenticationResponse.id
 
-        const { keyId } = await this.getKey(startAuthenticationResponse)
+        const keyIdBuffer = base64url.toBuffer(startAuthenticationResponse.id)
 
         // NOTE might not need this for derivation as all signers are stored in the factory and we can use that lookup as both primary and secondary
         let contractId = StrKey.encodeContract(hash(xdr.HashIdPreimage.envelopeTypeContractId(
@@ -143,7 +170,7 @@ export class PasskeyAccount {
                 contractIdPreimage: xdr.ContractIdPreimage.contractIdPreimageFromAddress(
                     new xdr.ContractIdPreimageFromAddress({
                         address: Address.fromString(this.factoryContractId).toScAddress(),
-                        salt: hash(keyId),
+                        salt: hash(keyIdBuffer),
                     })
                 )
             })
@@ -155,7 +182,7 @@ export class PasskeyAccount {
         }
         // if that fails look up from the factory mapper
         catch {
-            const { val } = await this.rpc.getContractData(this.factoryContractId, xdr.ScVal.scvBytes(keyId))
+            const { val } = await this.rpc.getContractData(this.factoryContractId, xdr.ScVal.scvBytes(keyIdBuffer))
             contractId = scValToNative(val.contractData().val())
         }
 
@@ -170,7 +197,7 @@ export class PasskeyAccount {
         await this.getData()
 
         return {
-            keyId,
+            keyId: keyIdBuffer,
             contractId
         }
     }
@@ -209,7 +236,7 @@ export class PasskeyAccount {
         )
 
         const authenticationResponse = await startAuthentication(
-            keyId === 'any' || (keyId === 'sudo' && !this.sudoKeyId)
+            keyId === 'any' || (keyId === 'sudo' && !this.sudoKeyId) || (!keyId && !this.keyId)
                 ? {
                     challenge: base64url(authHash),
                     // rpId: undefined,
@@ -236,7 +263,7 @@ export class PasskeyAccount {
         if (keyId === 'sudo')
             this.sudoKeyId = authenticationResponse.id
 
-        // reset this.id to be the most recently used passkey
+        // reset this.keyId to be the most recently used passkey
         this.keyId = authenticationResponse.id
 
         const signatureRaw = base64url.toBuffer(authenticationResponse.response.signature);
@@ -324,25 +351,6 @@ export class PasskeyAccount {
             @Later
     */
 
-    private async getKey(value: RegistrationResponseJSON | AuthenticationResponseJSON) {
-        let publicKey: Buffer | undefined
-
-        if (isAuthentication(value)) {
-            const { publicKeyObject } = this.getPublicKeyObject(value.response.attestationObject);
-
-            publicKey = Buffer.from([
-                4, // (0x04 prefix) https://en.bitcoin.it/wiki/Elliptic_Curve_Digital_Signature_Algorithm
-                ...publicKeyObject.get('-2')!,
-                ...publicKeyObject.get('-3')!
-            ])
-        }
-
-        return {
-            keyId: base64url.toBuffer(value.id),
-            publicKey
-        }
-    }
-
     private getPublicKeyObject(attestationObject: string) {
         const { authData } = decode(base64url.toBuffer(attestationObject));
         const authDataUint8Array = new Uint8Array(authData);

package/types/index.d.ts

@@ -32,9 +32,9 @@ export declare class PasskeyAccount {
     }>;
     createKey(name: string, user: string): Promise<{
         keyId: Buffer;
-        publicKey: Buffer | undefined;
+        publicKey: Buffer;
     }>;
-    connectWallet(): Promise<{
+    connectWallet(id?: string): Promise<{
         keyId: Buffer;
         contractId: string;
     }>;
@@ -44,7 +44,6 @@ export declare class PasskeyAccount {
     }): Promise<string>;
     send(txn: Transaction, fee?: number): Promise<Horizon.HorizonApi.SubmitTransactionResponse>;
     getData(): Promise<Map<string, any>>;
-    private getKey;
     private getPublicKeyObject;
     private convertEcdsaSignatureAsnToCompact;
 }