remove util file

cmd/cmd.go

@@ -13,7 +13,11 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"unicode"
 
+	"github.com/google/uuid"
+	"github.com/micro/micro/v3/client/cli/namespace"
+	clitoken "github.com/micro/micro/v3/client/cli/token"
 	"github.com/micro/micro/v3/client/cli/util"
 	_ "github.com/micro/micro/v3/cmd/usage"
 	"github.com/micro/micro/v3/plugin"
@@ -24,6 +28,7 @@ import (
 	"github.com/micro/micro/v3/service/config"
 	configCli "github.com/micro/micro/v3/service/config/client"
 	storeConf "github.com/micro/micro/v3/service/config/store"
+	"github.com/micro/micro/v3/service/errors"
 	"github.com/micro/micro/v3/service/events"
 	"github.com/micro/micro/v3/service/logger"
 	"github.com/micro/micro/v3/service/metrics"
@@ -266,6 +271,164 @@ func setupDefaults() {
 	runtime.DefaultRuntime = runtimeSrv.NewRuntime()
 }
 
+func formatErr(err error) string {
+	switch v := err.(type) {
+	case *errors.Error:
+		return upcaseInitial(v.Detail)
+	default:
+		return upcaseInitial(err.Error())
+	}
+}
+
+func upcaseInitial(str string) string {
+	for i, v := range str {
+		return string(unicode.ToUpper(v)) + str[i+1:]
+	}
+	return ""
+}
+
+// setupAuthForCLI handles exchanging refresh tokens to access tokens
+// The structure of the local micro userconfig file is the following:
+// micro.auth.[envName].token: temporary access token
+// micro.auth.[envName].refresh-token: long lived refresh token
+// micro.auth.[envName].expiry: expiration time of the access token, seconds since Unix epoch.
+func setupAuthForCLI(ctx *cli.Context) error {
+	env, err := util.GetEnv(ctx)
+	if err != nil {
+		return err
+	}
+	ns, err := namespace.Get(env.Name)
+	if err != nil {
+		return err
+	}
+
+	tok, err := clitoken.Get(ctx)
+	if err != nil {
+		return err
+	}
+
+	// If there is no refresh token, do not try to refresh it
+	if len(tok.RefreshToken) == 0 {
+		return nil
+	}
+
+	// Check if token is valid
+	if time.Now().Before(tok.Expiry.Add(time.Minute * -1)) {
+		auth.DefaultAuth.Init(
+			auth.ClientToken(tok),
+			auth.Issuer(ns),
+		)
+		return nil
+	}
+
+	// Get new access token from refresh token if it's close to expiry
+	tok, err = auth.Token(
+		auth.WithToken(tok.RefreshToken),
+		auth.WithTokenIssuer(ns),
+		auth.WithExpiry(time.Minute*10),
+	)
+	if err != nil {
+		return nil
+	}
+
+	// Save the token to user config file
+	auth.DefaultAuth.Init(
+		auth.ClientToken(tok),
+		auth.Issuer(ns),
+	)
+	return clitoken.Save(ctx, tok)
+}
+
+// setupAuthForService generates auth credentials for the service
+func setupAuthForService() error {
+	opts := auth.DefaultAuth.Options()
+
+	// extract the account creds from options, these can be set by flags
+	accID := opts.ID
+	accSecret := opts.Secret
+
+	// if no credentials were provided, self generate an account
+	if len(accID) == 0 || len(accSecret) == 0 {
+		opts := []auth.GenerateOption{
+			auth.WithType("service"),
+			auth.WithScopes("service"),
+		}
+
+		acc, err := auth.Generate(uuid.New().String(), opts...)
+		if err != nil {
+			return err
+		}
+		if logger.V(logger.DebugLevel, logger.DefaultLogger) {
+			logger.Debugf("Auth [%v] Generated an auth account", auth.DefaultAuth.String())
+		}
+
+		accID = acc.ID
+		accSecret = acc.Secret
+	}
+
+	// generate the first token
+	token, err := auth.Token(
+		auth.WithCredentials(accID, accSecret),
+		auth.WithExpiry(time.Minute*10),
+	)
+	if err != nil {
+		return err
+	}
+
+	// set the credentials and token in auth options
+	auth.DefaultAuth.Init(
+		auth.ClientToken(token),
+		auth.Credentials(accID, accSecret),
+	)
+	return nil
+}
+
+// refreshAuthToken if it is close to expiring
+func refreshAuthToken() {
+	// can't refresh a token we don't have
+	if auth.DefaultAuth.Options().Token == nil {
+		return
+	}
+
+	t := time.NewTicker(time.Second * 15)
+	defer t.Stop()
+
+	for {
+		select {
+		case <-t.C:
+			// don't refresh the token if it's not close to expiring
+			tok := auth.DefaultAuth.Options().Token
+			if tok.Expiry.Unix() > time.Now().Add(time.Minute).Unix() {
+				continue
+			}
+
+			// generate the first token
+			tok, err := auth.Token(
+				auth.WithToken(tok.RefreshToken),
+				auth.WithExpiry(time.Minute*10),
+			)
+			if err == auth.ErrInvalidToken {
+				logger.Warnf("[Auth] Refresh token expired, regenerating using account credentials")
+
+				tok, err = auth.Token(
+					auth.WithCredentials(
+						auth.DefaultAuth.Options().ID,
+						auth.DefaultAuth.Options().Secret,
+					),
+					auth.WithExpiry(time.Minute*10),
+				)
+			} else if err != nil {
+				logger.Warnf("[Auth] Error refreshing token: %v", err)
+				continue
+			}
+
+			// set the token
+			logger.Debugf("Auth token refreshed, expires at %v", tok.Expiry.Format(time.UnixDate))
+			auth.DefaultAuth.Init(auth.ClientToken(tok))
+		}
+	}
+}
+
 func action(c *cli.Context) error {
 	if c.Args().Len() > 0 {
 		// if an executable is available with the name of