Skip to content

Use NSTimeIntervalSince1970 to replace timeIntervalSinceReferenceDate #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alex-4-Git merged 2 commits into from
Sep 22, 2022
Merged

Use NSTimeIntervalSince1970 to replace timeIntervalSinceReferenceDate #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37aaa08
Use 1970 as the start of time interval.
Alex-4-Git Sep 22, 2022
7a7f5cb
Comments improvement.
Alex-4-Git Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions GoogleSignIn/Tests/Unit/GIDAuthenticationTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
- (GIDAuthentication *)auth {
NSString *idToken = [self idToken];
NSNumber *accessTokenExpiresIn =
@(_accessTokenExpireTime - [[NSDate date] timeIntervalSinceReferenceDate]);
@(_accessTokenExpireTime - [[NSDate date] timeIntervalSince1970]);
OIDTokenRequest *tokenRequest =
[OIDTokenRequest testInstanceWithAdditionalParameters:_additionalTokenRequestParameters];
OIDTokenResponse *tokenResponse =
Expand All @@ -570,7 +570,7 @@ - (NSString *)idTokenWithExpireTime:(NSTimeInterval)expireTime {
if (!_hasIDToken) {
return nil;
}
return [OIDTokenResponse idTokenWithSub:kUserID exp:@(expireTime + NSTimeIntervalSince1970)];
return [OIDTokenResponse idTokenWithSub:kUserID exp:@(expireTime)];
}

- (NSString *)idToken {
Expand All @@ -595,7 +595,7 @@ - (GIDAuthentication *)observedAuth {
}

- (OIDTokenResponse *)tokenResponseWithNewTokens {
NSNumber *expiresIn = @(kNewExpireTime - [NSDate timeIntervalSinceReferenceDate]);
NSNumber *expiresIn = @(kNewExpireTime - [[NSDate date] timeIntervalSince1970]);
return [OIDTokenResponse testInstanceWithIDToken:(_hasIDToken ? [self idTokenNew] : nil)
accessToken:kNewAccessToken
expiresIn:expiresIn
Expand All @@ -607,7 +607,7 @@ - (NSError *)fakeError {
}

- (void)assertDate:(NSDate *)date equalTime:(NSTimeInterval)time {
XCTAssertEqualWithAccuracy([date timeIntervalSinceReferenceDate], time, kTimeAccuracy);
XCTAssertEqualWithAccuracy([date timeIntervalSince1970], time, kTimeAccuracy);
}

- (void)assertOldAccessTokenInAuth:(GIDAuthentication *)auth {
Expand Down Expand Up @@ -643,8 +643,8 @@ - (void)setTokensExpireTime:(NSTimeInterval)fromNow {
}

- (void)setExpireTimeForAccessToken:(NSTimeInterval)accessExpire IDToken:(NSTimeInterval)idExpire {
_accessTokenExpireTime = [[NSDate date] timeIntervalSinceReferenceDate] + accessExpire;
_idTokenExpireTime = [[NSDate date] timeIntervalSinceReferenceDate] + idExpire;
_accessTokenExpireTime = [[NSDate date] timeIntervalSince1970] + accessExpire;
_idTokenExpireTime = [[NSDate date] timeIntervalSince1970] + idExpire;
}

- (void)verifyTokensRefreshedWithMethod:(SEL)sel {
Expand Down
9 changes: 5 additions & 4 deletions GoogleSignIn/Tests/Unit/GIDGoogleUserTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ - (void)testLegacyCoding {
#endif // TARGET_OS_IOS || TARGET_OS_MACCATALYST

- (void)testUpdateAuthState {
NSTimeInterval accessTokenExpireTime = [NSDate timeIntervalSinceReferenceDate];
NSTimeInterval accessTokenExpireTime = [[NSDate date] timeIntervalSince1970];
NSTimeInterval idTokenExpireTime = accessTokenExpireTime + kTimeIncrement;

NSString *idToken = [self idTokenWithExpireTime:idTokenExpireTime];
Expand All @@ -120,18 +120,19 @@ - (void)testUpdateAuthState {
[user updateAuthState:updatedAuthState profileData:updatedProfileData];

XCTAssertEqualObjects(user.accessToken.tokenString, kNewAccessToken);
XCTAssertEqualWithAccuracy([user.accessToken.expirationDate timeIntervalSinceReferenceDate],
XCTAssertEqualWithAccuracy([user.accessToken.expirationDate timeIntervalSince1970],
updatedAccessTokenExpireTime, kTimeAccuracy);
XCTAssertEqualObjects(user.idToken.tokenString, updatedIDToken);
XCTAssertEqualWithAccuracy([user.idToken.expirationDate timeIntervalSinceReferenceDate],
XCTAssertEqualWithAccuracy([user.idToken.expirationDate timeIntervalSince1970],
updatedIDTokenExpireTime, kTimeAccuracy);
XCTAssertEqual(user.profile, updatedProfileData);
}

#pragma mark - Helpers

// The expireTime should be based on 1970.
- (NSString *)idTokenWithExpireTime:(NSTimeInterval)expireTime {
return [OIDTokenResponse idTokenWithSub:kUserID exp:@(expireTime + NSTimeIntervalSince1970)];
return [OIDTokenResponse idTokenWithSub:kUserID exp:@(expireTime)];
}

@end
2 changes: 1 addition & 1 deletion GoogleSignIn/Tests/Unit/OIDAuthState+Testing.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ + (instancetype)testInstanceWithIDToken:(NSString *)idToken
accessToken:(NSString *)accessToken
accessTokenExpireTime:(NSTimeInterval)accessTokenExpireTime {
NSNumber *accessTokenExpiresIn =
@(accessTokenExpireTime - [[NSDate date] timeIntervalSinceReferenceDate]);
@(accessTokenExpireTime - [[NSDate date] timeIntervalSince1970]);
OIDTokenResponse *newResponse =
[OIDTokenResponse testInstanceWithIDToken:idToken
accessToken:accessToken
Expand Down
4 changes: 4 additions & 0 deletions GoogleSignIn/Tests/Unit/OIDTokenResponse+Testing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ extern NSString * const kFatPictureURL;

+ (NSString *)fatIDToken;

/**
* @sub The subject of the ID token.
* @exp The interval between 00:00:00 UTC on 1 January 1970 and the expiration date of the ID token.
*/
+ (NSString *)idTokenWithSub:(NSString *)sub exp:(NSNumber *)exp;

+ (NSString *)idTokenWithSub:(NSString *)sub exp:(NSNumber *)exp fat:(BOOL)fat;
Expand Down