suggestions from review

NBISweden · Jan 24, 2025 · b3e2c67 · b3e2c67
1 parent cb8bd2f
commit b3e2c67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/helpers/helpers.go b/helpers/helpers.go
@@ -398,26 +398,26 @@ func CheckTokenExpiration(accessToken string) error {
 	}
 
 	switch untilExp := time.Until(expiration); {
-	case untilExp < 0:
+	case untilExp <= 0:
 		return fmt.Errorf("the provided access token has expired, please renew it")
-	case untilExp >= 0 && untilExp < 2*time.Hour:
+	case untilExp > 0 && untilExp < 2*time.Hour:
 		fmt.Fprintf(
 			os.Stderr,
-			"WARNING! The provided access token expires in only %d hours and %d minutes.\n",
+			"WARNING! The provided access token expires in only %d hour and %d minutes.\n",
 			int(untilExp.Hours()), int(untilExp.Minutes())-(int(untilExp.Hours())*60),
 		)
 		fmt.Fprintln(os.Stderr, "Consider renewing the token.")
 	case untilExp >= 2*time.Hour && untilExp < 24*time.Hour:
 		fmt.Fprintf(
 			os.Stderr,
-			"The provided access token expires in %d hours and %d minutes (at %d:%d).\n",
-			int(untilExp.Hours()), int(untilExp.Minutes())-(int(untilExp.Hours())*60), expiration.Hour(), expiration.Minute(),
+			"The provided access token expires in %d hours and %d minutes.\n",
+			int(untilExp.Hours()), int(untilExp.Minutes())-(int(untilExp.Hours())*60),
 		)
 		fmt.Fprintln(os.Stderr, "Consider renewing the token.")
 	default:
 		fmt.Fprintf(
 			os.Stderr,
-			"The provided access token expires on %s.\n", expiration.Format("2006-01-02"),
+			"The provided access token expires on %s.\n", expiration.Format(time.RFC1123),
 		)
 	}
 

diff --git a/helpers/helpers_test.go b/helpers/helpers_test.go
@@ -341,7 +341,7 @@ func (suite *HelperTests) TestTokenExpiration() {
 	out, _ := io.ReadAll(r)
 	os.Stderr = storeStderr
 
-	msg := "WARNING! The provided access token expires in only 0 hours and 59 minutes."
+	msg := "WARNING! The provided access token expires in only 0 hour and 59 minutes."
 	assert.Contains(suite.T(), string(out), msg)
 
 	// Token with valid expiration, more than a day
@@ -359,7 +359,7 @@ func (suite *HelperTests) TestTokenExpiration() {
 	out, _ = io.ReadAll(r)
 	os.Stderr = storeStderr
 
-	msg = "The provided access token expires on " + exp.Format("2006-01-02")
+	msg = "The provided access token expires on " + exp.Format(time.RFC1123)
 	assert.Contains(suite.T(), string(out), msg)
 }