adding network error check before fallback

AzureAD · Oct 3, 2024 · f526a38 · f526a38
1 parent 5a86414
commit f526a38
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/IdentityCore/src/controllers/MSIDSilentController.m b/IdentityCore/src/controllers/MSIDSilentController.m
@@ -29,6 +29,7 @@
 #import "MSIDTelemetryEventStrings.h"
 #import "MSIDTokenResult.h"
 #import "MSIDAccount.h"
+#import "MSIDAADRequestErrorHandler.h"
 #if TARGET_OS_IPHONE
 #import "MSIDBackgroundTaskManager.h"
 #endif
@@ -88,7 +89,7 @@ - (void)acquireToken:(nonnull MSIDRequestCompletionBlock)completionBlock
     MSIDRequestCompletionBlock completionBlockWrapper = ^(MSIDTokenResult * _Nullable result, NSError * _Nullable error)
     {
 #if TARGET_OS_IPHONE
-    [[MSIDBackgroundTaskManager sharedInstance] stopOperationWithType:MSIDBackgroundTaskTypeSilentRequest];
+        [[MSIDBackgroundTaskManager sharedInstance] stopOperationWithType:MSIDBackgroundTaskTypeSilentRequest];
 #endif
         MSID_LOG_WITH_CTX(MSIDLogLevelInfo, self.requestParameters, @"Silent flow finished. Result %@, error: %ld error domain: %@", _PII_NULLIFY(result), (long)error.code, error.domain);
         completionBlock(result, error);
@@ -114,7 +115,12 @@ - (void)acquireTokenWithRequest:(MSIDSilentTokenRequest *)request
     CONDITIONAL_START_EVENT(CONDITIONAL_SHARED_INSTANCE, self.requestParameters.telemetryRequestId, MSID_TELEMETRY_EVENT_API_EVENT);
     self.currentRequest = request;
     [request executeRequestWithCompletion:^(MSIDTokenResult *result, NSError *error)
-    {
+     {
+        MSIDAADRequestErrorHandler *handler = [[MSIDAADRequestErrorHandler alloc] init];
+        if (error && [handler shouldRetryNetworkingFailure:error.code]) {
+            completionBlock(result, error);
+        }
+
         if (result || !self.fallbackController)
         {
 #if !EXCLUDE_FROM_MSALCPP
@@ -123,7 +129,7 @@ - (void)acquireTokenWithRequest:(MSIDSilentTokenRequest *)request
             [telemetryEvent setIsExtendedLifeTimeToken:result.extendedLifeTimeToken ? MSID_TELEMETRY_VALUE_YES : MSID_TELEMETRY_VALUE_NO];
             if (self.isLocalFallbackMode)
             {
-                 [telemetryEvent setSsoExtFallBackFlow:1];
+                [telemetryEvent setSsoExtFallBackFlow:1];
             }
 
             [self stopTelemetryEvent:telemetryEvent error:error];

diff --git a/IdentityCore/src/network/error_handler/MSIDAADRequestErrorHandler.h b/IdentityCore/src/network/error_handler/MSIDAADRequestErrorHandler.h
@@ -26,4 +26,6 @@
 
 @interface MSIDAADRequestErrorHandler : NSObject <MSIDHttpRequestErrorHandling>
 
+- (BOOL)shouldRetryNetworkingFailure:(NSInteger)errorCode;
+
 @end