Deduplicate token resolution and use pretty-print in admin commands

cmd/admin/organizations.go

@@ -14,6 +14,7 @@ import (
 	"fmt"
 
 	"github.com/adobe/imscli/ims"
+	"github.com/adobe/imscli/output"
 	"github.com/spf13/cobra"
 )
 
@@ -32,7 +33,7 @@ func OrganizationsCmd(imsConfig *ims.Config) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("error in get admin organizations cmd: %w", err)
 			}
-			fmt.Println(resp)
+			output.PrintPrettyJSON(resp)
 			return nil
 		},
 	}

cmd/admin/profile.go

@@ -14,6 +14,7 @@ import (
 	"fmt"
 
 	"github.com/adobe/imscli/ims"
+	"github.com/adobe/imscli/output"
 	"github.com/spf13/cobra"
 )
 
@@ -30,7 +31,7 @@ func ProfileCmd(imsConfig *ims.Config) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("error in get admin profile cmd: %w", err)
 			}
-			fmt.Println(resp)
+			output.PrintPrettyJSON(resp)
 			return nil
 		},
 	}

ims/config.go

@@ -11,7 +11,10 @@
 package ims
 
 import (
+	"fmt"
 	"net/url"
+
+	"github.com/adobe/ims-go/ims"
 )
 
 type Config struct {
@@ -61,6 +64,23 @@ type RefreshInfo struct {
 	RefreshToken string
 }
 
+func (i Config) resolveToken() (string, ims.TokenType, error) {
+	switch {
+	case i.AccessToken != "":
+		return i.AccessToken, ims.AccessToken, nil
+	case i.RefreshToken != "":
+		return i.RefreshToken, ims.RefreshToken, nil
+	case i.DeviceToken != "":
+		return i.DeviceToken, ims.DeviceToken, nil
+	case i.ServiceToken != "":
+		return i.ServiceToken, ims.ServiceToken, nil
+	case i.AuthorizationCode != "":
+		return i.AuthorizationCode, ims.AuthorizationCode, nil
+	default:
+		return "", "", fmt.Errorf("no token provided")
+	}
+}
+
 func validateURL(u string) bool {
 	parsedURL, err := url.Parse(u)
 	if err != nil {

ims/invalidate.go

@@ -68,23 +68,8 @@ func (i Config) InvalidateToken() error {
 		return fmt.Errorf("create client: %w", err)
 	}
 
-	var token string
-	var tokenType ims.TokenType
-
-	switch {
-	case i.AccessToken != "":
-		token = i.AccessToken
-		tokenType = ims.AccessToken
-	case i.RefreshToken != "":
-		token = i.RefreshToken
-		tokenType = ims.RefreshToken
-	case i.DeviceToken != "":
-		token = i.DeviceToken
-		tokenType = ims.DeviceToken
-	case i.ServiceToken != "":
-		token = i.ServiceToken
-		tokenType = ims.ServiceToken
-	default:
+	token, tokenType, err := i.resolveToken()
+	if err != nil {
 		return fmt.Errorf("unexpected error, broken parameter validation")
 	}
 

ims/validate.go

@@ -69,23 +69,8 @@ func (i Config) ValidateToken() (TokenInfo, error) {
 		return TokenInfo{}, fmt.Errorf("create client: %w", err)
 	}
 
-	var token string
-	var tokenType ims.TokenType
-
-	switch {
-	case i.AccessToken != "":
-		token = i.AccessToken
-		tokenType = ims.AccessToken
-	case i.RefreshToken != "":
-		token = i.RefreshToken
-		tokenType = ims.RefreshToken
-	case i.DeviceToken != "":
-		token = i.DeviceToken
-		tokenType = ims.DeviceToken
-	case i.AuthorizationCode != "":
-		token = i.AuthorizationCode
-		tokenType = ims.AuthorizationCode
-	default:
+	token, tokenType, err := i.resolveToken()
+	if err != nil {
 		return TokenInfo{}, fmt.Errorf("unexpected error, broken validation")
 	}