feat: prettify json output using stackit curl

Author: h3adex

internal/cmd/curl/curl.go

@@ -2,6 +2,7 @@ package curl
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -104,6 +105,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			}
 
 			if model.FailOnHTTPError && resp.StatusCode >= 400 {
+				fmt.Println("failed!!")
 				os.Exit(22)
 			}
 			return nil
@@ -170,11 +172,29 @@ func getBearerToken(p *print.Printer) (string, error) {
 		p.Debug(print.ErrorLevel, "configure authentication: %v", err)
 		return "", &errors.AuthError{}
 	}
-	token, err := auth.GetAuthField(auth.ACCESS_TOKEN)
+
+	userSessionExpired, err := auth.UserSessionExpired()
+	if err != nil {
+		return "", err
+	}
+	if userSessionExpired {
+		return "", &errors.SessionExpiredError{}
+	}
+
+	accessToken, err := auth.GetAccessToken()
 	if err != nil {
-		return "", fmt.Errorf("get access token: %w", err)
+		return "", err
+	}
+
+	accessTokenExpired, err := auth.TokenExpired(accessToken)
+	if err != nil {
+		return "", err
+	}
+	if accessTokenExpired {
+		return "", &errors.AccessTokenExpiredError{}
 	}
-	return token, nil
+
+	return accessToken, nil
 }
 
 func buildRequest(model *inputModel, bearerToken string) (*http.Request, error) {
@@ -213,6 +233,22 @@ func outputResponse(p *print.Printer, model *inputModel, resp *http.Response) er
 	if err != nil {
 		return fmt.Errorf("read response body: %w", err)
 	}
+
+	if strings.Contains(strings.ToLower(string(respBody)), "jwt is expired") {
+		return &errors.SessionExpiredError{}
+	}
+
+	if strings.Contains(strings.ToLower(string(respBody)), "jwt is missing") {
+		return &errors.AuthError{}
+	}
+
+	var prettyJSON bytes.Buffer
+	if json.Valid(respBody) {
+		if err := json.Indent(&prettyJSON, respBody, "", "  "); err == nil {
+			respBody = prettyJSON.Bytes()
+		} // if indenting fails, fall back to original body
+	}
+
 	output = append(output, respBody...)
 
 	if model.OutputFile == nil {

internal/cmd/curl/curl_test.go

@@ -4,8 +4,10 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"io"
 	"net/http"
 	"os"
+	"strings"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -427,6 +429,14 @@ func TestOutputResponse(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "expired jwt curl",
+			args: args{
+				model: fixtureInputModel(),
+				resp:  &http.Response{Body: io.NopCloser(strings.NewReader("Jwt is expired"))},
+			},
+			wantErr: true,
+		},
 	}
 	p := print.NewPrinter()
 	p.Cmd = NewCmd(p)