Skip to content

#1222 Add id tokens refresh on expiry #1263

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
tomholub merged 1 commit into from
Dec 30, 2021
Merged

#1222 Add id tokens refresh on expiry #1263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions FlowCrypt/Functionality/Services/GoogleUserService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ struct IdToken: Codable {
}

extension IdToken {
var isExpired: Bool {
Double(exp) < Date().timeIntervalSince1970
var expiryDuration: Double {
Date(timeIntervalSince1970: Double(exp)).timeIntervalSinceNow
}
}

Expand Down Expand Up @@ -254,12 +254,12 @@ extension GoogleUserService {

// MARK: - Tokens
extension GoogleUserService {
func getCachedOrRefreshedIdToken() async throws -> String {
func getCachedOrRefreshedIdToken(minExpiryDuration: Double = 0) async throws -> String {
guard let idToken = idToken else { throw(IdTokenError.missingToken) }

let decodedToken = try decode(idToken: idToken)

guard !decodedToken.isExpired else {
guard decodedToken.expiryDuration > minExpiryDuration else {
let (_, updatedToken) = try await performTokenRefresh()
return updatedToken
}
Expand Down