Merge branch 'hotfix/1.15.3' into hotfix/1.16.2

juan-arias · juan-arias · commit 92d0e4bfe8f4 · 2025-11-20T11:59:46.000-08:00
# Conflicts:
#	changelog.txt
diff --git a/IdentityCore/src/cache/mac/MSIDMacKeychainTokenCache.m b/IdentityCore/src/cache/mac/MSIDMacKeychainTokenCache.m
@@ -557,14 +557,15 @@ - (BOOL)removeAccountsWithKey:(MSIDCacheKey *)key
 
 - (NSArray<MSIDJsonObject *> *)jsonObjectsWithKey:(__unused MSIDCacheKey *)key serializer:(__unused id<MSIDExtendedCacheItemSerializing>)serializer context:(id<MSIDRequestContext>)context error:(NSError *__autoreleasing *)error
 {
-    [self createUnimplementedError:error context:context];
+    MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"Skipping jsonObjectsWithKey:serializer:context:error: in MSIDMacKeychainTokenCache.");
     return nil;
 }
 
 
 - (BOOL)saveJsonObject:(__unused MSIDJsonObject *)jsonObject serializer:(__unused id<MSIDExtendedCacheItemSerializing>)serializer key:(__unused MSIDCacheKey *)key context:(id<MSIDRequestContext>)context error:(NSError *__autoreleasing *)error
 {
-    [self createUnimplementedError:error context:context];
+    MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"Skipping saveJsonObject:serializer:key:context:error: in MSIDMacKeychainTokenCache.");
+    
     return NO;
 }
 
diff --git a/changelog.txt b/changelog.txt
@@ -1,10 +1,16 @@
+Version 1.16.2
+* Update with changes from 1.15.3
+
 Version 1.16.1
 * Allow duna external idp on MacOs #1593
 
 Version 1.16.0
 * Filter based Flighting capabilities (#1580)
 * Filter based Flighting for DUNA feature (#1580)
 
+Version 1.15.3
+* Fix issue with legacy keychain on macOS.
+
 Version 1.15.2
 * Feature flag gating STK querying and getting rid of category for its setter. (#1586)
 

Original file line number	Diff line number	Diff line change
`@@ -557,14 +557,15 @@ - (BOOL)removeAccountsWithKey:(MSIDCacheKey *)key`
`557`	`557`
`558`	`558`	`- (NSArray<MSIDJsonObject > )jsonObjectsWithKey:(__unused MSIDCacheKey )key serializer:(__unused id<MSIDExtendedCacheItemSerializing>)serializer context:(id<MSIDRequestContext>)context error:(NSError __autoreleasing *)error`
`559`	`559`	`{`
`560`		`- [self createUnimplementedError:error context:context];`
	`560`	`+ MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"Skipping jsonObjectsWithKey:serializer:context:error: in MSIDMacKeychainTokenCache.");`
`561`	`561`	`return nil;`
`562`	`562`	`}`
`563`	`563`
`564`	`564`
`565`	`565`	`- (BOOL)saveJsonObject:(__unused MSIDJsonObject )jsonObject serializer:(__unused id<MSIDExtendedCacheItemSerializing>)serializer key:(__unused MSIDCacheKey )key context:(id<MSIDRequestContext>)context error:(NSError __autoreleasing )error`
`566`	`566`	`{`
`567`		`- [self createUnimplementedError:error context:context];`
	`567`	`+ MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"Skipping saveJsonObject:serializer:key:context:error: in MSIDMacKeychainTokenCache.");`
	`568`	`+`
`568`	`569`	`return NO;`
`569`	`570`	`}`
`570`	`571`