Optimized token renewal

virtualzone · Aug 9, 2021 · 7d19c5d · 7d19c5d
1 parent 03114bd
commit 7d19c5d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/main.go b/main.go
@@ -86,10 +86,12 @@ func main() {
 			logError("Could not read secret store: " + err.Error())
 			return
 		}
-		logVerbose("Renewing access token...")
-		if _, err := client.RenewAccessToken(); err != nil {
-			logError("Could not renew access token: " + err.Error())
-			return
+		if client.ShouldRenewAccessToken() {
+			logVerbose("Renewing access token...")
+			if _, err := client.RenewAccessToken(); err != nil {
+				logError("Could not renew access token: " + err.Error())
+				return
+			}
 		}
 	}
 	cmdDef.Fn(client, args)

diff --git a/sdk/login.go b/sdk/login.go
@@ -93,6 +93,12 @@ func (client *Client) redeemCodeForAccessToken(code string) (*LoginRedeemCodeRes
 	return &json, nil
 }
 
+func (client *Client) ShouldRenewAccessToken() bool {
+	now := time.Now()
+	diff := now.Sub(client.SecretStore.Expiry)
+	return diff.Minutes() > -30
+}
+
 func (client *Client) RenewAccessToken() (*LoginRedeemCodeResponse, error) {
 	params := make(HTTPRequestParams)
 	params["client_id"] = client.Config.ClientID