Functions: don't send dummy FAC token (#8558)

* Functions: don't send dummy FAC token tests

* more tests

* fix

* formatting

* Changelog

* Fix changelog version

* Cleanup Xcode 11 workaround in tests

* style

Author: maksymmalyhin

Functions/CHANGELOG.md

@@ -1,5 +1,6 @@
 # v8.7.0
 - [fixed] Add watchOS support (#8499).
+- [changed] Don't set the App Check header in the case of App Check error (#8558).
 
 # v8.3.0
 - [fixed] Fixed an issue where subclassing Functions was unusable (#8265).

Functions/Example/Tests/FIRFunctionsTests.m

@@ -151,7 +151,7 @@ - (void)testSetEmulatorSettings {
 
 #pragma mark - App Check integration
 
-- (void)testCallFunctionWhenAppCheckIsInstalled {
+- (void)testCallFunctionWhenAppCheckIsInstalledAndFACTokenSuccess {
   _appCheckFake.tokenResult = [[FIRAppCheckTokenResultFake alloc] initWithToken:@"valid_token"
                                                                           error:nil];
 
@@ -161,12 +161,8 @@ - (void)testCallFunctionWhenAppCheckIsInstalled {
 
   XCTestExpectation *httpRequestExpectation =
       [self expectationWithDescription:@"HTTPRequestExpectation"];
-  __weak __auto_type weakSelf = self;
   _fetcherService.testBlock = ^(GTMSessionFetcher *_Nonnull fetcherToTest,
                                 GTMSessionFetcherTestResponse _Nonnull testResponse) {
-    // Fixes retain cycle warning for Xcode 11 and earlier.
-    // __unused to avoid warning in Xcode 12+.
-    __unused __auto_type self = weakSelf;
     [httpRequestExpectation fulfill];
 
     NSString *appCheckTokenHeader =
@@ -189,6 +185,39 @@ - (void)testCallFunctionWhenAppCheckIsInstalled {
   [self waitForExpectations:@[ httpRequestExpectation, completionExpectation ] timeout:1.5];
 }
 
+- (void)testCallFunctionWhenAppCheckIsInstalledAndFACTokenError {
+  NSError *appCheckError = [NSError errorWithDomain:self.name code:-1 userInfo:nil];
+  _appCheckFake.tokenResult = [[FIRAppCheckTokenResultFake alloc] initWithToken:@"dummy_token"
+                                                                          error:appCheckError];
+
+  NSError *networkError = [NSError errorWithDomain:self.name code:-2 userInfo:nil];
+
+  XCTestExpectation *httpRequestExpectation =
+      [self expectationWithDescription:@"HTTPRequestExpectation"];
+  _fetcherService.testBlock = ^(GTMSessionFetcher *_Nonnull fetcherToTest,
+                                GTMSessionFetcherTestResponse _Nonnull testResponse) {
+    [httpRequestExpectation fulfill];
+
+    NSString *appCheckTokenHeader =
+        [fetcherToTest.request valueForHTTPHeaderField:@"X-Firebase-AppCheck"];
+    XCTAssertNil(appCheckTokenHeader);
+
+    testResponse(nil, nil, networkError);
+  };
+
+  XCTestExpectation *completionExpectation =
+      [self expectationWithDescription:@"completionExpectation"];
+  [_functions callFunction:@"fake_func"
+                withObject:nil
+                   timeout:10
+                completion:^(FIRHTTPSCallableResult *_Nullable result, NSError *_Nullable error) {
+                  XCTAssertEqualObjects(error, networkError);
+                  [completionExpectation fulfill];
+                }];
+
+  [self waitForExpectations:@[ httpRequestExpectation, completionExpectation ] timeout:1.5];
+}
+
 - (void)testCallFunctionWhenAppCheckIsNotInstalled {
   NSError *networkError = [NSError errorWithDomain:@"testCallFunctionWhenAppCheckIsInstalled"
                                               code:-1
@@ -197,12 +226,8 @@ - (void)testCallFunctionWhenAppCheckIsNotInstalled {
   XCTestExpectation *httpRequestExpectation =
       [self expectationWithDescription:@"HTTPRequestExpectation"];
 
-  __weak __auto_type weakSelf = self;
   _fetcherService.testBlock = ^(GTMSessionFetcher *_Nonnull fetcherToTest,
                                 GTMSessionFetcherTestResponse _Nonnull testResponse) {
-    // Fixes retain cycle warning for Xcode 11 and earlier.
-    // __unused to avoid warning in Xcode 12+.
-    __unused __auto_type self = weakSelf;
     [httpRequestExpectation fulfill];
 
     NSString *appCheckTokenHeader =

Functions/Example/Tests/FUNContextProviderTests.m

@@ -132,8 +132,8 @@ - (void)testContextWithAppCheckOnlyError {
     XCTAssertNil(error);
     XCTAssertNil(context.authToken);
     XCTAssertNil(context.FCMToken);
-    // Expect a dummy token to be passed even in the case of app check error.
-    XCTAssertEqualObjects(context.appCheckToken, self.appCheckTokenError.token);
+    // Don't expect any token in the case of App Check error.
+    XCTAssertNil(context.appCheckToken);
     [expectation fulfill];
   }];
 
@@ -181,8 +181,8 @@ - (void)testAllContextsAuthAndAppCheckError {
 
     XCTAssertNil(context.authToken);
     XCTAssert([context.FCMToken isEqualToString:self.messagingFake.FCMToken]);
-    // Expect a dummy token to be passed even in the case of app check error.
-    XCTAssertEqualObjects(context.appCheckToken, self.appCheckTokenError.token);
+    // Don't expect any token in the case of App Check error.
+    XCTAssertNil(context.appCheckToken);
     [expectation fulfill];
   }];
 

Functions/FirebaseFunctions/FUNContext.m

@@ -101,7 +101,10 @@ - (void)getContext:(void (^)(FUNContext *context, NSError *_Nullable error))comp
 
     [_appCheck getTokenForcingRefresh:NO
                            completion:^(id<FIRAppCheckTokenResultInterop> _Nonnull tokenResult) {
-                             appCheckToken = tokenResult.token;
+                             // Send only valid token to functions.
+                             if (tokenResult.error == nil) {
+                               appCheckToken = tokenResult.token;
+                             }
 
                              dispatch_group_leave(dispatchGroup);
                            }];