Remove unused mfa request field "mfa_provider" (#5397)

renkelvin · ryanwilson · commit 4b4bb5ae014d · 2020-04-24T14:56:35.000-04:00
diff --git a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m
@@ -450,7 +450,6 @@ - (void)verifyClientAndSendVerificationCodeToPhoneNumber:(NSString *)phoneNumber
                         }
 
                         NSString *IDToken = session.IDToken;
-                        NSString *multiFactorProvider = FIRPhoneMultiFactorID;
                         FIRAuthProtoStartMFAPhoneRequestInfo *startMFARequestInfo =
                             [[FIRAuthProtoStartMFAPhoneRequestInfo alloc]
                                 initWithPhoneNumber:phoneNumber
@@ -460,7 +459,6 @@ - (void)verifyClientAndSendVerificationCodeToPhoneNumber:(NSString *)phoneNumber
                           FIRStartMFAEnrollmentRequest *request =
                               [[FIRStartMFAEnrollmentRequest alloc]
                                        initWithIDToken:IDToken
-                                   multiFactorProvider:multiFactorProvider
                                         enrollmentInfo:startMFARequestInfo
                                   requestConfiguration:self->_auth.requestConfiguration];
                           [FIRAuthBackend
@@ -512,11 +510,10 @@ - (void)verifyClientAndSendVerificationCodeToPhoneNumber:(NSString *)phoneNumber
                                                 }];
                         } else {
                           FIRStartMFASignInRequest *request = [[FIRStartMFASignInRequest alloc]
-                               initWithMFAProvider:multiFactorProvider
-                              MFAPendingCredential:session.MFAPendingCredential
-                                   MFAEnrollmentID:session.multiFactorInfo.UID
-                                        signInInfo:startMFARequestInfo
-                              requestConfiguration:self->_auth.requestConfiguration];
+                              initWithMFAPendingCredential:session.MFAPendingCredential
+                                           MFAEnrollmentID:session.multiFactorInfo.UID
+                                                signInInfo:startMFARequestInfo
+                                      requestConfiguration:self->_auth.requestConfiguration];
                           [FIRAuthBackend
                               startMultiFactorSignIn:request
                                             callback:^(
diff --git a/FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentRequest.h b/FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentRequest.h
@@ -24,15 +24,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property(nonatomic, copy, readonly, nullable) NSString *IDToken;
 
-@property(nonatomic, copy, readonly, nullable) NSString *MFAProvider;
-
 @property(nonatomic, copy, readonly, nullable) NSString *displayName;
 
 @property(nonatomic, copy, readonly, nullable)
     FIRAuthProtoFinalizeMFAPhoneRequestInfo *verificationInfo;
 
 - (nullable instancetype)initWithIDToken:(NSString *)IDToken
-                             MFAProvider:(NSString *)MFAProvider
                              displayName:(NSString *)displayName
                         verificationInfo:(FIRAuthProtoFinalizeMFAPhoneRequestInfo *)verificationInfo
                     requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration;
diff --git a/FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentRequest.m b/FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentRequest.m
@@ -21,7 +21,6 @@
 @implementation FIRFinalizeMFAEnrollmentRequest
 
 - (nullable instancetype)initWithIDToken:(NSString *)IDToken
-                             MFAProvider:(NSString *)MFAProvider
                              displayName:(NSString *)displayName
                         verificationInfo:(FIRAuthProtoFinalizeMFAPhoneRequestInfo *)verificationInfo
                     requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
@@ -31,7 +30,6 @@ - (nullable instancetype)initWithIDToken:(NSString *)IDToken
                       useStaging:NO];
   if (self) {
     _IDToken = IDToken;
-    _MFAProvider = MFAProvider;
     _displayName = displayName;
     _verificationInfo = verificationInfo;
   }
@@ -43,9 +41,6 @@ - (nullable id)unencodedHTTPRequestBodyWithError:(NSError *__autoreleasing _Null
   if (_IDToken) {
     postBody[@"idToken"] = _IDToken;
   }
-  if (_MFAProvider) {
-    postBody[@"mfaProvider"] = _MFAProvider;
-  }
   if (_displayName) {
     postBody[@"displayName"] = _displayName;
   }
diff --git a/FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentRequest.h b/FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentRequest.h
@@ -24,12 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property(nonatomic, copy, readonly, nullable) NSString *IDToken;
 
-@property(nonatomic, copy, readonly, nullable) NSString *multiFactorProvider;
-
 @property(nonatomic, copy, readonly, nullable) FIRAuthProtoStartMFAPhoneRequestInfo *enrollmentInfo;
 
 - (nullable instancetype)initWithIDToken:(NSString *)IDToken
-                     multiFactorProvider:(NSString *)multiFactorProvider
                           enrollmentInfo:(FIRAuthProtoStartMFAPhoneRequestInfo *)enrollmentInfo
                     requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration;
 
diff --git a/FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentRequest.m b/FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentRequest.m
@@ -23,7 +23,6 @@
 @implementation FIRStartMFAEnrollmentRequest
 
 - (nullable instancetype)initWithIDToken:(NSString *)IDToken
-                     multiFactorProvider:(NSString *)multiFactorProvider
                           enrollmentInfo:(FIRAuthProtoStartMFAPhoneRequestInfo *)enrollmentInfo
                     requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
   self = [super initWithEndpoint:kStartMFAEnrollmentEndPoint
@@ -32,7 +31,6 @@ - (nullable instancetype)initWithIDToken:(NSString *)IDToken
                       useStaging:NO];
   if (self) {
     _IDToken = IDToken;
-    _multiFactorProvider = multiFactorProvider;
     _enrollmentInfo = enrollmentInfo;
   }
   return self;
@@ -43,9 +41,6 @@ - (nullable id)unencodedHTTPRequestBodyWithError:(NSError *__autoreleasing _Null
   if (_IDToken) {
     postBody[@"idToken"] = _IDToken;
   }
-  if (_multiFactorProvider) {
-    postBody[@"mfaProvider"] = _multiFactorProvider;
-  }
   if (_enrollmentInfo) {
     if ([_enrollmentInfo isKindOfClass:[FIRAuthProtoStartMFAPhoneRequestInfo class]]) {
       postBody[@"phoneEnrollmentInfo"] = [_enrollmentInfo dictionary];
diff --git a/FirebaseAuth/Sources/Backend/RPC/MultiFactor/SignIn/FIRFinalizeMFASignInRequest.h b/FirebaseAuth/Sources/Backend/RPC/MultiFactor/SignIn/FIRFinalizeMFASignInRequest.h
@@ -22,18 +22,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FIRFinalizeMFASignInRequest : FIRIdentityToolkitRequest <FIRAuthRPCRequest>
 
-@property(nonatomic, copy, readonly, nullable) NSString *MFAProvider;
-
 @property(nonatomic, copy, readonly, nullable) NSString *MFAPendingCredential;
 
 @property(nonatomic, copy, readonly, nullable)
     FIRAuthProtoFinalizeMFAPhoneRequestInfo *verificationInfo;
 
-- (nullable instancetype)initWithMFAProvider:(NSString *)MFAProvider
-                        MFAPendingCredential:(NSString *)MFAPendingCredential
-                            verificationInfo:
-                                (FIRAuthProtoFinalizeMFAPhoneRequestInfo *)verificationInfo
-                        requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration;
+- (nullable instancetype)
+    initWithMFAPendingCredential:(NSString *)MFAPendingCredential
+                verificationInfo:(FIRAuthProtoFinalizeMFAPhoneRequestInfo *)verificationInfo
+            requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration;
 
 @end
 
diff --git a/FirebaseAuth/Sources/Backend/RPC/MultiFactor/SignIn/FIRFinalizeMFASignInRequest.m b/FirebaseAuth/Sources/Backend/RPC/MultiFactor/SignIn/FIRFinalizeMFASignInRequest.m
@@ -20,17 +20,15 @@
 
 @implementation FIRFinalizeMFASignInRequest
 
-- (nullable instancetype)initWithMFAProvider:(NSString *)MFAProvider
-                        MFAPendingCredential:(NSString *)MFAPendingCredential
-                            verificationInfo:
-                                (FIRAuthProtoFinalizeMFAPhoneRequestInfo *)verificationInfo
-                        requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
+- (nullable instancetype)
+    initWithMFAPendingCredential:(NSString *)MFAPendingCredential
+                verificationInfo:(FIRAuthProtoFinalizeMFAPhoneRequestInfo *)verificationInfo
+            requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
   self = [super initWithEndpoint:kFinalizeMFASignInEndPoint
             requestConfiguration:requestConfiguration
              useIdentityPlatform:YES
                       useStaging:NO];
   if (self) {
-    _MFAProvider = MFAProvider;
     _MFAPendingCredential = MFAPendingCredential;
     _verificationInfo = verificationInfo;
   }
@@ -39,9 +37,6 @@ - (nullable instancetype)initWithMFAProvider:(NSString *)MFAProvider
 
 - (nullable id)unencodedHTTPRequestBodyWithError:(NSError *__autoreleasing _Nullable *)error {
   NSMutableDictionary *postBody = [NSMutableDictionary dictionary];
-  if (_MFAProvider) {
-    postBody[@"mfaProvider"] = _MFAProvider;
-  }
   if (_MFAPendingCredential) {
     postBody[@"mfaPendingCredential"] = _MFAPendingCredential;
   }
diff --git a/FirebaseAuth/Sources/Backend/RPC/MultiFactor/SignIn/FIRStartMFASignInRequest.h b/FirebaseAuth/Sources/Backend/RPC/MultiFactor/SignIn/FIRStartMFASignInRequest.h
@@ -22,19 +22,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FIRStartMFASignInRequest : FIRIdentityToolkitRequest <FIRAuthRPCRequest>
 
-@property(nonatomic, copy, readonly, nullable) NSString *MFAProvider;
-
 @property(nonatomic, copy, readonly, nullable) NSString *MFAPendingCredential;
 
 @property(nonatomic, copy, readonly, nullable) NSString *MFAEnrollmentID;
 
 @property(nonatomic, copy, readonly, nullable) FIRAuthProtoStartMFAPhoneRequestInfo *signInInfo;
 
-- (nullable instancetype)initWithMFAProvider:(NSString *)MFAProvider
-                        MFAPendingCredential:(NSString *)MFAPendingCredential
-                             MFAEnrollmentID:(NSString *)MFAEnrollmentID
-                                  signInInfo:(FIRAuthProtoStartMFAPhoneRequestInfo *)signInInfo
-                        requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration;
+- (nullable instancetype)
+    initWithMFAPendingCredential:(NSString *)MFAPendingCredential
+                 MFAEnrollmentID:(NSString *)MFAEnrollmentID
+                      signInInfo:(FIRAuthProtoStartMFAPhoneRequestInfo *)signInInfo
+            requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration;
 
 @end
 
diff --git a/FirebaseAuth/Sources/Backend/RPC/MultiFactor/SignIn/FIRStartMFASignInRequest.m b/FirebaseAuth/Sources/Backend/RPC/MultiFactor/SignIn/FIRStartMFASignInRequest.m
@@ -20,17 +20,16 @@
 
 @implementation FIRStartMFASignInRequest
 
-- (nullable instancetype)initWithMFAProvider:(NSString *)MFAProvider
-                        MFAPendingCredential:(NSString *)MFAPendingCredential
-                             MFAEnrollmentID:(NSString *)MFAEnrollmentID
-                                  signInInfo:(FIRAuthProtoStartMFAPhoneRequestInfo *)signInInfo
-                        requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
+- (nullable instancetype)
+    initWithMFAPendingCredential:(NSString *)MFAPendingCredential
+                 MFAEnrollmentID:(NSString *)MFAEnrollmentID
+                      signInInfo:(FIRAuthProtoStartMFAPhoneRequestInfo *)signInInfo
+            requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
   self = [super initWithEndpoint:kStartMFASignInEndPoint
             requestConfiguration:requestConfiguration
              useIdentityPlatform:YES
                       useStaging:NO];
   if (self) {
-    _MFAProvider = MFAProvider;
     _MFAPendingCredential = MFAPendingCredential;
     _MFAEnrollmentID = MFAEnrollmentID;
     _signInInfo = signInInfo;
@@ -40,9 +39,6 @@ - (nullable instancetype)initWithMFAProvider:(NSString *)MFAProvider
 
 - (nullable id)unencodedHTTPRequestBodyWithError:(NSError *__autoreleasing _Nullable *)error {
   NSMutableDictionary *postBody = [NSMutableDictionary dictionary];
-  if (_MFAProvider) {
-    postBody[@"mfaProvider"] = _MFAProvider;
-  }
   if (_MFAPendingCredential) {
     postBody[@"mfaPendingCredential"] = _MFAPendingCredential;
   }
diff --git a/FirebaseAuth/Sources/MultiFactor/FIRMultiFactor.m b/FirebaseAuth/Sources/MultiFactor/FIRMultiFactor.m
@@ -60,7 +60,6 @@ - (void)enrollWithAssertion:(FIRMultiFactorAssertion *)assertion
              verificationCode:phoneAssertion.authCredential.verificationCode];
   FIRFinalizeMFAEnrollmentRequest *request =
       [[FIRFinalizeMFAEnrollmentRequest alloc] initWithIDToken:self.user.rawAccessToken
-                                                   MFAProvider:phoneAssertion.factorID
                                                    displayName:displayName
                                               verificationInfo:finalizeMFAPhoneRequestInfo
                                           requestConfiguration:self.user.requestConfiguration];
diff --git a/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorResolver.m b/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorResolver.m
@@ -59,11 +59,10 @@ - (void)resolveSignInWithAssertion:(nonnull FIRMultiFactorAssertion *)assertion
       [[FIRAuthProtoFinalizeMFAPhoneRequestInfo alloc]
           initWithSessionInfo:phoneAssertion.authCredential.verificationID
              verificationCode:phoneAssertion.authCredential.verificationCode];
-  FIRFinalizeMFASignInRequest *request =
-      [[FIRFinalizeMFASignInRequest alloc] initWithMFAProvider:phoneAssertion.factorID
-                                          MFAPendingCredential:self.MFAPendingCredential
-                                              verificationInfo:finalizeMFAPhoneRequestInfo
-                                          requestConfiguration:self.auth.requestConfiguration];
+  FIRFinalizeMFASignInRequest *request = [[FIRFinalizeMFASignInRequest alloc]
+      initWithMFAPendingCredential:self.MFAPendingCredential
+                  verificationInfo:finalizeMFAPhoneRequestInfo
+              requestConfiguration:self.auth.requestConfiguration];
   [FIRAuthBackend
       finalizeMultiFactorSignIn:request
                        callback:^(FIRFinalizeMFASignInResponse *_Nullable response,
