Merge Release 1.7.40 to main

IdentityCore/IdentityCore.xcodeproj/project.pbxproj

@@ -8197,7 +8197,7 @@
 				INFOPLIST_FILE = MSIDTestsHostApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.MSIDTestsHostApp;
@@ -8247,7 +8247,7 @@
 				INFOPLIST_FILE = MSIDTestsHostApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.MSIDTestsHostApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8441,7 +8441,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACH_O_TYPE = staticlib;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8502,7 +8502,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACH_O_TYPE = staticlib;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -8694,7 +8694,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -8753,7 +8753,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8811,7 +8811,7 @@
 					"$(inherited)",
 					"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/Swift",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 			};
 			name = Debug;
 		};
@@ -8823,7 +8823,7 @@
 					"$(inherited)",
 					"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/Swift",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 			};
 			name = Release;
 		};
@@ -8837,7 +8837,7 @@
 				DEVELOPMENT_TEAM = UBF8T346G9;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				SWIFT_OBJC_BRIDGING_HEADER = "tests/IdentityCoreTests Mac-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -8853,7 +8853,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = UBF8T346G9;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				SWIFT_OBJC_BRIDGING_HEADER = "tests/IdentityCoreTests Mac-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 			};
@@ -8883,15 +8883,15 @@
 			baseConfigurationReference = D6CF4E991FC3626A00CD70C5 /* identitycore__testlib__mac.xcconfig */;
 			buildSettings = {
 				GCC_OPTIMIZATION_LEVEL = 0;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 			};
 			name = Debug;
 		};
 		D626FFE81FBD1F5700EE4487 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D6CF4E991FC3626A00CD70C5 /* identitycore__testlib__mac.xcconfig */;
 			buildSettings = {
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 			};
 			name = Release;
 		};
@@ -8909,7 +8909,7 @@
 				);
 				GCC_WARN_SHADOW = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 			};
 			name = Debug;
 		};
@@ -8925,7 +8925,7 @@
 				);
 				GCC_WARN_SHADOW = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 			};
 			name = Release;
 		};

IdentityCore/src/IdentityCore_Internal.h

@@ -47,4 +47,4 @@
 - (void)SETTER:(NSString *)value { [DICT setValue:[value copy] forKey:KEY]; }
 
 #define STRING_CASE(_CASE) case _CASE: return @#_CASE
-#define MSID_ENABLE_SSO_EXTENSION ((__IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500) && !MSID_EXCLUDE_WEBKIT)
+#define MSID_ENABLE_SSO_EXTENSION (!MSID_EXCLUDE_WEBKIT)

IdentityCore/src/broker_operation/request/interactive_token_request/MSIDBrokerOperationInteractiveTokenRequest.m

@@ -34,10 +34,7 @@ @implementation MSIDBrokerOperationInteractiveTokenRequest
 
 + (void)load
 {
-    if (@available(macOS 10.15, *))
-    {
-        [MSIDJsonSerializableFactory registerClass:self forClassType:self.operation];
-    }
+    [MSIDJsonSerializableFactory registerClass:self forClassType:self.operation];
 }
 
 + (instancetype)tokenRequestWithParameters:(MSIDInteractiveTokenRequestParameters *)parameters
@@ -66,12 +63,7 @@ + (instancetype)tokenRequestWithParameters:(MSIDInteractiveTokenRequestParameter
 
 + (NSString *)operation
 {
-    if (@available(macOS 10.15, *))
-    {
-        return ASAuthorizationOperationLogin;
-    }
-
-    return @"login";
+    return ASAuthorizationOperationLogin;
 }
 
 #pragma mark - MSIDJsonSerializable

IdentityCore/src/broker_operation/request/silent_token_request/MSIDBrokerOperationSilentTokenRequest.m

@@ -40,10 +40,7 @@ @implementation MSIDBrokerOperationSilentTokenRequest
 
 + (void)load
 {
-    if (@available(macOS 10.15, *))
-    {
-        [MSIDJsonSerializableFactory registerClass:self forClassType:self.operation];
-    }
+    [MSIDJsonSerializableFactory registerClass:self forClassType:self.operation];
 }
 
 + (instancetype)tokenRequestWithParameters:(MSIDRequestParameters *)parameters
@@ -64,12 +61,7 @@ + (instancetype)tokenRequestWithParameters:(MSIDRequestParameters *)parameters
 
 + (NSString *)operation
 {
-    if (@available(macOS 10.15, *))
-    {
-        return ASAuthorizationOperationRefresh;
-    }
-
-    return @"refresh";
+    return ASAuthorizationOperationRefresh;
 }
 
 #pragma mark - MSIDJsonSerializable

IdentityCore/src/cache/MSIDKeychainTokenCache.m

@@ -152,11 +152,7 @@ - (nullable instancetype)initWithGroup:(nullable NSString *)keychainGroup error:
                                                   (id)kSecAttrAccessGroup : self.keychainGroup} mutableCopy];
 
 #ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
-    if (@available(macOS 10.15, *)) {
-        defaultKeychainQuery[(id)kSecUseDataProtectionKeychain] = @YES;
-    }
-#endif
+    defaultKeychainQuery[(id)kSecUseDataProtectionKeychain] = @YES;
 #endif
 
     self.defaultKeychainQuery = defaultKeychainQuery;
@@ -165,13 +161,8 @@ - (nullable instancetype)initWithGroup:(nullable NSString *)keychainGroup error:
                                               (id)kSecAttrGeneric : [s_wipeLibraryString dataUsingEncoding:NSUTF8StringEncoding],
                                               (id)kSecAttrAccessGroup : self.keychainGroup,
                                               (id)kSecAttrAccount : @"TokenWipe"} mutableCopy];
-
 #ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
-        if (@available(macOS 10.15, *)) {
-            defaultWipeQuery[(id)kSecUseDataProtectionKeychain] = @YES;
-        }
-#endif
+    defaultWipeQuery[(id)kSecUseDataProtectionKeychain] = @YES;
 #endif
 
     self.defaultWipeQuery = defaultWipeQuery;

IdentityCore/src/cache/crypto/MSIDAssymetricKeyGeneratorFactory.m

@@ -49,14 +49,7 @@ @implementation MSIDAssymetricKeyGeneratorFactory
 #if !TARGET_OS_IPHONE
 + (id<MSIDAssymetricKeyGenerating>)macDefaultKeyGeneratorWithCacheConfig:(MSIDCacheConfig *)cacheConfig error:(NSError *__autoreleasing*)error
 {
-    if (@available(macOS 10.15, *))
-    {
-        return [[MSIDAssymetricKeyKeychainGenerator alloc] initWithGroup:cacheConfig.keychainGroup error:error];
-    }
-    else
-    {
-        return [[MSIDAssymetricKeyLoginKeychainGenerator alloc] initWithKeychainGroup:cacheConfig.keychainGroup accessRef:cacheConfig.accessRef error:error];
-    }
+    return [[MSIDAssymetricKeyKeychainGenerator alloc] initWithGroup:cacheConfig.keychainGroup error:error];
 }
 #endif
 

IdentityCore/src/cache/crypto/MSIDAssymetricKeyKeychainGenerator.m

@@ -268,13 +268,8 @@ - (MSIDAssymetricKeyPair *)generateKeyPairForKeyDict:(NSDictionary *)attributes
 - (NSDictionary *)additionalPlatformKeychainAttributes
 {
     #ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
-    #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
-        if (@available(macOS 10.15, *)) {
-            return @{(id)kSecUseDataProtectionKeychain : @YES};
-        }
-    #endif
+        return @{(id)kSecUseDataProtectionKeychain : @YES};
     #endif
-
     return nil;
 }
 

IdentityCore/src/cache/crypto/MSIDAssymetricKeyPair.m

@@ -247,13 +247,8 @@ - (NSDate *)creationDate
         privateKeyQuery[(id)kSecAttrLabel] = [self.privateKeyDict objectForKey:(id)kSecAttrLabel];
         privateKeyQuery[(id)kSecReturnRef] = @YES;
         privateKeyQuery[(id)kSecReturnAttributes] = @YES;
-
         #ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
-        #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
-            if (@available(macOS 10.15, *)) {
                 privateKeyQuery[(id)kSecUseDataProtectionKeychain] = @YES;
-            }
-        #endif
         #endif
 
         CFDictionaryRef result = nil;

IdentityCore/src/cache/mac/MSIDMacKeychainTokenCache.m

@@ -367,25 +367,17 @@ + (MSIDMacKeychainTokenCache *)defaultKeychainCache
 
 - (BOOL)shouldUseLoginKeychain
 {
-    if (@available(macOS 10.15, *))
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:kLoginKeychainEmptyKey])
     {
-
-        if ([[NSUserDefaults standardUserDefaults] boolForKey:kLoginKeychainEmptyKey])
-        {
 #if MS_INTERNAL_BUILD
-            return ![MSIDKeychainUtil sharedInstance].isAppEntitled;
+        return ![MSIDKeychainUtil sharedInstance].isAppEntitled;
 #else
-            return NO;
+        return NO;
 #endif
-        }
-        else
-        {
-            // if kLoginKeychainEmptyKey is not set
-            return YES;
-        }
     }
     else
     {
+        // if kLoginKeychainEmptyKey is not set
         return YES;
     }
 }
@@ -411,18 +403,15 @@ - (nullable instancetype)initWithGroup:(nullable NSString *)keychainGroup
     self = [super initWithTrustedApplications:trustedApplications accessLabel:s_defaultKeychainLabel error:error];
     if (self)
     {
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
         if (![self shouldUseLoginKeychain]) {
-                if (error)
-                {
-                    *error = MSIDCreateError(MSIDErrorDomain, MSIDErrorInternal, @"Not creating login keychain for performance optimization on macOS 10.15, because no items where previously found in it", nil, nil, nil, nil, nil, NO);
-                }
-
-                MSID_LOG_WITH_CTX(MSIDLogLevelWarning, nil, @"Not creating login keychain for performance optimization on macOS 10.15, because no items where previously found in it");
-                return nil;
+            if (error)
+            {
+                *error = MSIDCreateError(MSIDErrorDomain, MSIDErrorInternal, @"Not creating login keychain for performance optimization on macOS 10.15, because no items where previously found in it", nil, nil, nil, nil, nil, NO);
             }
-
-#endif
+
+            MSID_LOG_WITH_CTX(MSIDLogLevelWarning, nil, @"Not creating login keychain for performance optimization on macOS 10.15, because no items where previously found in it");
+            return nil;
+        }
 
         self.appStorageItem = [MSIDMacCredentialStorageItem new];
         self.sharedStorageItem = [MSIDMacCredentialStorageItem new];
@@ -825,14 +814,12 @@ - (MSIDMacCredentialStorageItem *)queryStorageItem:(BOOL)isShared
                                              error:(NSError *__autoreleasing*)error
 {
     MSID_TRACE;
-
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
+
     if (![self shouldUseLoginKeychain])
     {
         MSID_LOG_WITH_CTX(MSIDLogLevelWarning, context, @"Skipping login keychain read because it has been previously marked as empty on 10.15");
         return nil;
     }
-#endif
 
     MSIDMacCredentialStorageItem *storageItem = nil;
     NSMutableDictionary *query = [self.defaultCacheQuery mutableCopy];
@@ -869,18 +856,12 @@ - (MSIDMacCredentialStorageItem *)queryStorageItem:(BOOL)isShared
     {
         storageItemIsEmpty = YES;
     }
-
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
-    if (@available(macOS 10.15, *)) {
-
-        // Performance optimization on 10.15. If we've read shared item once and we didn't find it, or it was empty, save a flag into user defaults such as we stop looking into the login keychain altogether
-        if (isShared && storageItemIsEmpty)
-        {
-            MSID_LOG_WITH_CTX(MSIDLogLevelWarning, context, @"Saving a flag to stop looking into login keychain, as it doesn't contain any items");
-            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kLoginKeychainEmptyKey];
-        }
+
+    if (isShared && storageItemIsEmpty)
+    {
+        MSID_LOG_WITH_CTX(MSIDLogLevelWarning, context, @"Saving a flag to stop looking into login keychain, as it doesn't contain any items");
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kLoginKeychainEmptyKey];
     }
-#endif
 
     return storageItem;
 }