Expanded PublicKeyCredentialCreationOptions

Sources/WebAuthn/Ceremonies/Registration/PublicKeyCredentialCreationOptions.swift

@@ -21,6 +21,30 @@ import Foundation
 ///
 /// - SeeAlso: https://www.w3.org/TR/webauthn-2/#dictionary-makecredentialoptions
 public struct PublicKeyCredentialCreationOptions: Encodable, Sendable {
+
+    init(challenge: [UInt8], 
+         user: PublicKeyCredentialUserEntity,
+         relyingParty: PublicKeyCredentialRelyingPartyEntity,
+         publicKeyCredentialParameters: [PublicKeyCredentialParameters],
+         timeout: Int64?,
+         attestation: AttestationConveyancePreference,
+         hints: [Hint] = [],
+         extensions: Extensions = .init(credProps: true),
+         excludeCredentials: [Credentials] = [],
+         authenticatorSelection: AuthenticatorSelection = .init(residentKey: .preferred,
+                                                                requireResidentKey: false,
+                                                                userVerification: .preferred)){
+        self.challenge = challenge
+        self.user = user
+        self.relyingParty = relyingParty
+        self.publicKeyCredentialParameters = publicKeyCredentialParameters
+        self.timeoutInMilliseconds = timeout
+        self.attestation = attestation
+        self.hints = hints
+        self.extensions = extensions
+        self.excludeCredentials = excludeCredentials
+        self.authenticatorSelection = authenticatorSelection
+    }
     /// A byte array randomly generated by the Relying Party. Should be at least 16 bytes long to ensure sufficient
     /// entropy.
     ///
@@ -38,11 +62,9 @@ public struct PublicKeyCredentialCreationOptions: Encodable, Sendable {
     /// preferred.
     public let publicKeyCredentialParameters: [PublicKeyCredentialParameters]
 
-    /// A time, in seconds, that the caller is willing to wait for the call to complete. This is treated as a
+    /// A time, in milliseconds, that the caller is willing to wait for the call to complete. This is treated as a
     /// hint, and may be overridden by the client.
-    ///
-    /// - Note: When encoded, this value is represented in milleseconds as a ``UInt32``.
-    public let timeout: Duration?
+    public let timeoutInMilliseconds: Int64?
 
     /// Sets the Relying Party's preference for attestation conveyance. At the time of writing only `none` is
     /// supported.
@@ -55,17 +77,87 @@ public struct PublicKeyCredentialCreationOptions: Encodable, Sendable {
         try container.encode(user, forKey: .user)
         try container.encode(relyingParty, forKey: .relyingParty)
         try container.encode(publicKeyCredentialParameters, forKey: .publicKeyCredentialParameters)
-        try container.encodeIfPresent(timeout?.milliseconds, forKey: .timeout)
+        try container.encodeIfPresent(timeoutInMilliseconds, forKey: .timeoutInMilliseconds)
         try container.encode(attestation, forKey: .attestation)
+        try container.encode(authenticatorSelection, forKey: .authenticatorSelection)
+        try container.encode(hints, forKey: .hints)
+        try container.encode(extensions, forKey: .extensions)
+        try container.encode(excludeCredentials, forKey: .excludeCredentials)
+    }
+
+    let hints: [Hint]
+    enum Hint: String, Encodable
+    {
+        /// Hint to get the user to register their platform authenticator
+        case clientDevice = "client-device"
+
+        /// Hint to the user should be guided to register a security key. Iconography and text should emphasize the use of security keys
+        case securityKey = "security-key"
+
+        /// Hint to the user to to register a passkey using their mobile device by scanning a QR code that’s displayed on a computer
+        case hybrid = "hybrid"
+    }
+
+    let extensions: Extensions
+
+    struct Extensions: Encodable
+    {
+        let credProps: Bool
+    }
+
+    let excludeCredentials: [Credentials]
+    struct Credentials: Encodable
+    {
+        let id: String
+        let type: [UInt8]
+
+        private enum CodingKeys: String, CodingKey
+        {
+            case id
+            case type
+        }
+
+        public func encode(to encoder: Encoder) throws
+        {
+            var container = encoder.container(keyedBy: CodingKeys.self)
+
+            try container.encode(type.base64URLEncodedString(), forKey: .id)
+            try container.encode(id, forKey: .id)
+        }
+    }
+
+    let authenticatorSelection: AuthenticatorSelection
+    struct AuthenticatorSelection: Encodable
+    {
+        enum ResidentKey: String, Encodable
+        {
+            case required = "required"
+            case preferred = "preferred"
+            case discouraged = "discouraged"
+        }
+
+        enum UserVerification: String, Encodable
+        {
+            case required = "required"
+            case preferred = "preferred"
+            case discouraged = "discouraged"
+        }
+        let residentKey: ResidentKey
+        let requireResidentKey: Bool
+        let userVerification: UserVerification
     }
 
     private enum CodingKeys: String, CodingKey {
         case challenge
         case user
         case relyingParty = "rp"
         case publicKeyCredentialParameters = "pubKeyCredParams"
-        case timeout
+        case timeoutInMilliseconds = "timeout"
         case attestation
+        case authenticatorSelection
+        case hints
+        case extensions
+        case excludeCredentials
     }
 }
 

Sources/WebAuthn/WebAuthnManager.swift

@@ -69,7 +69,7 @@ public struct WebAuthnManager: Sendable {
             user: user,
             relyingParty: .init(id: configuration.relyingPartyID, name: configuration.relyingPartyName),
             publicKeyCredentialParameters: publicKeyCredentialParameters,
-            timeout: timeout,
+            timeout: timeout?.milliseconds,
             attestation: attestation
         )
     }