fix: use refresh tokens in curl commands for user token flow (#981)

Author: Benjosh95

internal/cmd/auth/get-access-token/get_access_token.go

@@ -45,7 +45,8 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 
 			accessToken, err := auth.GetValidAccessToken(params.Printer)
 			if err != nil {
-				return err
+				params.Printer.Debug(print.ErrorLevel, "get valid access token: %v", err)
+				return &cliErr.SessionExpiredError{}
 			}
 
 			switch model.OutputFormat {

internal/cmd/curl/curl.go

@@ -181,17 +181,10 @@ func getBearerToken(p *print.Printer) (string, error) {
 		return "", &errors.SessionExpiredError{}
 	}
 
-	accessToken, err := auth.GetAccessToken()
+	accessToken, err := auth.GetValidAccessToken(p)
 	if err != nil {
-		return "", err
-	}
-
-	accessTokenExpired, err := auth.TokenExpired(accessToken)
-	if err != nil {
-		return "", err
-	}
-	if accessTokenExpired {
-		return "", &errors.AccessTokenExpiredError{}
+		p.Debug(print.ErrorLevel, "get valid access token: %v", err)
+		return "", &errors.SessionExpiredError{}
 	}
 
 	return accessToken, nil

internal/pkg/auth/auth.go

@@ -202,7 +202,7 @@ func GetValidAccessToken(p *print.Printer) (string, error) {
 	// Refresh the tokens
 	err = refreshTokens(utf)
 	if err != nil {
-		return "", fmt.Errorf("refresh access token: %w", err)
+		return "", fmt.Errorf("access token and refresh token expired: %w", err)
 	}
 
 	// Return the new access token