[Messaging] macOS keychain auth prompt fix (#10166)

* macOS keychain auth prompt fix

* Fix unit test failures on macOS

* group all tests under single #if

Author: aashishpatil-g

FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.m

@@ -65,6 +65,13 @@ + (NSMutableDictionary *)keychainQueryForService:(NSString *)service
   if ([service length] && ![kFIRMessagingKeychainWildcardIdentifier isEqualToString:service]) {
     finalQuery[(__bridge NSString *)kSecAttrService] = service;
   }
+
+  if (@available(iOS 13.0, macOS 10.15, macCatalyst 13.0, tvOS 13.0, watchOS 6.0, *)) {
+    // Ensures that the keychain query behaves the same across all platforms.
+    // See go/firebase-macos-keychain-popups for details.
+    finalQuery[(__bridge id)kSecUseDataProtectionKeychain] = (__bridge id)kCFBooleanTrue;
+  }
+
   return finalQuery;
 }
 

FirebaseMessaging/Tests/UnitTests/FIRMessagingAuthKeychainTest.m

@@ -214,6 +214,11 @@ - (void)testKeyChainNoCorruptionWithUniqueService {
 #endif
 }
 
+// Skip keychain tests on Catalyst and macOS. Tests are skipped because they
+// involve interactions with the keychain that require a provisioning profile.
+// See go/firebase-macos-keychain-popups for more details.
+#if !TARGET_OS_MACCATALYST && !TARGET_OS_OSX
+
 - (void)testQueryCachedKeychainItems {
   XCTestExpectation *addItemToKeychainExpectation =
       [self expectationWithDescription:@"Test added item should be cached properly"];
@@ -396,6 +401,8 @@ - (void)testQueryAndAddEntry {
   XCTAssertNotNil(keychain.cachedKeychainData[service][account2]);
 }
 
+#endif
+
 #pragma mark - helper function
 - (NSData *)tokenDataWithAuthorizedEntity:(NSString *)authorizedEntity
                                     scope:(NSString *)scope