[Passkey #6] Update passkey related proto naming change (#11953)

firebase · Oct 17, 2023 · 9ab4d5f · 9ab4d5f
1 parent d89ca8c
commit 9ab4d5f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/FirebaseAuth/Sources/Backend/RPC/FIRFinalizePasskeyEnrollmentRequest.m b/FirebaseAuth/Sources/Backend/RPC/FIRFinalizePasskeyEnrollmentRequest.m
@@ -51,19 +51,19 @@
  @var kCredentialIDKey
  @brief The key for registered credential identifier.
  */
-static NSString *const kCredentialIDKey = @"credentialId";
+static NSString *const kCredentialIDKey = @"id";
 
 /**
  @var kAuthAttestationRespKey
  @brief The key for attestation response from a FIDO authenticator.
  */
-static NSString *const kAuthAttestationRespKey = @"authenticatorAttestationResponse";
+static NSString *const kAuthAttestationRespKey = @"response";
 
 /**
  @var kClientDataJsonKey
  @brief The key for CollectedClientData object from the authenticator.
  */
-static NSString *const kClientDataJsonKey = @"clientDataJson";
+static NSString *const kClientDataJsonKey = @"clientDataJSON";
 
 /**
  @var kAttestationObject
@@ -83,6 +83,7 @@ - (nullable instancetype)initWithIDToken:(NSString *)IDToken
             requestConfiguration:requestConfiguration];
   if (self) {
     self.useIdentityPlatform = YES;
+    self.useStaging = NO;
     _IDToken = IDToken;
     _name = name;
     _credentialID = credentialID;

diff --git a/FirebaseAuth/Sources/Backend/RPC/FIRFinalizePasskeySignInRequest.m b/FirebaseAuth/Sources/Backend/RPC/FIRFinalizePasskeySignInRequest.m
@@ -39,19 +39,19 @@
  @var kCredentialIDKey
  @brief The key for registered credential identifier.
  */
-static NSString *const kCredentialIDKey = @"credentialId";
+static NSString *const kCredentialIDKey = @"id";
 
 /**
  @var kAuthAssertionRespKey
  @brief The key for authentication assertion from the authenticator.
  */
-static NSString *const kAuthAssertionRespKey = @"authenticatorAssertionResponse";
+static NSString *const kAuthAssertionRespKey = @"response";
 
 /**
  @var kClientDataJsonKey
  @brief The key for CollectedClientData object from the authenticator.
  */
-static NSString *const kClientDataJsonKey = @"clientDataJson";
+static NSString *const kClientDataJsonKey = @"clientDataJSON";
 
 /**
  @var kAuthenticatorDataKey
@@ -83,6 +83,7 @@ - (nullable instancetype)initWithCredentialID:(NSString *)credentialID
             requestConfiguration:requestConfiguration];
   if (self) {
     self.useIdentityPlatform = YES;
+    self.useStaging = NO;
     _credentialID = credentialID;
     _clientDataJson = clientDataJson;
     _authenticatorData = authenticatorData;

diff --git a/FirebaseAuth/Sources/Backend/RPC/FIRStartPasskeyEnrollmentRequest.m b/FirebaseAuth/Sources/Backend/RPC/FIRStartPasskeyEnrollmentRequest.m
@@ -46,6 +46,7 @@ - (nullable instancetype)initWithIDToken:(NSString *)IDToken
   if (self) {
     _IDToken = IDToken;
     self.useIdentityPlatform = YES;
+    self.useStaging = NO;
   }
 
   return self;

diff --git a/FirebaseAuth/Sources/Backend/RPC/FIRStartPasskeySignInRequest.m b/FirebaseAuth/Sources/Backend/RPC/FIRStartPasskeySignInRequest.m
@@ -39,6 +39,7 @@ - (nullable instancetype)initWithRequestConfiguration:
 
   if (self) {
     self.useIdentityPlatform = YES;
+    self.useStaging = NO;
   }
 
   return self;

diff --git a/FirebaseAuth/Tests/Unit/FIRFinalizePasskeyEnrollmentRequestTests.m b/FirebaseAuth/Tests/Unit/FIRFinalizePasskeyEnrollmentRequestTests.m
@@ -77,7 +77,7 @@
  @var kCredentialIDKey
  @brief credential ID field.
  */
-static NSString *const kCredentialIDKey = @"credentialId";
+static NSString *const kCredentialIDKey = @"id";
 
 /**
  @var kRawAttestationObject
@@ -101,7 +101,7 @@
  @var kRawClientDataJSONKey
  @brief The key for the attestation object from the authenticator.
  */
-static NSString *const kRawClientDataJSONKey = @"clientDataJson";
+static NSString *const kRawClientDataJSONKey = @"clientDataJSON";
 
 /**
  @var kAuthRegistrationRespKey
@@ -113,7 +113,7 @@
  @var kAuthAttestationRespKey
  @brief The key for attestation response from a FIDO authenticator.
  */
-static NSString *const kAuthAttestationRespKey = @"authenticatorAttestationResponse";
+static NSString *const kAuthAttestationRespKey = @"response";
 
 /**
  @class FIRFinalizePasskeyEnrollmentRequestTests

diff --git a/FirebaseAuth/Tests/Unit/FIRFinalizePasskeySignInRequestTests.m b/FirebaseAuth/Tests/Unit/FIRFinalizePasskeySignInRequestTests.m
@@ -53,7 +53,7 @@
  @var kAuthAssertionRespKey
  @brief The key for authentication assertion from the authenticator.
  */
-static NSString *const kAuthAssertionRespKey = @"authenticatorAssertionResponse";
+static NSString *const kAuthAssertionRespKey = @"response";
 
 /**
  @var kCredentialID
@@ -65,7 +65,7 @@
  @var kCredentialIDKey
  @brief credential ID field.
  */
-static NSString *const kCredentialIDKey = @"credentialId";
+static NSString *const kCredentialIDKey = @"id";
 
 /**
  @var kRawClientDataJSON
@@ -77,7 +77,7 @@
  @var kRawClientDataJSONKey
  @brief The key for the attestation object from the authenticator.
  */
-static NSString *const kRawClientDataJSONKey = @"clientDataJson";
+static NSString *const kRawClientDataJSONKey = @"clientDataJSON";
 
 /**
  @var kAuthenticatorData