feat: add support for passkeys

apps/desktop/desktop_native/objc/src/native/commands/sync.m

@@ -3,6 +3,8 @@
 #import <AuthenticationServices/ASCredentialIdentityStoreState.h>
 #import <AuthenticationServices/ASCredentialServiceIdentifier.h>
 #import <AuthenticationServices/ASPasswordCredentialIdentity.h>
+#import <AuthenticationServices/ASPasskeyCredentialIdentity.h>
+#import "../utils.h"
 #import "../interop.h"
 #import "sync.h"
 
@@ -11,26 +13,47 @@ void runSync(void* context, NSDictionary *params) {
   NSArray *credentials = params[@"credentials"];
 
   // Map credentials to ASPasswordCredential objects
-  NSMutableArray *passwordCredentials = [NSMutableArray arrayWithCapacity:credentials.count];
+  NSMutableArray *mappedCredentials = [NSMutableArray arrayWithCapacity:credentials.count];
   for (NSDictionary *credential in credentials) {
-    NSString *cipherId = credential[@"cipherId"];
-    NSString *uri = credential[@"uri"];
-    NSString *username = credential[@"username"];
+    NSString *type = credential[@"type"];
 
-    ASCredentialServiceIdentifier *serviceId = [[ASCredentialServiceIdentifier alloc]
-      initWithIdentifier:uri type:ASCredentialServiceIdentifierTypeURL];
-    ASPasswordCredentialIdentity *credential = [[ASPasswordCredentialIdentity alloc]
-      initWithServiceIdentifier:serviceId user:username recordIdentifier:cipherId];
+    if ([type isEqualToString:@"password"]) {
+      NSString *cipherId = credential[@"cipherId"];
+      NSString *uri = credential[@"uri"];
+      NSString *username = credential[@"username"];
 
-    [passwordCredentials addObject:credential];
+      ASCredentialServiceIdentifier *serviceId = [[ASCredentialServiceIdentifier alloc]
+        initWithIdentifier:uri type:ASCredentialServiceIdentifierTypeURL];
+      ASPasswordCredentialIdentity *credential = [[ASPasswordCredentialIdentity alloc]
+        initWithServiceIdentifier:serviceId user:username recordIdentifier:cipherId];
+
+      [mappedCredentials addObject:credential];
+    }
+
+    if ([type isEqualToString:@"fido2"]) {
+      NSString *cipherId = credential[@"cipherId"];
+      NSString *rpId = credential[@"rpId"];
+      NSString *userName = credential[@"userName"];
+      NSData *credentialId = decodeBase64URL(credential[@"credentialId"]);
+      NSData *userHandle = decodeBase64URL(credential[@"userHandle"]);
+
+      ASPasskeyCredentialIdentity *credential = [[ASPasskeyCredentialIdentity alloc]
+        initWithRelyingPartyIdentifier:rpId
+        userName:userName
+        credentialID:credentialId
+        userHandle:userHandle
+        recordIdentifier:cipherId];
+
+      [mappedCredentials addObject:credential];
+    }
   }
 
-  [ASCredentialIdentityStore.sharedStore replaceCredentialIdentityEntries:passwordCredentials
+  [ASCredentialIdentityStore.sharedStore replaceCredentialIdentityEntries:mappedCredentials
     completion:^(BOOL success, NSError * _Nullable error) {
       if (error) {
         return _return(context, _error_er(error));
       }
 
-      _return(context, _success(@{@"added": @([passwordCredentials count])}));
+      _return(context, _success(@{@"added": @([mappedCredentials count])}));
     }];
 }

apps/desktop/desktop_native/objc/src/native/utils.h

@@ -6,4 +6,6 @@
 NSDictionary *parseJson(NSString *jsonString, NSError *error);
 NSString *serializeJson(NSDictionary *dictionary, NSError *error);
 
+NSData *decodeBase64URL(NSString *base64URLString);
+
 #endif

apps/desktop/desktop_native/objc/src/native/utils.m

@@ -16,3 +16,13 @@
   }
   return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
 }
+
+NSData *decodeBase64URL(NSString *base64URLString) {
+  NSString *base64String = [base64URLString stringByReplacingOccurrencesOfString:@"-" withString:@"+"];
+  base64String = [base64String stringByReplacingOccurrencesOfString:@"_" withString:@"/"];
+
+  NSData *nsdataFromBase64String = [[NSData alloc]
+    initWithBase64EncodedString:base64String options:0];
+
+  return nsdataFromBase64String;
+}

apps/desktop/src/autofill/services/desktop-autofill.service.ts

@@ -4,6 +4,7 @@ import { Subject, mergeMap, takeUntil } from "rxjs";
 import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { getCredentialsForAutofill } from "@bitwarden/common/platform/services/fido2/fido2-autofill-utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -55,7 +56,7 @@ export class DesktopAutofillService implements OnDestroy {
       return;
     }
 
-    const fido2Credentials: NativeAutofillFido2Credential[] = [];
+    let fido2Credentials: NativeAutofillFido2Credential[];
     let passwordCredentials: NativeAutofillPasswordCredential[];
 
     if (status.value.support.password) {
@@ -76,6 +77,13 @@ export class DesktopAutofillService implements OnDestroy {
         }));
     }
 
+    if (status.value.support.fido2) {
+      fido2Credentials = (await getCredentialsForAutofill(cipherViews)).map((credential) => ({
+        type: "fido2",
+        ...credential,
+      }));
+    }
+
     const syncResult = await ipc.autofill.runCommand<NativeAutofillSyncCommand>({
       command: "sync",
       params: {

apps/desktop/src/platform/main/autofill/sync.command.ts

@@ -16,6 +16,13 @@ export type NativeAutofillCredential =
 
 export type NativeAutofillFido2Credential = {
   type: "fido2";
+  cipherId: string;
+  rpId: string;
+  userName: string;
+  /** Should be Base64URL-encoded binary data */
+  credentialId: string;
+  /** Should be Base64URL-encoded binary data */
+  userHandle: string;
 };
 
 export type NativeAutofillPasswordCredential = {

libs/common/src/platform/services/fido2/fido2-autofill-utils.ts

@@ -0,0 +1,26 @@
+// TODO: Add tests for this method
+
+import { CipherType } from "../../../vault/enums";
+import { CipherView } from "../../../vault/models/view/cipher.view";
+import { Fido2CredentialAutofillView } from "../../../vault/models/view/fido2-credential-autofill.view";
+
+// TODO: Move into Fido2AuthenticatorService
+export async function getCredentialsForAutofill(
+  ciphers: CipherView[],
+): Promise<Fido2CredentialAutofillView[]> {
+  return ciphers
+    .filter(
+      (cipher) =>
+        !cipher.isDeleted && cipher.type === CipherType.Login && cipher.login.hasFido2Credentials,
+    )
+    .map((cipher) => {
+      const credential = cipher.login.fido2Credentials[0];
+      return {
+        cipherId: cipher.id,
+        credentialId: credential.credentialId,
+        rpId: credential.rpId,
+        userHandle: credential.userHandle,
+        userName: credential.userName,
+      };
+    });
+}

libs/common/src/vault/models/view/fido2-credential-autofill.view.ts

@@ -0,0 +1,7 @@
+export class Fido2CredentialAutofillView {
+  cipherId: string;
+  credentialId: string;
+  rpId: string;
+  userHandle: string;
+  userName: string;
+}