@portal-hq/passkey-storage 4.2.13 → 4.3.1

package/lib/commonjs/index.js

@@ -144,11 +144,12 @@ class PasskeyStorage {
                 },
             });
             // check if challenge exists
-            if (!beginResponse.options.publicKey.challenge) {
-                throw new Error('Challenge is missing in passkey options. Please try again and check your web authn host url.');
+            const challenge = beginResponse.options.publicKey.challenge;
+            if (typeof challenge !== 'string' || !challenge) {
+                throw new Error('Challenge is missing or invalid in passkey options. Please try again and check your web authn host url.');
             }
-            beginResponse.options.publicKey.challenge = convertBase64UrlToBase64(beginResponse.options.publicKey.challenge);
-            const result = yield react_native_passkey_1.Passkey.register(beginResponse.options.publicKey);
+            const createRequest = Object.assign(Object.assign({}, beginResponse.options.publicKey), { challenge: convertBase64UrlToBase64(challenge) });
+            const result = yield react_native_passkey_1.Passkey.create(createRequest);
             const attestation = {
                 rawId: convertBase64ToBase64Url(result.rawId),
                 id: convertBase64ToBase64Url(result.id),
@@ -176,11 +177,13 @@ class PasskeyStorage {
                 },
             });
             // check if challenge exists
-            if (!beginResponse.options.publicKey.challenge) {
-                throw new Error('Challenge is missing in passkey options. Please try again and check your web authn host url.');
+            const challenge = beginResponse.options.publicKey.challenge;
+            if (typeof challenge !== 'string' || !challenge) {
+                throw new Error('Challenge is missing or invalid in passkey options. Please try again and check your web authn host url.');
             }
-            beginResponse.options.publicKey.challenge = convertBase64UrlToBase64(beginResponse.options.publicKey.challenge);
-            const result = yield react_native_passkey_1.Passkey.authenticate(beginResponse.options.publicKey);
+            // Create a properly typed request for Passkey.get()
+            const getRequest = Object.assign(Object.assign({}, beginResponse.options.publicKey), { challenge: convertBase64UrlToBase64(challenge) });
+            const result = yield react_native_passkey_1.Passkey.get(getRequest);
             const assertion = {
                 rawId: convertBase64ToBase64Url(result.rawId),
                 id: convertBase64ToBase64Url(result.id),

package/lib/esm/index.js

@@ -141,11 +141,12 @@ export class PasskeyStorage {
                 },
             });
             // check if challenge exists
-            if (!beginResponse.options.publicKey.challenge) {
-                throw new Error('Challenge is missing in passkey options. Please try again and check your web authn host url.');
+            const challenge = beginResponse.options.publicKey.challenge;
+            if (typeof challenge !== 'string' || !challenge) {
+                throw new Error('Challenge is missing or invalid in passkey options. Please try again and check your web authn host url.');
             }
-            beginResponse.options.publicKey.challenge = convertBase64UrlToBase64(beginResponse.options.publicKey.challenge);
-            const result = yield Passkey.register(beginResponse.options.publicKey);
+            const createRequest = Object.assign(Object.assign({}, beginResponse.options.publicKey), { challenge: convertBase64UrlToBase64(challenge) });
+            const result = yield Passkey.create(createRequest);
             const attestation = {
                 rawId: convertBase64ToBase64Url(result.rawId),
                 id: convertBase64ToBase64Url(result.id),
@@ -173,11 +174,13 @@ export class PasskeyStorage {
                 },
             });
             // check if challenge exists
-            if (!beginResponse.options.publicKey.challenge) {
-                throw new Error('Challenge is missing in passkey options. Please try again and check your web authn host url.');
+            const challenge = beginResponse.options.publicKey.challenge;
+            if (typeof challenge !== 'string' || !challenge) {
+                throw new Error('Challenge is missing or invalid in passkey options. Please try again and check your web authn host url.');
             }
-            beginResponse.options.publicKey.challenge = convertBase64UrlToBase64(beginResponse.options.publicKey.challenge);
-            const result = yield Passkey.authenticate(beginResponse.options.publicKey);
+            // Create a properly typed request for Passkey.get()
+            const getRequest = Object.assign(Object.assign({}, beginResponse.options.publicKey), { challenge: convertBase64UrlToBase64(challenge) });
+            const result = yield Passkey.get(getRequest);
             const assertion = {
                 rawId: convertBase64ToBase64Url(result.rawId),
                 id: convertBase64ToBase64Url(result.id),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portal-hq/passkey-storage",
-  "version": "4.2.13",
+  "version": "4.3.1",
   "description": "Portal's Passkey storage adapter",
   "license": "MIT",
   "author": "Portal Labs, Inc.",
@@ -22,9 +22,9 @@
     "test": "jest --pass-with-no-tests"
   },
   "dependencies": {
-    "@portal-hq/core": "^4.2.13",
-    "@portal-hq/utils": "^4.2.13",
-    "react-native-passkey": "^2.1.1"
+    "@portal-hq/core": "^4.3.1",
+    "@portal-hq/utils": "^4.3.1",
+    "react-native-passkey": "^3.3.2"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.18.6",
@@ -35,7 +35,7 @@
     "typescript": "^4.8.4"
   },
   "peerDependencies": {
-    "react-native-passkey": "^2.1.1"
+    "react-native-passkey": "^3.3.2"
   },
-  "gitHead": "cd2865d204185bcfedd02b94487afc46f4922780"
+  "gitHead": "0cfb3fc21c050a54e73044a87b92ac22f9e2edb7"
 }

package/src/index.ts

@@ -1,9 +1,4 @@
 import { HttpRequester, IPortalApi, type Storage } from '@portal-hq/utils'
-import {
-  Passkey,
-  PasskeyAuthenticationResult,
-  PasskeyRegistrationResult,
-} from 'react-native-passkey'
 
 import type {
   AuthenticationResponse,
@@ -12,6 +7,13 @@ import type {
   PasskeyStatusResponse,
   RegistrationResponse,
 } from '../types'
+import {
+  Passkey,
+  type PasskeyCreateRequest,
+  type PasskeyCreateResult,
+  type PasskeyGetRequest,
+  type PasskeyGetResult,
+} from 'react-native-passkey'
 
 export class PasskeyStorage implements Storage {
   public api?: IPortalApi
@@ -151,7 +153,7 @@ export class PasskeyStorage implements Storage {
   // Helper Methods
   private async getAttestationAndSetSessionId(
     headers: Record<string, any>,
-  ): Promise<PasskeyRegistrationResult> {
+  ): Promise<PasskeyCreateResult> {
     const beginResponse = await this.passkeyApi.post<RegistrationResponse>(
       '/passkeys/begin-registration',
       {
@@ -164,18 +166,19 @@ export class PasskeyStorage implements Storage {
     )
 
     // check if challenge exists
-    if (!beginResponse.options.publicKey.challenge) {
+    const challenge = beginResponse.options.publicKey.challenge
+    if (typeof challenge !== 'string' || !challenge) {
       throw new Error(
-        'Challenge is missing in passkey options. Please try again and check your web authn host url.',
+        'Challenge is missing or invalid in passkey options. Please try again and check your web authn host url.',
       )
     }
-    beginResponse.options.publicKey.challenge = convertBase64UrlToBase64(
-      beginResponse.options.publicKey.challenge,
-    )
 
-    const result: PasskeyRegistrationResult = await Passkey.register(
-      beginResponse.options.publicKey,
-    )
+    const createRequest: PasskeyCreateRequest = {
+      ...beginResponse.options.publicKey,
+      challenge: convertBase64UrlToBase64(challenge),
+    }
+
+    const result: PasskeyCreateResult = await Passkey.create(createRequest)
     const attestation = {
       rawId: convertBase64ToBase64Url(result.rawId),
       id: convertBase64ToBase64Url(result.id),
@@ -203,7 +206,7 @@ export class PasskeyStorage implements Storage {
 
   private async getAssertionAndSetSessionId(
     headers: Record<string, any>,
-  ): Promise<PasskeyAuthenticationResult> {
+  ): Promise<PasskeyGetResult> {
     const beginResponse = await this.passkeyApi.post<AuthenticationResponse>(
       '/passkeys/begin-login',
       {
@@ -216,18 +219,20 @@ export class PasskeyStorage implements Storage {
     )
 
     // check if challenge exists
-    if (!beginResponse.options.publicKey.challenge) {
+    const challenge = beginResponse.options.publicKey.challenge
+    if (typeof challenge !== 'string' || !challenge) {
       throw new Error(
-        'Challenge is missing in passkey options. Please try again and check your web authn host url.',
+        'Challenge is missing or invalid in passkey options. Please try again and check your web authn host url.',
       )
     }
-    beginResponse.options.publicKey.challenge = convertBase64UrlToBase64(
-      beginResponse.options.publicKey.challenge,
-    )
 
-    const result: PasskeyAuthenticationResult = await Passkey.authenticate(
-      beginResponse.options.publicKey,
-    )
+    // Create a properly typed request for Passkey.get()
+    const getRequest: PasskeyGetRequest = {
+      ...beginResponse.options.publicKey,
+      challenge: convertBase64UrlToBase64(challenge),
+    }
+
+    const result: PasskeyGetResult = await Passkey.get(getRequest)
 
     const assertion = {
       rawId: convertBase64ToBase64Url(result.rawId),
@@ -249,9 +254,7 @@ export class PasskeyStorage implements Storage {
     return assertion
   }
 
-  private async getEncryptionKey(
-    assertion: PasskeyAuthenticationResult,
-  ): Promise<string> {
+  private async getEncryptionKey(assertion: PasskeyGetResult): Promise<string> {
     if (this.api?.apiKey === undefined) {
       throw new Error('API key is not set')
     }

package/types.d.ts

@@ -1,7 +1,7 @@
 import {
-  PasskeyRegistrationRequest,
-  PasskeyAuthenticationRequest,
-} from 'react-native-passkey/lib/typescript/Passkey'
+  PasskeyCreateRequest,
+  PasskeyGetRequest,
+} from 'react-native-passkey/lib/typescript/PasskeyTypes'
 import { PasskeyStatus } from './src'
 
 export declare class PasskeyStorage {
@@ -33,7 +33,7 @@ export interface RegistrationResponse {
 }
 
 export interface RegistrationOptions {
-  publicKey: PasskeyRegistrationRequest
+  publicKey: PasskeyCreateRequest
 }
 
 export interface AuthenticationResponse {
@@ -42,7 +42,7 @@ export interface AuthenticationResponse {
 }
 
 export interface AuthenticationOptions {
-  publicKey: PasskeyAuthenticationRequest
+  publicKey: PasskeyGetRequest
 }
 
 export interface LoginReadResponse {