Update tests to check receivedAtDate field where important

FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckToken+APIResponse.m

@@ -15,6 +15,7 @@
  */
 
 #import "FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckToken+APIResponse.h"
+#import "FirebaseAppCheck/Sources/Core/FIRAppCheckToken+Internal.h"
 
 #if __has_include(<FBLPromises/FBLPromises.h>)
 #import <FBLPromises/FBLPromises.h>
@@ -81,7 +82,7 @@ - (nullable instancetype)initWithResponseDict:(NSDictionary<NSString *, id> *)re
 
   NSDate *expirationDate = [requestDate dateByAddingTimeInterval:secondsToLive];
 
-  return [self initWithToken:token expirationDate:expirationDate];
+  return [self initWithToken:token expirationDate:expirationDate receivedAtDate:requestDate];
 }
 
 @end

FirebaseAppCheck/Sources/Core/FIRAppCheckToken+Internal.h

@@ -28,7 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// The designated initializer.
 /// @param token A Firebase App Check token.
 /// @param expirationDate A Firebase App Check token expiration date in the device local time.
-/// @param receivedAtDate A date when the Firebase App Check token was received in the device's local time.
+/// @param receivedAtDate A date when the Firebase App Check token was received in the device's
+/// local time.
 - (instancetype)initWithToken:(NSString *)token
                expirationDate:(NSDate *)expirationDate
                receivedAtDate:(NSDate *)receivedAtDate NS_DESIGNATED_INITIALIZER;

FirebaseAppCheck/Sources/Core/Storage/FIRAppCheckStoredToken+FIRAppCheckToken.m

@@ -27,7 +27,9 @@ - (void)updateWithToken:(FIRAppCheckToken *)token {
 }
 
 - (FIRAppCheckToken *)appCheckToken {
-  return [[FIRAppCheckToken alloc] initWithToken:self.token expirationDate:self.expirationDate receivedAtDate:self.receivedAtDate];
+  return [[FIRAppCheckToken alloc] initWithToken:self.token
+                                  expirationDate:self.expirationDate
+                                  receivedAtDate:self.receivedAtDate];
 }
 
 @end

FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckToken.h

@@ -33,8 +33,7 @@ NS_SWIFT_NAME(AppCheckToken)
 /// The default initializer.
 /// @param token A Firebase App Check token.
 /// @param expirationDate A Firebase App Check token expiration date in the device local time.
-- (instancetype)initWithToken:(NSString *)token
-               expirationDate:(NSDate *)expirationDate;
+- (instancetype)initWithToken:(NSString *)token expirationDate:(NSDate *)expirationDate;
 
 @end
 

FirebaseAppCheck/Tests/Unit/AppAttestProvider/FIRAppAttestAPIServiceTests.m

@@ -26,7 +26,7 @@
 #import "FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.h"
 #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckErrorUtil.h"
 #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckHTTPError.h"
-#import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckToken.h"
+#import "FirebaseAppCheck/Sources/Core/FIRAppCheckToken+Internal.h"
 
 #import "FirebaseAppCheck/Tests/Unit/Utils/FIRFixtureLoader.h"
 #import "SharedTestUtilities/Date/FIRDateTestUtils.h"
@@ -224,7 +224,8 @@ - (void)testGetAppCheckTokenSuccess {
                                     error:nil];
   // 2.2. Return token from parsed response.
   FIRAppCheckToken *expectedToken = [[FIRAppCheckToken alloc] initWithToken:@"app_check_token"
-                                                             expirationDate:[NSDate date]];
+                                                             expirationDate:[NSDate date]
+                                                             receivedAtDate:[NSDate date]];
   [self expectTokenWithAPIReponse:validAPIResponse toReturnToken:expectedToken];
 
   // 3. Send request.
@@ -240,6 +241,7 @@ - (void)testGetAppCheckTokenSuccess {
   XCTAssertEqualObjects(promise.value, expectedToken);
   XCTAssertEqualObjects(promise.value.token, expectedToken.token);
   XCTAssertEqualObjects(promise.value.expirationDate, expectedToken.expirationDate);
+  XCTAssertEqualObjects(promise.value.receivedAtDate, expectedToken.receivedAtDate);
 
   OCMVerifyAll(self.mockAPIService);
 }

FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckStorageTests.m

@@ -21,7 +21,7 @@
 #import <OCMock/OCMock.h>
 #import "FBLPromise+Testing.h"
 
-#import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckToken.h"
+#import "FirebaseAppCheck/Sources/Core/FIRAppCheckToken+Internal.h"
 
 @interface FIRAppCheckStorageTests : XCTestCase
 @property(nonatomic) NSString *appName;
@@ -47,7 +47,8 @@ - (void)tearDown {
 
 - (void)testSetAndGetToken {
   FIRAppCheckToken *tokenToStore = [[FIRAppCheckToken alloc] initWithToken:@"token"
-                                                            expirationDate:[NSDate distantPast]];
+                                                            expirationDate:[NSDate distantPast]
+                                                            receivedAtDate:[NSDate date]];
 
   FBLPromise *setPromise = [self.storage setToken:tokenToStore];
   XCTAssert(FBLWaitForPromisesWithTimeout(0.5));
@@ -58,6 +59,7 @@ - (void)testSetAndGetToken {
   XCTAssert(FBLWaitForPromisesWithTimeout(0.5));
   XCTAssertEqualObjects(getPromise.value.token, tokenToStore.token);
   XCTAssertEqualObjects(getPromise.value.expirationDate, tokenToStore.expirationDate);
+  XCTAssertEqualObjects(getPromise.value.receivedAtDate, tokenToStore.receivedAtDate);
   XCTAssertNil(getPromise.error);
 }
 
@@ -76,7 +78,8 @@ - (void)testRemoveToken {
 - (void)testSetTokenPerApp {
   // 1. Set token with a storage.
   FIRAppCheckToken *tokenToStore = [[FIRAppCheckToken alloc] initWithToken:@"token"
-                                                            expirationDate:[NSDate distantPast]];
+                                                            expirationDate:[NSDate distantPast]
+                                                            receivedAtDate:[NSDate date]];
 
   FBLPromise *setPromise = [self.storage setToken:tokenToStore];
   XCTAssert(FBLWaitForPromisesWithTimeout(0.5));

FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckStoredTokenTests.m

@@ -16,9 +16,9 @@
 
 #import <XCTest/XCTest.h>
 
+#import "FirebaseAppCheck/Sources/Core/FIRAppCheckToken+Internal.h"
 #import "FirebaseAppCheck/Sources/Core/Storage/FIRAppCheckStoredToken+FIRAppCheckToken.h"
 #import "FirebaseAppCheck/Sources/Core/Storage/FIRAppCheckStoredToken.h"
-#import "FirebaseAppCheck/Sources/Core/FIRAppCheckToken+Internal.h"
 
 #import <GoogleUtilities/GULSecureCoding.h>
 
@@ -53,7 +53,8 @@ - (void)testSecureCoding {
 
 - (void)testConvertingToAndFromFIRAppCheckToken {
   FIRAppCheckToken *originalToken = [[FIRAppCheckToken alloc] initWithToken:@"___"
-                                                             expirationDate:[NSDate date]];
+                                                             expirationDate:[NSDate date]
+                                                             receivedAtDate:[NSDate date]];
 
   FIRAppCheckStoredToken *storedToken = [[FIRAppCheckStoredToken alloc] init];
   [storedToken updateWithToken:originalToken];

FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderTests.m

@@ -19,9 +19,9 @@
 #import <OCMock/OCMock.h>
 #import "FBLPromise+Testing.h"
 
+#import "FirebaseAppCheck/Sources/Core/FIRAppCheckToken+Internal.h"
 #import "FirebaseAppCheck/Sources/DebugProvider/API/FIRAppCheckDebugProviderAPIService.h"
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProvider.h"
-#import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckToken.h"
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
@@ -130,7 +130,8 @@ - (void)testGetTokenSuccess {
   // 1. Stub API service.
   NSString *expectedDebugToken = [self.provider currentDebugToken];
   FIRAppCheckToken *validToken = [[FIRAppCheckToken alloc] initWithToken:@"valid_token"
-                                                          expirationDate:[NSDate date]];
+                                                          expirationDate:[NSDate date]
+                                                          receivedAtDate:[NSDate date]];
   OCMExpect([self.fakeAPIService appCheckTokenWithDebugToken:expectedDebugToken])
       .andReturn([FBLPromise resolvedWith:validToken]);
 
@@ -139,6 +140,7 @@ - (void)testGetTokenSuccess {
     XCTAssertNil(error);
     XCTAssertEqualObjects(token.token, validToken.token);
     XCTAssertEqualObjects(token.expirationDate, validToken.expirationDate);
+    XCTAssertEqualObjects(token.receivedAtDate, validToken.receivedAtDate);
   }];
 
   // 3. Verify fakes.

FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m

@@ -19,9 +19,9 @@
 #import <OCMock/OCMock.h>
 #import "FBLPromise+Testing.h"
 
+#import "FirebaseAppCheck/Sources/Core/FIRAppCheckToken+Internal.h"
 #import "FirebaseAppCheck/Sources/DeviceCheckProvider/API/FIRDeviceCheckAPIService.h"
 #import "FirebaseAppCheck/Sources/DeviceCheckProvider/FIRDeviceCheckTokenGenerator.h"
-#import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckToken.h"
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProvider.h"
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
@@ -90,7 +90,8 @@ - (void)testGetTokenSuccess {
 
   // 2. Expect FAA token to be requested.
   FIRAppCheckToken *validToken = [[FIRAppCheckToken alloc] initWithToken:@"valid_token"
-                                                          expirationDate:[NSDate distantFuture]];
+                                                          expirationDate:[NSDate distantFuture]
+                                                          receivedAtDate:[NSDate date]];
   OCMExpect([self.fakeAPIService appCheckTokenWithDeviceToken:deviceToken])
       .andReturn([FBLPromise resolvedWith:validToken]);
 
@@ -102,6 +103,7 @@ - (void)testGetTokenSuccess {
         [completionExpectation fulfill];
         XCTAssertEqualObjects(token.token, validToken.token);
         XCTAssertEqualObjects(token.expirationDate, validToken.expirationDate);
+        XCTAssertEqualObjects(token.receivedAtDate, validToken.receivedAtDate);
         XCTAssertNil(error);
       }];