Merge pull-request #34

Author: moeodeh3

Examples/swift-demo-wallet/swift-demo-wallet/AppView.swift

@@ -22,12 +22,19 @@ struct AuthFlow: View {
                     switch route {
                     case let .otp(id, contact, otpType):
                         OtpView(otpId: id, contact: contact, otpType: otpType) { otpCode in
-                            try await turnkey.completeOtp(
-                                otpId: id,
-                                otpCode: otpCode,
-                                contact: contact,
-                                otpType: otpType
-                            )
+                            Task {
+                                do {
+                                    try await turnkey.completeOtp(
+                                        otpId: id,
+                                        otpCode: otpCode,
+                                        contact: contact,
+                                        otpType: otpType
+                                    )
+                                } catch {
+                                    let message = formatError(error, fallback: "Failed to complete OTP")
+                                    print("[AppView] complete OTP failed: \(message)")
+                                }
+                            }
                         }
                     }
                 }

Examples/swift-demo-wallet/swift-demo-wallet/Helpers/Constants.swift

@@ -11,7 +11,7 @@ enum Constants {
 
   enum Turnkey {
     static let organizationId = "<your_organization_id>"
-    static let apiUrl = "https://api.turnkey.com" 
+    static let apiUrl = "https://api.turnkey.com"
 
     static let authProxyUrl = "https://authproxy.turnkey.com"
     static let authProxyConfigId = "<your_auth_proxy_config_id>"

Examples/swift-demo-wallet/swift-demo-wallet/Helpers/Error.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+func formatError(_ error: Error, fallback: String) -> String {
+    if let turnkeyError = error.turnkeyRequestError {
+        return "\(fallback): \(turnkeyError.fullMessage)"
+    }
+    if let localized = (error as? LocalizedError)?.errorDescription {
+        return "\(fallback): \(localized)"
+    }
+    return "\(fallback): \(String(describing: error))"
+}

Examples/swift-demo-wallet/swift-demo-wallet/Views/AuthView.swift

@@ -223,16 +223,6 @@ struct AuthView: View {
             .windows
             .first(where: { $0.isKeyWindow })
     }
-
-    private func formatError(_ error: Error, fallback: String) -> String {
-        if let turnkeyError = error.turnkeyRequestError {
-            return "\(fallback): \(turnkeyError.fullMessage)"
-        }
-        if let localized = (error as? LocalizedError)?.errorDescription {
-            return "\(fallback): \(localized)"
-        }
-        return "\(fallback): \(String(describing: error))"
-    }
 
     private struct OrSeparator: View {
         var label: String = "OR"

Scripts/Sources/Internal/Resources/auth_proxy.swagger.json

@@ -270,6 +270,10 @@
     }
   },
   "definitions": {
+    "externaldatav1SignatureScheme": {
+      "type": "string",
+      "enum": ["SIGNATURE_SCHEME_EPHEMERAL_KEY_P256"]
+    },
     "protobufAny": {
       "type": "object",
       "properties": {
@@ -373,7 +377,7 @@
       "type": "object",
       "properties": {
         "scheme": {
-          "$ref": "#/definitions/v1SignatureScheme",
+          "$ref": "#/definitions/externaldatav1SignatureScheme",
           "description": "Scheme of signing key."
         },
         "publicKey": {
@@ -449,6 +453,32 @@
         "AUTHENTICATOR_TRANSPORT_HYBRID"
       ]
     },
+    "v1ClientSignature": {
+      "type": "object",
+      "properties": {
+        "publicKey": {
+          "type": "string",
+          "description": "The public component of a cryptographic key pair used to create the signature."
+        },
+        "scheme": {
+          "$ref": "#/definitions/v1ClientSignatureScheme",
+          "description": "The signature scheme used to generate the client signature."
+        },
+        "message": {
+          "type": "string",
+          "description": "The message that was signed."
+        },
+        "signature": {
+          "type": "string",
+          "description": "The cryptographic signature over the message."
+        }
+      },
+      "required": ["publicKey", "scheme", "message", "signature"]
+    },
+    "v1ClientSignatureScheme": {
+      "type": "string",
+      "enum": ["CLIENT_SIGNATURE_SCHEME_API_P256"]
+    },
     "v1Curve": {
       "type": "string",
       "enum": ["CURVE_SECP256K1", "CURVE_ED25519"]
@@ -669,8 +699,8 @@
           "description": "Unique identifier for a given Organization. If provided, this organization id will be used directly. If omitted, uses the verification token to look up the verified sub-organization based on the contact and verification type."
         },
         "clientSignature": {
-          "type": "string",
-          "description": "Optional signature associated with the public key passed into the verification step. This must be a hex-encoded ECDSA signature over the verification token. Only required if a public key was provided during the verification step."
+          "$ref": "#/definitions/v1ClientSignature",
+          "description": "Optional signature proving authorization for this login. The signature is over the verification token ID and the public key. Only required if a public key was provided during the verification step."
         }
       },
       "required": ["verificationToken", "publicKey"]
@@ -689,10 +719,6 @@
       "type": "string",
       "enum": ["PATH_FORMAT_BIP32"]
     },
-    "v1SignatureScheme": {
-      "type": "string",
-      "enum": ["SIGNATURE_SCHEME_EPHEMERAL_KEY_P256"]
-    },
     "v1SignupRequest": {
       "type": "object",
       "properties": {
@@ -741,6 +767,10 @@
         "wallet": {
           "$ref": "#/definitions/v1WalletParams",
           "description": "The wallet to create for the sub-organization"
+        },
+        "clientSignature": {
+          "$ref": "#/definitions/v1ClientSignature",
+          "description": "Optional signature proving authorization for this signup. The signature is over the verification token ID and the root user parameters for the root user associated with the verification token. Only required if a public key was provided during the verification step."
         }
       },
       "required": ["apiKeys", "authenticators", "oauthProviders"]
@@ -767,7 +797,7 @@
             "type": "object",
             "$ref": "#/definitions/v1AppProof"
           },
-          "description": "A list of app proofs generated by enclaves during activity execution, providing verifiable attestations of performed operations."
+          "description": "A list of App Proofs generated by enclaves during activity execution, providing verifiable attestations of performed operations."
         }
       },
       "required": ["organizationId", "userId"]