fix: handling of tokens revoked before expiration (jsdelivr#134)

Co-authored-by: Martin Kolárik <[email protected]>
radulucut · Sep 25, 2024 · 8cfd0de · 8cfd0de
1 parent be19e61
commit 8cfd0de
Show file tree

Hide file tree

Showing 12 changed files with 546 additions and 150 deletions.
diff --git a/cmd/auth.go b/cmd/auth.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"errors"
+	"math"
 	"syscall"
 
 	"github.com/jsdelivr/globalping-cli/globalping"
@@ -89,7 +90,7 @@ func (r *Root) RunAuthStatus(cmd *cobra.Command, args []string) error {
 	res, err := r.client.TokenIntrospection("")
 	if err != nil {
 		e, ok := err.(*globalping.AuthorizeError)
-		if ok && e.ErrorType == "not_authorized" {
+		if ok && e.ErrorType == globalping.ErrTypeNotAuthorized {
 			r.printer.Println("Not logged in.")
 			return nil
 		}
@@ -131,6 +132,7 @@ func (r *Root) loginWithToken() error {
 	profile := r.storage.GetProfile()
 	profile.Token = &globalping.Token{
 		AccessToken: token,
+		Expiry:      r.utils.Now().Add(math.MaxInt64),
 	}
 	err = r.storage.SaveConfig()
 	if err != nil {

diff --git a/cmd/auth_test.go b/cmd/auth_test.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"bytes"
 	"context"
+	"math"
 	"os"
 	"syscall"
 	"testing"
@@ -23,6 +24,9 @@ func Test_Auth_Login_WithToken(t *testing.T) {
 
 	gbMock := mocks.NewMockClient(ctrl)
 
+	utilsMock := mocks.NewMockUtils(ctrl)
+	utilsMock.EXPECT().Now().Return(defaultCurrentTime).AnyTimes()
+
 	w := new(bytes.Buffer)
 	r := new(bytes.Buffer)
 	r.WriteString("token\n")
@@ -39,7 +43,7 @@ func Test_Auth_Login_WithToken(t *testing.T) {
 		RefreshToken: "oldRefreshToken",
 	}
 
-	root := NewRoot(printer, ctx, nil, nil, gbMock, nil, _storage)
+	root := NewRoot(printer, ctx, nil, utilsMock, gbMock, nil, _storage)
 
 	gbMock.EXPECT().TokenIntrospection("token").Return(&globalping.IntrospectionResponse{
 		Active:   true,
@@ -59,6 +63,7 @@ Logged in as test.
 	assert.Equal(t, &storage.Profile{
 		Token: &globalping.Token{
 			AccessToken: "token",
+			Expiry:      defaultCurrentTime.Add(math.MaxInt64),
 		},
 	}, profile)
 }

diff --git a/cmd/root.go b/cmd/root.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"math"
 	"os"
 	"os/signal"
 	"syscall"
@@ -49,12 +50,19 @@ func Execute() {
 		Limit:          1,
 	}
 	t := time.NewTicker(10 * time.Second)
+	token := profile.Token
+	if config.GlobalpingToken != "" {
+		token = &globalping.Token{
+			AccessToken: config.GlobalpingToken,
+			ExpiresIn:   math.MaxInt64,
+			Expiry:      time.Now().Add(math.MaxInt64),
+		}
+	}
 	globalpingClient := globalping.NewClientWithCacheCleanup(globalping.Config{
-		APIURL:          config.GlobalpingAPIURL,
-		AuthURL:         config.GlobalpingAuthURL,
-		DashboardURL:    config.GlobalpingDashboardURL,
-		AuthAccessToken: config.GlobalpingToken,
-		AuthToken:       profile.Token,
+		APIURL:       config.GlobalpingAPIURL,
+		AuthURL:      config.GlobalpingAuthURL,
+		DashboardURL: config.GlobalpingDashboardURL,
+		AuthToken:    token,
 		OnTokenRefresh: func(token *globalping.Token) {
 			profile.Token = token
 			err := localStorage.SaveConfig()