Refresh token only when the old one is expired

nordcloud · Jul 22, 2020 · 897f95a · 897f95a
1 parent f641268
commit 897f95a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/auth/auth.go b/auth/auth.go
@@ -140,6 +140,7 @@ func (c *CognitoAuth) getTokenFromFile() *CognitoToken {
 	if err != nil {
 		return nil
 	}
+	defer file.Close()
 
 	b, err := ioutil.ReadAll(file)
 	if err != nil {
@@ -155,8 +156,7 @@ func (c *CognitoAuth) getTokenFromFile() *CognitoToken {
 	}
 	token.auth = c
 
-	//Refresh token 2 minutes before expiration
-	if token.ExpirationDate.Before(time.Now().Add(2 * time.Minute)) {
+	if token.ExpirationDate.Before(time.Now()) {
 		os.Remove(fileName)
 		return nil
 	}
@@ -171,6 +171,7 @@ func (c *CognitoAuth) saveToken(token CognitoToken) {
 		log.Warn("Failed to open or create file token", err.Error())
 		return
 	}
+	defer file.Close()
 
 	data, _ := json.Marshal(token)
 	err = file.Truncate(0)
@@ -183,7 +184,6 @@ func (c *CognitoAuth) saveToken(token CognitoToken) {
 		log.Warn("Failed to write to file token", err.Error())
 		return
 	}
-	file.Close()
 }
 
 func (c *CognitoAuth) getTokenPath() string {

diff --git a/auth/template.go b/auth/template.go
@@ -27,7 +27,7 @@ var templateBody = `
   </head>
 
   <body>
-	<h1>Login process complete, you can now close the window</h1>
+	<h1>Login process complete, you can now close this window</h1>
     <div id="app"></div>
     <script src="./cognitohosteduilauncher.js"></script>
   </body>