gracefully handle expired auth sessions

cmd/auth/login.go

@@ -3,6 +3,7 @@ package auth
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"time"
 
 	"github.com/briandowns/spinner"
@@ -67,9 +68,24 @@ func newLoginCommand(cli labcli.CLI) *cobra.Command {
 
 func runLogin(ctx context.Context, cli labcli.CLI, opts loginOptions) error {
 	if cli.Config().SessionID != "" && cli.Config().AccessToken != "" {
-		return labcli.NewStatusError(1,
-			"Already logged in. Use 'labctl auth logout' first if you want to log in as a different user.",
-		)
+		if _, err := cli.Client().GetMe(ctx); err == nil {
+			return labcli.NewStatusError(1,
+				"Already logged in. Use 'labctl auth logout' first if you want to log in as a different user.",
+			)
+		}
+
+		// Cleaning the expired session.
+		if err := ssh.RemoveIdentity(cli.Config().SSHDir); err != nil {
+			slog.Debug("Could not remove SSH identity file", "error", err.Error())
+		}
+
+		cli.Config().SessionID = ""
+		cli.Config().AccessToken = ""
+		if err := cli.Config().Dump(); err != nil {
+			return err
+		}
+
+		cli.Client().SetCredentials("", "")
 	}
 
 	if opts.sessionID != "" && opts.accessToken != "" {

cmd/auth/logout.go

@@ -2,10 +2,12 @@ package auth
 
 import (
 	"context"
+	"errors"
 	"log/slog"
 
 	"github.com/spf13/cobra"
 
+	"github.com/iximiuz/labctl/internal/api"
 	"github.com/iximiuz/labctl/internal/labcli"
 	"github.com/iximiuz/labctl/internal/ssh"
 )
@@ -28,9 +30,11 @@ func runLogout(ctx context.Context, cli labcli.CLI) error {
 		return nil
 	}
 
-	// TODO: Check HTTP 404 explicitly to handle the case when the session is already deleted.
 	if err := cli.Client().DeleteSession(ctx, cli.Config().SessionID); err != nil {
-		return err
+		if !errors.Is(err, api.ErrAuthenticationRequired) {
+			slog.Warn("Failed to delete session", "error", err.Error())
+			return err
+		}
 	}
 
 	if err := ssh.RemoveIdentity(cli.Config().SSHDir); err != nil {

cmd/auth/whoami.go

@@ -2,7 +2,9 @@ package auth
 
 import (
 	"context"
+	"errors"
 
+	"github.com/iximiuz/labctl/internal/api"
 	"github.com/iximiuz/labctl/internal/labcli"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
@@ -29,6 +31,11 @@ func runWhoAmI(ctx context.Context, cli labcli.CLI) error {
 
 	me, err := cli.Client().GetMe(ctx)
 	if err != nil {
+		if errors.Is(err, api.ErrAuthenticationRequired) {
+			cli.PrintErr("Authentication session expired. Please log in again: labctl auth login\n")
+			return nil
+		}
+
 		return err
 	}
 

internal/api/client.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -13,6 +14,12 @@ import (
 	"strings"
 )
 
+var ErrAuthenticationRequired = errors.New("authentication required")
+
+func isAuthenticationRequiredResponse(resp *http.Response) bool {
+	return resp.StatusCode == http.StatusUnauthorized
+}
+
 type Client struct {
 	baseURL    string
 	apiBaseURL string
@@ -345,6 +352,11 @@ func (c *Client) doRequest(req *http.Request) (*http.Response, error) {
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 		body, _ := io.ReadAll(resp.Body)
 		resp.Body.Close()
+
+		if isAuthenticationRequiredResponse(resp) {
+			return nil, ErrAuthenticationRequired
+		}
+
 		return nil, fmt.Errorf("request failed with status %d: %s", resp.StatusCode, body)
 	}
 

internal/api/sessions.go

@@ -31,5 +31,6 @@ func (c *Client) DeleteSession(ctx context.Context, id string) error {
 	if err != nil {
 		return err
 	}
+
 	return resp.Body.Close()
 }