[macOS SDK] Update macOS minimum version to 10.15 (#2220)

spetrescu84 · web-flow · commit 6eaee12b397e · 2024-08-08T10:54:34.000+01:00
* Increased minimum macOS version to 10.15 * Removed all instances of if (@available(macOS 10.15, *)) * Updated CHANGELOG.md * Corrected version * Removed all API_AVAILABLE that were always satisfied Removed all if (@available) that were always satisfied * Reverted to dev IdentityCore * New IdentityCore * New Idenitycore * Updated IdenityCore to correct version * PR comments * Latest IdentityCore * Updated IdentityCore * Using dev branch after merge
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [TBD]:
+* Increased macOS minimum version to 10.15 #2220
+
 ## [1.4.1]
 * Update Native Auth logging levels for improved clarity and consistency. (#2184)
 * Update common core submodule with changes related to upgrade registration. (#2180)
diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore
@@ -1 +1 @@
-Subproject commit 6a8cae48af4f0b5596ed3f086edcf005273aec3d
+Subproject commit 1350f0c790e54fed962a44c6ccb344f643b16fed
diff --git a/MSAL/MSAL.xcodeproj/project.pbxproj b/MSAL/MSAL.xcodeproj/project.pbxproj
@@ -6427,7 +6427,7 @@
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_NAME = "MSAL (macOS Static Library)";
 			};
 			name = Debug;
@@ -6438,7 +6438,7 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_NAME = "MSAL (macOS Static Library)";
 			};
 			name = Release;
@@ -6499,7 +6499,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -6569,7 +6569,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.MSALMacTestApp;
@@ -6981,7 +6981,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -7045,7 +7045,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.microsoft.unit-test-host";
@@ -7460,7 +7460,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MARKETING_VERSION = 1.1.24;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -7481,7 +7481,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MARKETING_VERSION = 1.1.24;
 				SWIFT_VERSION = 5.0;
 			};
@@ -7556,7 +7556,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				GCC_OPTIMIZATION_LEVEL = 0;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/unit-test-host-mac.app/Contents/MacOS/unit-test-host-mac";
 				USER_HEADER_SEARCH_PATHS = (
@@ -7574,7 +7574,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/unit-test-host-mac.app/Contents/MacOS/unit-test-host-mac";
 				USER_HEADER_SEARCH_PATHS = (
diff --git a/MSAL/src/MSALDeviceInformation.m b/MSAL/src/MSALDeviceInformation.m
@@ -54,14 +54,7 @@ - (instancetype)init
         _deviceMode = MSALDeviceModeDefault;
         _extraDeviceInformation = [NSMutableDictionary new];
         
-        if (@available(macOS 10.15, *))
-        {
-            _hasAADSSOExtension = [[ASAuthorizationSingleSignOnProvider msidSharedProvider] canPerformAuthorization];
-        }
-        else
-        {
-            _hasAADSSOExtension = NO;
-        }
+        _hasAADSSOExtension = [[ASAuthorizationSingleSignOnProvider msidSharedProvider] canPerformAuthorization];
     }
 
     return self;
@@ -75,14 +68,7 @@ - (instancetype)initWithMSIDDeviceInfo:(MSIDDeviceInfo *)deviceInfo
     {
         _deviceMode = [self msalDeviceModeFromMSIDMode:deviceInfo.deviceMode];
 
-        if (@available(macOS 10.15, *))
-        {
-            _hasAADSSOExtension = [[ASAuthorizationSingleSignOnProvider msidSharedProvider] canPerformAuthorization];
-        }
-        else
-        {
-            _hasAADSSOExtension = NO;
-        }
+        _hasAADSSOExtension = [[ASAuthorizationSingleSignOnProvider msidSharedProvider] canPerformAuthorization];
         
 #if TARGET_OS_OSX
         _platformSSOStatus = [self msalPlatformSSOStatusFromMSIDPlatformSSOStatus:deviceInfo.platformSSOStatus];
diff --git a/MSAL/src/MSALPublicClientApplication.m b/MSAL/src/MSALPublicClientApplication.m
@@ -320,30 +320,19 @@ - (BOOL)setupTokenCacheWithConfiguration:(MSALPublicClientApplicationConfig *)co
     id<MSIDExtendedTokenCacheDataSource> dataSource = nil;
     id<MSIDExtendedTokenCacheDataSource> secondaryDataSource = nil;
     NSError *dataSourceError = nil;
-    
-    if (@available(macOS 10.15, *)) {
-        dataSource = [[MSIDKeychainTokenCache alloc] initWithGroup:config.cacheConfig.keychainSharingGroup error:&dataSourceError];
-        
-        self.msidCacheConfig = [[MSIDCacheConfig alloc] initWithKeychainGroup:config.cacheConfig.keychainSharingGroup];
-        
-        NSError *secondaryDataSourceError = nil;
-        secondaryDataSource = [[MSIDMacKeychainTokenCache alloc] initWithGroup:config.cacheConfig.keychainSharingGroup
-                                                           trustedApplications:config.cacheConfig.trustedApplications
-                                                                         error:&secondaryDataSourceError];
-        
-        if (secondaryDataSourceError)
-        {
-            MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, @"Failed to create secondary data source with error %@", MSID_PII_LOG_MASKABLE(secondaryDataSourceError));
-        }
-    }
-    else
+
+    dataSource = [[MSIDKeychainTokenCache alloc] initWithGroup:config.cacheConfig.keychainSharingGroup error:&dataSourceError];
+
+    self.msidCacheConfig = [[MSIDCacheConfig alloc] initWithKeychainGroup:config.cacheConfig.keychainSharingGroup];
+
+    NSError *secondaryDataSourceError = nil;
+    secondaryDataSource = [[MSIDMacKeychainTokenCache alloc] initWithGroup:config.cacheConfig.keychainSharingGroup
+                                                       trustedApplications:config.cacheConfig.trustedApplications
+                                                                     error:&secondaryDataSourceError];
+
+    if (secondaryDataSourceError)
     {
-        MSIDMacKeychainTokenCache *macDataSource = [[MSIDMacKeychainTokenCache alloc] initWithGroup:config.cacheConfig.keychainSharingGroup
-                                                  trustedApplications:config.cacheConfig.trustedApplications
-                                                                error:&dataSourceError];
-        
-        dataSource = macDataSource;
-        self.msidCacheConfig = [[MSIDCacheConfig alloc] initWithKeychainGroup:config.cacheConfig.keychainSharingGroup accessRef:(__bridge SecAccessRef _Nullable)(macDataSource.accessControlForNonSharedItems)];
+        MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, @"Failed to create secondary data source with error %@", MSID_PII_LOG_MASKABLE(secondaryDataSourceError));
     }
     
     if (!dataSource)
diff --git a/MSAL/src/MSIDInteractiveRequestParameters+MSALRequest.m b/MSAL/src/MSIDInteractiveRequestParameters+MSALRequest.m
@@ -60,10 +60,7 @@ - (BOOL)fillWithWebViewParameters:(MSALWebviewParameters *)webParameters
         
     self.parentViewController = parentViewController;
         
-    if (@available(macOS 10.15, *))
-    {
-        self.prefersEphemeralWebBrowserSession = webParameters.prefersEphemeralWebBrowserSession;
-    }
+    self.prefersEphemeralWebBrowserSession = webParameters.prefersEphemeralWebBrowserSession;
         
         // Configure webview
 #pragma clang diagnostic push
diff --git a/MSAL/src/configuration/MSALWebviewParameters.m b/MSAL/src/configuration/MSALWebviewParameters.m
@@ -68,10 +68,7 @@ - (id)copyWithZone:(__unused NSZone *)zone
     item.presentationStyle = _presentationStyle;
 #endif
     
-    if (@available(macOS 10.15, *))
-    {
-        item.prefersEphemeralWebBrowserSession = _prefersEphemeralWebBrowserSession;
-    }
+    item.prefersEphemeralWebBrowserSession = _prefersEphemeralWebBrowserSession;
     
     item.webviewType = _webviewType;
     item.customWebview = _customWebview;
diff --git a/MSAL/src/instance/MSALAccountsProvider.m b/MSAL/src/instance/MSALAccountsProvider.m
@@ -350,10 +350,7 @@ - (void)allAccountsFromDevice:(MSALAccountEnumerationParameters *)parameters
 {
     BOOL shouldCallBroker = NO;
     
-    if (@available(macOS 10.15, *))
-    {
-        shouldCallBroker = [MSIDSSOExtensionGetAccountsRequest canPerformRequest] && [requestParameters shouldUseBroker];
-    }
+    shouldCallBroker = [MSIDSSOExtensionGetAccountsRequest canPerformRequest] && [requestParameters shouldUseBroker];
     
     if (!shouldCallBroker)
     {
@@ -363,17 +360,14 @@ - (void)allAccountsFromDevice:(MSALAccountEnumerationParameters *)parameters
         return;
     }
     
-    if (@available(macOS 10.15, *))
-    {
-        [self allAccountsFromSSOExtension:parameters
+    [self allAccountsFromSSOExtension:parameters
                         requestParameters:requestParameters
                           completionBlock:completionBlock];
-    }
 }
 
 - (void)allAccountsFromSSOExtension:(MSALAccountEnumerationParameters *)parameters
                   requestParameters:(MSIDRequestParameters *)requestParameters
-                    completionBlock:(MSALAccountsCompletionBlock)completionBlock API_AVAILABLE(ios(13.0), macos(10.15))
+                    completionBlock:(MSALAccountsCompletionBlock)completionBlock
 {
     NSError *requestError;
     MSIDSSOExtensionGetAccountsRequest *ssoExtensionRequest = [[MSIDSSOExtensionGetAccountsRequest alloc] initWithRequestParameters:requestParameters
diff --git a/MSAL/src/instance/MSALDeviceInfoProvider.m b/MSAL/src/instance/MSALDeviceInfoProvider.m
@@ -68,10 +68,7 @@ - (void)deviceInfoWithRequestParameters:(MSIDRequestParameters *)requestParamete
     }
 
     BOOL canCallSSOExtension = NO;
-    if (@available(macOS 10.15, *))
-    {
-        canCallSSOExtension = [MSIDSSOExtensionGetDeviceInfoRequest canPerformRequest];
-    }
+    canCallSSOExtension = [MSIDSSOExtensionGetDeviceInfoRequest canPerformRequest];
 
     MSID_LOG_WITH_CTX(MSIDLogLevelInfo, requestParameters, @"GetDeviceInfo: Should call Sso Extension decision: %i", canCallSSOExtension);
     if (!canCallSSOExtension)
@@ -81,49 +78,46 @@ - (void)deviceInfoWithRequestParameters:(MSIDRequestParameters *)requestParamete
         fillDeviceInfoCompletionBlock(nil, nil);
         return;
     }
-    
-    if (@available(macOS 10.15, *))
+
+    // We are here means canCallSSOExtension is TRUE
+    MSID_LOG_WITH_CTX(MSIDLogLevelVerbose, requestParameters, @"GetDeviceInfo: Creating Sso Extension request");
+    NSError *requestError;
+    MSIDSSOExtensionGetDeviceInfoRequest *ssoExtensionRequest = [[MSIDSSOExtensionGetDeviceInfoRequest alloc] initWithRequestParameters:requestParameters
+                                                                                                                                  error:&requestError];
+    if (!ssoExtensionRequest)
     {
-        // We are here means canCallSSOExtension is TRUE
-        MSID_LOG_WITH_CTX(MSIDLogLevelVerbose, requestParameters, @"GetDeviceInfo: Creating Sso Extension request");
-        NSError *requestError;
-        MSIDSSOExtensionGetDeviceInfoRequest *ssoExtensionRequest = [[MSIDSSOExtensionGetDeviceInfoRequest alloc] initWithRequestParameters:requestParameters
-                                                                                                                                      error:&requestError];
-        if (!ssoExtensionRequest)
-        {
-            MSID_LOG_WITH_CTX_PII(MSIDLogLevelError, requestParameters, @"GetDeviceInfo: Get error when creating ssoExtensionRequest: %@", MSID_PII_LOG_MASKABLE(requestError));
-            completionBlock(nil, requestError);
-            return;
-        }
+        MSID_LOG_WITH_CTX_PII(MSIDLogLevelError, requestParameters, @"GetDeviceInfo: Get error when creating ssoExtensionRequest: %@", MSID_PII_LOG_MASKABLE(requestError));
+        completionBlock(nil, requestError);
+        return;
+    }
+
+    if (![self setCurrentSSOExtensionRequest:ssoExtensionRequest])
+    {
+        MSID_LOG_WITH_CTX(MSIDLogLevelError, requestParameters, @"GetDeviceInfo: Cannot start Sso Extension as another is in progress");
+        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;
+    }
 
-        if (![self setCurrentSSOExtensionRequest:ssoExtensionRequest])
+    MSID_LOG_WITH_CTX_PII(MSIDLogLevelInfo, requestParameters, @"GetDeviceInfo: Invoking Sso Extension with ssoExtensionRequest: %@", MSID_PII_LOG_MASKABLE(ssoExtensionRequest));
+    [ssoExtensionRequest executeRequestWithCompletion:^(MSIDDeviceInfo * _Nullable deviceInfo, NSError * _Nullable error)
+    {
+        MSID_LOG_WITH_CTX_PII(MSIDLogLevelInfo, requestParameters, @"GetDeviceInfo: Receiving results from Sso Extension with device info: %@, error: %@", MSID_PII_LOG_MASKABLE(deviceInfo), MSID_PII_LOG_MASKABLE(error));
+        [self copyAndClearCurrentSSOExtensionRequest];
+
+        if (!deviceInfo)
         {
-            MSID_LOG_WITH_CTX(MSIDLogLevelError, requestParameters, @"GetDeviceInfo: Cannot start Sso Extension as another is in progress");
-            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);
+            // We are returing registration details irrespective of failures due to SSO extension request as registration details must have for few clients
+            // Once we identify and fix the intermittent SSO extension issue then we should return either deviceInfo or error
+            MSID_LOG_WITH_CTX_PII(MSIDLogLevelError, nil, @"GetDeviceInfo: Error getting device info: %@", MSID_PII_LOG_MASKABLE(error));
+            fillDeviceInfoCompletionBlock(nil, error);
             return;
         }
 
-        MSID_LOG_WITH_CTX_PII(MSIDLogLevelInfo, requestParameters, @"GetDeviceInfo: Invoking Sso Extension with ssoExtensionRequest: %@", MSID_PII_LOG_MASKABLE(ssoExtensionRequest));
-        [ssoExtensionRequest executeRequestWithCompletion:^(MSIDDeviceInfo * _Nullable deviceInfo, NSError * _Nullable error)
-        {
-            MSID_LOG_WITH_CTX_PII(MSIDLogLevelInfo, requestParameters, @"GetDeviceInfo: Receiving results from Sso Extension with device info: %@, error: %@", MSID_PII_LOG_MASKABLE(deviceInfo), MSID_PII_LOG_MASKABLE(error));
-            [self copyAndClearCurrentSSOExtensionRequest];
-
-            if (!deviceInfo)
-            {
-                // We are returing registration details irrespective of failures due to SSO extension request as registration details must have for few clients
-                // Once we identify and fix the intermittent SSO extension issue then we should return either deviceInfo or error
-                MSID_LOG_WITH_CTX_PII(MSIDLogLevelError, nil, @"GetDeviceInfo: Error getting device info: %@", MSID_PII_LOG_MASKABLE(error));
-                fillDeviceInfoCompletionBlock(nil, error);
-                return;
-            }
-
-            MSALDeviceInformation *msalDeviceInfo = [[MSALDeviceInformation alloc] initWithMSIDDeviceInfo:deviceInfo];
-            fillDeviceInfoCompletionBlock(msalDeviceInfo, nil);
-            return;
-        }];
-    }
+        MSALDeviceInformation *msalDeviceInfo = [[MSALDeviceInformation alloc] initWithMSIDDeviceInfo:deviceInfo];
+        fillDeviceInfoCompletionBlock(msalDeviceInfo, nil);
+        return;
+    }];
 }
 
 - (void)wpjMetaDataDeviceInfoWithRequestParameters:(MSIDRequestParameters *)requestParameters
diff --git a/MSAL/src/instance/MSALSSOExtensionRequestHandler.h b/MSAL/src/instance/MSALSSOExtensionRequestHandler.h
@@ -31,8 +31,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MSALSSOExtensionRequestHandler : NSObject
 
-- (BOOL)setCurrentSSOExtensionRequest:(id)request API_AVAILABLE(ios(13.0), macos(10.15));
-- (id)copyAndClearCurrentSSOExtensionRequest API_AVAILABLE(ios(13.0), macos(10.15));
+- (BOOL)setCurrentSSOExtensionRequest:(id)request;
+- (id)copyAndClearCurrentSSOExtensionRequest;
 
 @end
 
diff --git a/MSAL/src/instance/MSALSSOExtensionRequestHandler.m b/MSAL/src/instance/MSALSSOExtensionRequestHandler.m
@@ -29,15 +29,15 @@
 
 @interface MSALSSOExtensionRequestHandler()
 
-@property (nullable, nonatomic) id currentRequest API_AVAILABLE(ios(13.0), macos(10.15));
+@property (nullable, nonatomic) id currentRequest;
 
 @end
 
 @implementation MSALSSOExtensionRequestHandler
 
 #pragma mark - Request tracking
 
-- (BOOL)setCurrentSSOExtensionRequest:(id)request API_AVAILABLE(ios(13.0), macos(10.15))
+- (BOOL)setCurrentSSOExtensionRequest:(id)request
 {
     @synchronized (self)
     {
@@ -54,7 +54,7 @@ - (BOOL)setCurrentSSOExtensionRequest:(id)request API_AVAILABLE(ios(13.0), macos
     return NO;
 }
 
-- (id)copyAndClearCurrentSSOExtensionRequest API_AVAILABLE(ios(13.0), macos(10.15))
+- (id)copyAndClearCurrentSSOExtensionRequest
 {
     @synchronized (self)
     {
diff --git a/MSAL/src/public/MSALWebviewParameters.h b/MSAL/src/public/MSALWebviewParameters.h
@@ -63,7 +63,7 @@ NS_ASSUME_NONNULL_BEGIN
  A Boolean value that indicates whether the ASWebAuthenticationSession should ask the browser for a private authentication session.
  The value of this property is false by default. For more info see here: https://developer.apple.com/documentation/authenticationservices/aswebauthenticationsession/3237231-prefersephemeralwebbrowsersessio?language=objc
  */
-@property (nonatomic) BOOL prefersEphemeralWebBrowserSession API_AVAILABLE(ios(13.0), macos(10.15));
+@property (nonatomic) BOOL prefersEphemeralWebBrowserSession;
 
 /**
  A specific webView type for the interactive authentication flow.
diff --git a/MSAL/test/app/mac/MSALAcquireTokenViewController.m b/MSAL/test/app/mac/MSALAcquireTokenViewController.m
diff --git a/MSAL/test/app/mac/MSALCacheViewController.m b/MSAL/test/app/mac/MSALCacheViewController.m
diff --git a/MSAL/test/unit/MSALAccountsProviderTests.m b/MSAL/test/unit/MSALAccountsProviderTests.m
diff --git a/MSAL/test/unit/MSALDeviceInfoProviderTests.m b/MSAL/test/unit/MSALDeviceInfoProviderTests.m
diff --git a/MSAL/test/unit/MSALPublicClientApplicationTests.m b/MSAL/test/unit/MSALPublicClientApplicationTests.m
diff --git a/MSAL/test/unit/utils/MSALDevicePopManagerUtil.m b/MSAL/test/unit/utils/MSALDevicePopManagerUtil.m

Original file line number	Diff line number	Diff line change
`@@ -350,10 +350,7 @@ - (void)allAccountsFromDevice:(MSALAccountEnumerationParameters *)parameters`
`350`	`350`	`{`
`351`	`351`	`BOOL shouldCallBroker = NO;`
`352`	`352`
`353`		`- if (@available(macOS 10.15, *))`
`354`		`- {`
`355`		`- shouldCallBroker = [MSIDSSOExtensionGetAccountsRequest canPerformRequest] && [requestParameters shouldUseBroker];`
`356`		`- }`
	`353`	`+ shouldCallBroker = [MSIDSSOExtensionGetAccountsRequest canPerformRequest] && [requestParameters shouldUseBroker];`
`357`	`354`
`358`	`355`	`if (!shouldCallBroker)`
`359`	`356`	`{`
`@@ -363,17 +360,14 @@ - (void)allAccountsFromDevice:(MSALAccountEnumerationParameters *)parameters`
`363`	`360`	`return;`
`364`	`361`	`}`
`365`	`362`
`366`		`- if (@available(macOS 10.15, *))`
`367`		`- {`
`368`		`- [self allAccountsFromSSOExtension:parameters`
	`363`	`+ [self allAccountsFromSSOExtension:parameters`
`369`	`364`	`requestParameters:requestParameters`
`370`	`365`	`completionBlock:completionBlock];`
`371`		`- }`
`372`	`366`	`}`
`373`	`367`
`374`	`368`	`- (void)allAccountsFromSSOExtension:(MSALAccountEnumerationParameters *)parameters`
`375`	`369`	`requestParameters:(MSIDRequestParameters *)requestParameters`
`376`		`- completionBlock:(MSALAccountsCompletionBlock)completionBlock API_AVAILABLE(ios(13.0), macos(10.15))`
	`370`	`+ completionBlock:(MSALAccountsCompletionBlock)completionBlock`
`377`	`371`	`{`
`378`	`372`	`NSError *requestError;`
`379`	`373`	`MSIDSSOExtensionGetAccountsRequest *ssoExtensionRequest = [[MSIDSSOExtensionGetAccountsRequest alloc] initWithRequestParameters:requestParameters`