|
128 | 128 | */
|
129 | 129 | static NSString *const kErrorMessageKey = @"message";
|
130 | 130 |
|
| 131 | +/** @var kReturnIDPCredentialErrorMessageKey |
| 132 | + @brief The key for "errorMessage" value in JSON responses from the server, In case |
| 133 | + returnIDPCredential of a verifyAssertion request is set to @YES. |
| 134 | + */ |
| 135 | +static NSString *const kReturnIDPCredentialErrorMessageKey = @"errorMessage"; |
| 136 | + |
131 | 137 | /** @var kUserNotFoundErrorMessage
|
132 | 138 | @brief This is the error message returned when the user is not found, which means the user
|
133 | 139 | account has been deleted given the token was once valid.
|
@@ -925,18 +931,15 @@ - (void)postWithRequest:(id<FIRAuthRPCRequest>)request
|
925 | 931 | if ([request isKindOfClass:[FIRVerifyAssertionRequest class]]) {
|
926 | 932 | FIRVerifyAssertionRequest *verifyAssertionRequest = (FIRVerifyAssertionRequest *)request;
|
927 | 933 | if (verifyAssertionRequest.returnIDPCredential) {
|
928 |
| - NSDictionary *errorDictionary = dictionary[kErrorKey]; |
929 |
| - if ([errorDictionary isKindOfClass:[NSDictionary class]]) { |
930 |
| - id<NSObject> errorMessage = errorDictionary[kErrorMessageKey]; |
931 |
| - if ([errorMessage isKindOfClass:[NSString class]]) { |
932 |
| - NSString *errorString = (NSString *)errorMessage; |
933 |
| - NSError *clientError = [[self class] clientErrorWithServerErrorMessage:errorString |
934 |
| - errorDictionary:errorDictionary |
935 |
| - response:response]; |
936 |
| - if (clientError) { |
937 |
| - callback(clientError); |
938 |
| - return; |
939 |
| - } |
| 934 | + NSString *errorMessage = dictionary[kReturnIDPCredentialErrorMessageKey]; |
| 935 | + if ([errorMessage isKindOfClass:[NSString class]]) { |
| 936 | + NSString *errorString = (NSString *)errorMessage; |
| 937 | + NSError *clientError = [[self class] clientErrorWithServerErrorMessage:errorString |
| 938 | + errorDictionary:@{} |
| 939 | + response:response]; |
| 940 | + if (clientError) { |
| 941 | + callback(clientError); |
| 942 | + return; |
940 | 943 | }
|
941 | 944 | }
|
942 | 945 | }
|
|
0 commit comments