webappsec-credential-management: tighten webauthn type options/naming (#27281)

* tighten web authentication enum options as per the most current spec

* (rearrange UV type)

* pass linter.

types/webappsec-credential-management/index.d.ts

@@ -341,7 +341,7 @@ interface CredentialCreationOptions {
     /**
      * @see {@link https://w3c.github.io/webauthn/#dictionary-makecredentialoptions}
      */
-    publicKey?: MakePublicKeyCredentialOptions;
+    publicKey?: PublicKeyCredentialCreationOptions;
 }
 
 /**
@@ -364,6 +364,16 @@ interface FederatedCredentialRequestOptions {
 // Type definitions for webauthn
 // Spec: https://w3c.github.io/webauthn/
 
+/**
+ * @see {@link https://w3c.github.io/webauthn/#enumdef-publickeycredentialtype}
+ */
+type PublicKeyCredentialType = "public-key";
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#enumdef-userverificationrequirement}
+ */
+type UserVerificationRequirement = "required" | "preferred" | "discouraged";
+
 /**
  * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialrequestoptions}
  */
@@ -372,7 +382,7 @@ interface PublicKeyCredentialRequestOptions {
     timeout: number;
     rpId: string;
     allowCredentials: PublicKeyCredentialDescriptor[];
-    userVerification?: 'required' | 'preferred' | 'discouraged';
+    userVerification?: UserVerificationRequirement;
     extensions?: any;
 }
 
@@ -397,32 +407,47 @@ interface PublicKeyCredentialUserEntity {
  * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialparameters}
  */
 interface PublicKeyCredentialParameters {
-    type: 'public-key';
+    type: PublicKeyCredentialType;
     alg: number;
 }
 
+/**
+ * @see {@link https://w3c.github.io/webauthn/#transport}
+ */
+type AuthenticatorTransport = "usb" | "nfc" | "ble" | "internal";
+
 /**
  * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialdescriptor}
  */
 interface PublicKeyCredentialDescriptor {
-    type: 'public-key';
+    type: PublicKeyCredentialType;
     id: BufferSource;
-    transports?: string[];
+    transports?: AuthenticatorTransport[];
 }
 
+/**
+ * @see {@link https://w3c.github.io/webauthn/#attachment}
+ */
+type AuthenticatorAttachment = "platform" | "cross-platform";
+
 /**
  * @see {@link https://w3c.github.io/webauthn/#dictdef-authenticatorselectioncriteria}
  */
 interface AuthenticatorSelectionCriteria {
-    authenticatorAttachment?: string;
+    authenticatorAttachment?: AuthenticatorAttachment;
     requireResidentKey?: boolean;
-    requireUserVerification?: string;
+    requireUserVerification?: UserVerificationRequirement;
 }
 
+/**
+ * @see {@link https://w3c.github.io/webauthn/#attestation-convey}
+ */
+type AttestationConveyancePreference = "none" | "indirect" | "direct";
+
 /**
  * @see {@link https://w3c.github.io/webauthn/#dictdef-makepublickeycredentialoptions}
  */
-interface MakePublicKeyCredentialOptions {
+interface PublicKeyCredentialCreationOptions {
     rp: PublicKeyCredentialRpEntity;
     user: PublicKeyCredentialUserEntity;
 
@@ -432,7 +457,7 @@ interface MakePublicKeyCredentialOptions {
     timeout?: number;
     excludeCredentials?: PublicKeyCredentialDescriptor[];
     authenticatorSelection?: AuthenticatorSelectionCriteria;
-    attestation?: 'none' | 'indirect' | 'direct';
+    attestation?: AttestationConveyancePreference;
     extensions?: any;
 }
 
@@ -463,7 +488,7 @@ interface AuthenticatorAssertionResponse extends AuthenticatorResponse {
  * @see {@link https://w3c.github.io/webauthn/#publickeycredential}
  */
 interface PublicKeyCredential extends CredentialData {
-    readonly type: 'public-key';
+    readonly type: PublicKeyCredentialType;
     readonly rawId: ArrayBuffer;
     readonly response: AuthenticatorAttestationResponse|AuthenticatorAssertionResponse;
 }

types/webappsec-credential-management/webappsec-credential-management-tests.ts

@@ -295,8 +295,20 @@ function webauthnRegister() {
             pubKeyCredParams: [
                 {type: 'public-key', alg: -7},
             ],
+            excludeCredentials: [
+                {
+                    id: (new Uint8Array(1)).buffer,
+                    type: 'public-key',
+                    transports: ['ble', 'internal']
+                }
+            ],
             timeout: 5000,
-            authenticatorSelection: {},
+            attestation: "direct",
+            authenticatorSelection: {
+                requireUserVerification: "preferred",
+                requireResidentKey: false,
+                authenticatorAttachment: "platform"
+            },
         }
     });
 
@@ -324,6 +336,7 @@ function webauthnAuthenticate() {
         allowCredentials: [{
             type: "public-key",
             id: credentialID,
+            transports: ['internal', 'ble', 'nfc', 'usb']
         }],
     }});