From 2ae45dc1cc1dcdca410eab6fd9f9dc7118aee97c Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Sun, 16 Jun 2024 07:41:07 +0200
Subject: [PATCH] Feat: Login support for all auth methods

---
 cli/packages/util/constants.go |  3 +++
 cli/packages/util/helper.go    | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go
index bff3c3ab04..57ea836d2c 100644
--- a/cli/packages/util/constants.go
+++ b/cli/packages/util/constants.go
@@ -22,6 +22,9 @@ const (
 	// Generic env variable used for auth methods that require a machine identity ID
 	INFISICAL_MACHINE_IDENTITY_ID_NAME = "INFISICAL_MACHINE_IDENTITY_ID"
 
+	// For auth methods that require a machine identity ID
+	INFISICAL_MACHINE_IDENTITY_ID_NAME = "INFISICAL_MACHINE_IDENTITY_ID"
+
 	SECRET_TYPE_PERSONAL      = "personal"
 	SECRET_TYPE_SHARED        = "shared"
 	KEYRING_SERVICE_NAME      = "infisical"
diff --git a/cli/packages/util/helper.go b/cli/packages/util/helper.go
index b8eb66027c..9ce8c4a1d0 100644
--- a/cli/packages/util/helper.go
+++ b/cli/packages/util/helper.go
@@ -273,3 +273,17 @@ func GetEnvVarOrFileContent(envName string, filePath string) (string, error) {
 
 	return fileContent, nil
 }
+
+func GetCmdFlagOrEnv(cmd *cobra.Command, flag, envName string) (string, error) {
+	value, flagsErr := cmd.Flags().GetString(flag)
+	if flagsErr != nil {
+		return "", flagsErr
+	}
+	if value == "" {
+		value = os.Getenv(envName)
+	}
+	if value == "" {
+		return "", fmt.Errorf("please provide %s flag", flag)
+	}
+	return value, nil
+}