Requested changes

cli/packages/util/auth.go

@@ -1,9 +1,5 @@
 package util
 
-import (
-	"github.com/Infisical/infisical-merge/packages/models"
-)
-
 type AuthStrategyType string
 
 var AuthStrategy = struct {
@@ -47,23 +43,3 @@ func IsAuthMethodValid(authMethod string, allowUserAuth bool) (isValid bool, str
 	}
 	return false, ""
 }
-
-func ShouldUseInfisicalToken(token *models.TokenDetails, validTokenTypes []string) bool {
-	if token == nil {
-		return false
-	}
-
-	// If nil is passed, we assume both service and universal tokens are acceptable.
-	if validTokenTypes == nil {
-		validTokenTypes = []string{SERVICE_TOKEN_IDENTIFIER, UNIVERSAL_AUTH_TOKEN_IDENTIFIER}
-	}
-
-	for _, tokenType := range validTokenTypes {
-		if token.Type == tokenType {
-			return true
-		}
-	}
-
-	return false
-
-}

cli/packages/util/helper.go

@@ -87,13 +87,15 @@ func GetInfisicalToken(cmd *cobra.Command) (token *models.TokenDetails, err erro
 		return nil, err
 	}
 
-	passedAsFlag := infisicalToken != ""
+	var source = "--token flag"
 
 	if infisicalToken == "" { // If no flag is passed, we first check for the universal auth access token env variable.
 		infisicalToken = os.Getenv(INFISICAL_UNIVERSAL_AUTH_ACCESS_TOKEN_NAME)
+		source = fmt.Sprintf("%s environment variable", INFISICAL_UNIVERSAL_AUTH_ACCESS_TOKEN_NAME)
 
 		if infisicalToken == "" { // If it's still empty after the first env check, we check for the service token env variable.
 			infisicalToken = os.Getenv(INFISICAL_TOKEN_NAME)
+			source = fmt.Sprintf("%s environment variable", INFISICAL_TOKEN_NAME)
 		}
 	}
 
@@ -103,16 +105,16 @@ func GetInfisicalToken(cmd *cobra.Command) (token *models.TokenDetails, err erro
 
 	if strings.HasPrefix(infisicalToken, "st.") {
 		return &models.TokenDetails{
-			Type:         SERVICE_TOKEN_IDENTIFIER,
-			Token:        infisicalToken,
-			PassedAsFlag: passedAsFlag,
+			Type:   SERVICE_TOKEN_IDENTIFIER,
+			Token:  infisicalToken,
+			Source: source,
 		}, nil
 	}
 
 	return &models.TokenDetails{
-		Type:         UNIVERSAL_AUTH_TOKEN_IDENTIFIER,
-		Token:        infisicalToken,
-		PassedAsFlag: passedAsFlag,
+		Type:   UNIVERSAL_AUTH_TOKEN_IDENTIFIER,
+		Token:  infisicalToken,
+		Source: source,
 	}, nil
 
 }