Merge pull request #963 from AzureAD/release/1.1.5

oldalton · web-flow · commit a48c7809f703 · 2020-06-19T17:52:34.000-07:00
Release MSAL 1.1.5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [1.1.5] - 2020-06-19
+
+### Added
+* Switch to PkeyAuth on macOS (common library #734)
+* Support returning additional WPJ info (#931)
+
+### Fixed
+* Fixed PkeyAuth when ADFS challenge is URL encoded (common library #750)
+* Fixed CBA handling in MSAL (common library #751)
+* Fixed failing unit tests on 10.15 (#760)
+* Include correlationID in error response (#908)
+
+
 ## [1.1.4] - 2020-06-05
 
 ### Fixed
diff --git a/MSAL.podspec b/MSAL.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "1.1.4"
+  s.version      = "1.1.5"
   s.summary      = "Microsoft Authentication Library (MSAL) Preview for iOS"
 
   s.description  = <<-DESC
diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore
@@ -1 +1 @@
-Subproject commit 44b985c9b2df7d3a7b1dd225b0c3f7d4e6d1dbc0
+Subproject commit 3f941bba573106627a93e16aca6c46938bbb3683
diff --git a/MSAL/resources/ios/Info.plist b/MSAL/resources/ios/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.4</string>
+	<string>1.1.5</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/MSAL/resources/mac/Info.plist b/MSAL/resources/mac/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.4</string>
+	<string>1.1.5</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MSAL/src/MSALDeviceInformation+Internal.h b/MSAL/src/MSALDeviceInformation+Internal.h
@@ -33,6 +33,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithMSIDDeviceInfo:(MSIDDeviceInfo *)deviceInfo;
 
+- (void)addRegisteredDeviceMetadataInformation:(NSDictionary *)deviceInfoMetadata;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/MSAL/src/MSALDeviceInformation.m b/MSAL/src/MSALDeviceInformation.m
@@ -38,14 +38,27 @@ @implementation MSALDeviceInformation
     NSMutableDictionary *_extraDeviceInformation;
 }
 
+- (instancetype)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        _deviceMode = MSALDeviceModeDefault;
+        _extraDeviceInformation = [NSMutableDictionary new];
+    }
+
+    return self;
+}
+
 - (instancetype)initWithMSIDDeviceInfo:(MSIDDeviceInfo *)deviceInfo
 {
     self = [super init];
-    
+
     if (self)
     {
         _deviceMode = [self msalDeviceModeFromMSIDMode:deviceInfo.deviceMode];
-        
+
         if (@available(iOS 13.0, macOS 10.15, *))
         {
             _hasAADSSOExtension = [[ASAuthorizationSingleSignOnProvider msidSharedProvider] canPerformAuthorization];
@@ -54,11 +67,11 @@ - (instancetype)initWithMSIDDeviceInfo:(MSIDDeviceInfo *)deviceInfo
         {
             _hasAADSSOExtension = NO;
         }
-        
+
         _extraDeviceInformation = [NSMutableDictionary new];
         [self initExtraDeviceInformation:deviceInfo];
     }
-    
+
     return self;
 }
 
@@ -95,6 +108,11 @@ - (void) initExtraDeviceInformation:(MSIDDeviceInfo *)deviceInfo
     [_extraDeviceInformation setValue:deviceInfo.ssoExtensionMode == MSIDSSOExtensionModeFull ? @"Yes" : @"No" forKey:MSAL_DEVICE_INFORMATION_SSO_EXTENSION_FULL_MODE_KEY];
 }
 
+- (void) addRegisteredDeviceMetadataInformation:(NSDictionary *)deviceInfoMetadata
+{
+    [_extraDeviceInformation addEntriesFromDictionary:deviceInfoMetadata];
+}
+
 - (NSString *)description
 {
     return [NSString stringWithFormat:@"Device mode %@", self.msalDeviceModeString];
diff --git a/MSAL/src/MSALErrorConverter.h b/MSAL/src/MSALErrorConverter.h
@@ -33,5 +33,5 @@
 
 + (NSError *)msalErrorFromMsidError:(NSError *)msidError;
 + (NSError *)msalErrorFromMsidError:(NSError *)msidError classifyErrors:(BOOL)shouldClassifyErrors msalOauth2Provider:(MSALOauth2Provider *)oauth2Provider;
-
++ (NSError *)msalErrorFromMsidError:(NSError *)msidError classifyErrors:(BOOL)shouldClassifyErrors msalOauth2Provider:(MSALOauth2Provider *)oauth2Provider correlationId:(NSUUID *)correlationId;
 @end
diff --git a/MSAL/src/MSALErrorConverter.m b/MSAL/src/MSALErrorConverter.m
@@ -135,14 +135,25 @@ + (NSError *)msalErrorFromMsidError:(NSError *)msidError
 + (NSError *)msalErrorFromMsidError:(NSError *)msidError
                      classifyErrors:(BOOL)shouldClassifyErrors
                  msalOauth2Provider:(MSALOauth2Provider *)oauth2Provider
+{
+    return [self msalErrorFromMsidError:msidError
+                         classifyErrors:shouldClassifyErrors
+                     msalOauth2Provider:oauth2Provider
+                          correlationId:nil];
+}
+
++ (NSError *)msalErrorFromMsidError:(NSError *)msidError
+                     classifyErrors:(BOOL)shouldClassifyErrors
+                 msalOauth2Provider:(MSALOauth2Provider *)oauth2Provider
+                            correlationId:(NSUUID *)correlationId
 {
     return [self errorWithDomain:msidError.domain
                             code:msidError.code
                 errorDescription:msidError.userInfo[MSIDErrorDescriptionKey]
                       oauthError:msidError.userInfo[MSIDOAuthErrorKey]
                         subError:msidError.userInfo[MSIDOAuthSubErrorKey]
                  underlyingError:msidError.userInfo[NSUnderlyingErrorKey]
-                   correlationId:msidError.userInfo[MSIDCorrelationIdKey]
+                   correlationId:msidError.userInfo[MSIDCorrelationIdKey] ? : correlationId.UUIDString
                         userInfo:msidError.userInfo
                   classifyErrors:shouldClassifyErrors
               msalOauth2Provider:oauth2Provider];
@@ -154,7 +165,7 @@ + (NSError *)errorWithDomain:(NSString *)domain
                   oauthError:(NSString *)oauthError
                     subError:(NSString *)subError
              underlyingError:(NSError *)underlyingError
-               correlationId:(__unused NSUUID *)correlationId
+               correlationId:(NSString *)correlationId
                     userInfo:(NSDictionary *)userInfo
               classifyErrors:(BOOL)shouldClassifyErrors
           msalOauth2Provider:(MSALOauth2Provider *)oauth2Provider
@@ -201,6 +212,7 @@ + (NSError *)errorWithDomain:(NSString *)domain
         msalUserInfo[mappedKey] = userInfo[key];
     }
 
+    if (!msalUserInfo[MSALCorrelationIDKey] && correlationId) msalUserInfo[MSALCorrelationIDKey] = correlationId;
     if (errorDescription) msalUserInfo[MSALErrorDescriptionKey] = errorDescription;
     if (oauthError) msalUserInfo[MSALOAuthErrorKey] = oauthError;
     if (subError) msalUserInfo[MSALOAuthSubErrorKey] = subError;
diff --git a/MSAL/src/MSALPublicClientApplication.m b/MSAL/src/MSALPublicClientApplication.m
@@ -128,7 +128,7 @@ + (void)load
     MSIDNotifications.webAuthDidFinishLoadNotificationName = MSALWebAuthDidFinishLoadNotification;
     MSIDNotifications.webAuthWillSwitchToBrokerAppNotificationName = MSALWebAuthWillSwitchToBrokerApp;
     MSIDNotifications.webAuthDidReceiveResponseFromBrokerNotificationName = MSALWebAuthDidReceiveResponseFromBroker;
-    #if TARGET_OS_IPHONE
+    #if TARGET_OS_IPHONE && !AD_BROKER
         [MSIDCertAuthHandler setUseAuthSession:YES];
     #endif
 }
@@ -716,7 +716,7 @@ - (void)acquireTokenSilentWithParameters:(MSALSilentTokenParameters *)parameters
 {
     __auto_type block = ^(MSALResult *result, NSError *msidError, id<MSIDRequestContext> context)
     {
-        NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider];
+        NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider correlationId:context.correlationId];
         [MSALPublicClientApplication logOperation:@"acquireTokenSilent" result:result error:msalError context:context];
         
         if (!completionBlock) return;
@@ -1014,7 +1014,7 @@ - (void)acquireTokenWithParameters:(MSALInteractiveTokenParameters *)parameters
 {
     __auto_type block = ^(MSALResult *result, NSError *msidError, id<MSIDRequestContext> context)
     {
-        NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider];
+        NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider correlationId:context.correlationId];
         [MSALPublicClientApplication logOperation:@"acquireToken" result:result error:msalError context:context];
         
         if (!completionBlock) return;
@@ -1260,7 +1260,7 @@ - (void)signoutWithAccount:(nonnull MSALAccount *)account
 {
     __auto_type block = ^(BOOL result, NSError *msidError, id<MSIDRequestContext> context)
     {
-        NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider];
+        NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider correlationId:context.correlationId];
         
         if (!result)
         {
diff --git a/MSAL/src/MSAL_Internal.h b/MSAL/src/MSAL_Internal.h
@@ -27,7 +27,7 @@
 
 #define MSAL_VER_HIGH       1
 #define MSAL_VER_LOW        1
-#define MSAL_VER_PATCH      4
+#define MSAL_VER_PATCH      5
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
diff --git a/MSAL/src/instance/MSALDeviceInfoProvider.h b/MSAL/src/instance/MSALDeviceInfoProvider.h
@@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface MSALDeviceInfoProvider : MSALSSOExtensionRequestHandler
 
 - (void)deviceInfoWithRequestParameters:(MSIDRequestParameters *)requestParameters
-                        completionBlock:(MSALDeviceInformationCompletionBlock)completionBlock API_AVAILABLE(ios(13.0), macos(10.15));
+                        completionBlock:(MSALDeviceInformationCompletionBlock)completionBlock;
 
 @end
 
diff --git a/MSAL/src/instance/MSALDeviceInfoProvider.m b/MSAL/src/instance/MSALDeviceInfoProvider.m
@@ -32,59 +32,83 @@
 #import "MSIDRequestParameters+Broker.h"
 #import "MSALDeviceInformation+Internal.h"
 
+#import "MSIDWorkPlaceJoinConstants.h"
+#import "MSIDWorkPlaceJoinUtil.h"
+#import "MSIDRegistrationInformation.h"
+
 @implementation MSALDeviceInfoProvider
 
 - (void)deviceInfoWithRequestParameters:(MSIDRequestParameters *)requestParameters
-                        completionBlock:(MSALDeviceInformationCompletionBlock)completionBlock API_AVAILABLE(ios(13.0), macos(10.15))
+                        completionBlock:(MSALDeviceInformationCompletionBlock)completionBlock
 {
     if (![requestParameters shouldUseBroker])
     {
         NSError *error = MSIDCreateError(MSIDErrorDomain, MSIDErrorBrokerNotAvailable, @"Broker is not enabled for this operation. Please make sure you have enabled broker support for your application", nil, nil, nil, nil, nil, YES);
         completionBlock(nil, error);
         return;
     }
-    
-    
-    if (![MSIDSSOExtensionGetDeviceInfoRequest canPerformRequest])
+
+    BOOL canCallSSOExtension = NO;
+    if (@available(iOS 13.0, macOS 10.15, *))
+    {
+        canCallSSOExtension = [MSIDSSOExtensionGetDeviceInfoRequest canPerformRequest];
+    }
+
+    if (!canCallSSOExtension)
     {
         MSID_LOG_WITH_CTX(MSIDLogLevelInfo, requestParameters, @"Broker is not present on this device. Defaulting to personal mode");
-        
+
         MSALDeviceInformation *msalDeviceInfo = [MSALDeviceInformation new];
         msalDeviceInfo.deviceMode = MSALDeviceModeDefault;
+        NSDictionary *deviceRegMetadataInfo = [MSIDWorkPlaceJoinUtil getRegisteredDeviceMetadataInformation:nil];
+        if (deviceRegMetadataInfo)
+        {
+            [msalDeviceInfo addRegisteredDeviceMetadataInformation:deviceRegMetadataInfo];
+        }
         completionBlock(msalDeviceInfo, nil);
         return;
     }
     
-    NSError *requestError;
-    MSIDSSOExtensionGetDeviceInfoRequest *ssoExtensionRequest = [[MSIDSSOExtensionGetDeviceInfoRequest alloc] initWithRequestParameters:requestParameters
-                                                                                                                                  error:&requestError];
-    
-    if (!ssoExtensionRequest)
-    {
-        completionBlock(nil, requestError);
-        return;
-    }
-    
-    if (![self setCurrentSSOExtensionRequest:ssoExtensionRequest])
-    {
-        NSError *error = MSIDCreateError(MSIDErrorDomain, MSIDErrorInternal, @"Trying to start a get accounts request while one is already executing", nil, nil, nil, nil, nil, YES);
-        completionBlock(nil, error);
-        return;
-    }
-    
-    [ssoExtensionRequest executeRequestWithCompletion:^(MSIDDeviceInfo * _Nullable deviceInfo, NSError * _Nullable error)
+    if (@available(iOS 13.0, macOS 10.15, *))
     {
-        [self copyAndClearCurrentSSOExtensionRequest];
-        
-        if (!deviceInfo)
+        // We are here means canCallSSOExtension is TRUE
+        NSError *requestError;
+        MSIDSSOExtensionGetDeviceInfoRequest *ssoExtensionRequest = [[MSIDSSOExtensionGetDeviceInfoRequest alloc] initWithRequestParameters:requestParameters
+                                                                                                                                      error:&requestError];
+
+        if (!ssoExtensionRequest)
+        {
+            completionBlock(nil, requestError);
+            return;
+        }
+
+        if (![self setCurrentSSOExtensionRequest:ssoExtensionRequest])
         {
+            NSError *error = MSIDCreateError(MSIDErrorDomain, MSIDErrorInternal, @"Trying to start a get accounts request while one is already executing", nil, nil, nil, nil, nil, YES);
             completionBlock(nil, error);
             return;
         }
-        
-        MSALDeviceInformation *msalDeviceInfo = [[MSALDeviceInformation alloc] initWithMSIDDeviceInfo:deviceInfo];
-        completionBlock(msalDeviceInfo, nil);
-    }];
+
+        [ssoExtensionRequest executeRequestWithCompletion:^(MSIDDeviceInfo * _Nullable deviceInfo, NSError * _Nullable error)
+        {
+            [self copyAndClearCurrentSSOExtensionRequest];
+
+            if (!deviceInfo)
+            {
+                completionBlock(nil, error);
+                return;
+            }
+
+            MSALDeviceInformation *msalDeviceInfo = [[MSALDeviceInformation alloc] initWithMSIDDeviceInfo:deviceInfo];
+            NSDictionary *deviceRegMetadataInfo = [MSIDWorkPlaceJoinUtil getRegisteredDeviceMetadataInformation:nil];
+            if (deviceRegMetadataInfo)
+            {
+                [msalDeviceInfo addRegisteredDeviceMetadataInformation:deviceRegMetadataInfo];
+            }
+            completionBlock(msalDeviceInfo, nil);
+            return;
+        }];
+    }
 }
 
 @end
diff --git a/MSAL/src/public/MSALPublicClientApplication.h b/MSAL/src/public/MSALPublicClientApplication.h
@@ -465,6 +465,6 @@
    Reads device information from the authentication broker if present on the device. 
 */
 - (void)getDeviceInformationWithParameters:(nullable MSALParameters *)parameters
-                           completionBlock:(nonnull MSALDeviceInformationCompletionBlock)completionBlock API_AVAILABLE(ios(13.0), macos(10.15));
+                           completionBlock:(nonnull MSALDeviceInformationCompletionBlock)completionBlock;
 
 @end
diff --git a/MSAL/test/app/MSALStressTestHelper.m b/MSAL/test/app/MSALStressTestHelper.m
@@ -88,15 +88,15 @@ + (void)testAcquireTokenSilentWithExpiringTokenImpl:(BOOL)expireToken
             dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
 
             dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-
-                MSALAccount *account = accounts[userIndex];
-                account = [application accountForIdentifier:account.identifier error:nil];
                 
                 if (multipleUsers)
                 {
                     userIndex = ++userIndex >= [accounts count] ? 0 : userIndex;
                 }
                 
+                MSALAccount *account = accounts[userIndex];
+                account = [application accountForIdentifier:account.identifier error:nil];
+
                 __auto_type scopes = [[MSALTestAppSettings settings].scopes allObjects];
                 MSALSilentTokenParameters *parameters = [[MSALSilentTokenParameters alloc] initWithScopes:scopes account:account];
                 
diff --git a/MSAL/test/unit/MSALDeviceInfoProviderTests.m b/MSAL/test/unit/MSALDeviceInfoProviderTests.m
diff --git a/MSAL/test/unit/MSALErrorConverterTests.m b/MSAL/test/unit/MSALErrorConverterTests.m

Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,27 @@ @implementation MSALDeviceInformation`
`38`	`38`	`NSMutableDictionary *_extraDeviceInformation;`
`39`	`39`	`}`
`40`	`40`
	`41`	`+- (instancetype)init`
	`42`	`+{`
	`43`	`+ self = [super init];`
	`44`	`+`
	`45`	`+ if (self)`
	`46`	`+ {`
	`47`	`+ _deviceMode = MSALDeviceModeDefault;`
	`48`	`+ _extraDeviceInformation = [NSMutableDictionary new];`
	`49`	`+ }`
	`50`	`+`
	`51`	`+ return self;`
	`52`	`+}`
	`53`	`+`
`41`	`54`	`- (instancetype)initWithMSIDDeviceInfo:(MSIDDeviceInfo *)deviceInfo`
`42`	`55`	`{`
`43`	`56`	`self = [super init];`
`44`		`-`
	`57`	`+`
`45`	`58`	`if (self)`
`46`	`59`	`{`
`47`	`60`	`_deviceMode = [self msalDeviceModeFromMSIDMode:deviceInfo.deviceMode];`
`48`		`-`
	`61`	`+`
`49`	`62`	`if (@available(iOS 13.0, macOS 10.15, *))`
`50`	`63`	`{`
`51`	`64`	`_hasAADSSOExtension = [[ASAuthorizationSingleSignOnProvider msidSharedProvider] canPerformAuthorization];`
`@@ -54,11 +67,11 @@ - (instancetype)initWithMSIDDeviceInfo:(MSIDDeviceInfo *)deviceInfo`
`54`	`67`	`{`
`55`	`68`	`_hasAADSSOExtension = NO;`
`56`	`69`	`}`
`57`		`-`
	`70`	`+`
`58`	`71`	`_extraDeviceInformation = [NSMutableDictionary new];`
`59`	`72`	`[self initExtraDeviceInformation:deviceInfo];`
`60`	`73`	`}`
`61`		`-`
	`74`	`+`
`62`	`75`	`return self;`
`63`	`76`	`}`
`64`	`77`
`@@ -95,6 +108,11 @@ - (void) initExtraDeviceInformation:(MSIDDeviceInfo *)deviceInfo`
`95`	`108`	`[_extraDeviceInformation setValue:deviceInfo.ssoExtensionMode == MSIDSSOExtensionModeFull ? @"Yes" : @"No" forKey:MSAL_DEVICE_INFORMATION_SSO_EXTENSION_FULL_MODE_KEY];`
`96`	`109`	`}`
`97`	`110`
	`111`	`+- (void) addRegisteredDeviceMetadataInformation:(NSDictionary *)deviceInfoMetadata`
	`112`	`+{`
	`113`	`+ [_extraDeviceInformation addEntriesFromDictionary:deviceInfoMetadata];`
	`114`	`+}`
	`115`	`+`
`98`	`116`	`- (NSString *)description`
`99`	`117`	`{`
`100`	`118`	`return [NSString stringWithFormat:@"Device mode %@", self.msalDeviceModeString];`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ + (void)load`
`128`	`128`	`MSIDNotifications.webAuthDidFinishLoadNotificationName = MSALWebAuthDidFinishLoadNotification;`
`129`	`129`	`MSIDNotifications.webAuthWillSwitchToBrokerAppNotificationName = MSALWebAuthWillSwitchToBrokerApp;`
`130`	`130`	`MSIDNotifications.webAuthDidReceiveResponseFromBrokerNotificationName = MSALWebAuthDidReceiveResponseFromBroker;`
`131`		`- #if TARGET_OS_IPHONE`
	`131`	`+ #if TARGET_OS_IPHONE && !AD_BROKER`
`132`	`132`	`[MSIDCertAuthHandler setUseAuthSession:YES];`
`133`	`133`	`#endif`
`134`	`134`	`}`
`@@ -716,7 +716,7 @@ - (void)acquireTokenSilentWithParameters:(MSALSilentTokenParameters *)parameters`
`716`	`716`	`{`
`717`	`717`	`__auto_type block = ^(MSALResult result, NSError msidError, id<MSIDRequestContext> context)`
`718`	`718`	`{`
`719`		`- NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider];`
	`719`	`+ NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider correlationId:context.correlationId];`
`720`	`720`	`[MSALPublicClientApplication logOperation:@"acquireTokenSilent" result:result error:msalError context:context];`
`721`	`721`
`722`	`722`	`if (!completionBlock) return;`
`@@ -1014,7 +1014,7 @@ - (void)acquireTokenWithParameters:(MSALInteractiveTokenParameters *)parameters`
`1014`	`1014`	`{`
`1015`	`1015`	`__auto_type block = ^(MSALResult result, NSError msidError, id<MSIDRequestContext> context)`
`1016`	`1016`	`{`
`1017`		`- NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider];`
	`1017`	`+ NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider correlationId:context.correlationId];`
`1018`	`1018`	`[MSALPublicClientApplication logOperation:@"acquireToken" result:result error:msalError context:context];`
`1019`	`1019`
`1020`	`1020`	`if (!completionBlock) return;`
`@@ -1260,7 +1260,7 @@ - (void)signoutWithAccount:(nonnull MSALAccount *)account`
`1260`	`1260`	`{`
`1261`	`1261`	`__auto_type block = ^(BOOL result, NSError *msidError, id<MSIDRequestContext> context)`
`1262`	`1262`	`{`
`1263`		`- NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider];`
	`1263`	`+ NSError *msalError = [MSALErrorConverter msalErrorFromMsidError:msidError classifyErrors:YES msalOauth2Provider:self.msalOauth2Provider correlationId:context.correlationId];`
`1264`	`1264`
`1265`	`1265`	`if (!result)`
`1266`	`1266`	`{`