From 016f22c295df2dbc5a18e0c50a635dcf20d6e876 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Tue, 26 Mar 2024 23:54:11 +0100
Subject: [PATCH] Fix: Cleanup

---
 cli/packages/cmd/agent.go      |  2 +-
 cli/packages/util/constants.go | 26 +++++++++++++-------------
 cli/packages/util/helper.go    |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cli/packages/cmd/agent.go b/cli/packages/cmd/agent.go
index d32afa986..7e8babb85 100644
--- a/cli/packages/cmd/agent.go
+++ b/cli/packages/cmd/agent.go
@@ -479,7 +479,7 @@ func (tm *AgentManager) GetToken() string {
 
 // Fetches a new access token using client credentials
 func (tm *AgentManager) FetchNewAccessToken() error {
-	clientID := os.Getenv("INFISICAL_UNIVERSAL_AUTH_CLIENT_ID")
+	clientID := os.Getenv(util.INFISICAL_UNIVERSAL_AUTH_CLIENT_ID_NAME)
 	if clientID == "" {
 		clientIDAsByte, err := ReadFile(tm.clientIdPath)
 		if err != nil {
diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go
index d4243208a..4525fe81c 100644
--- a/cli/packages/util/constants.go
+++ b/cli/packages/util/constants.go
@@ -1,19 +1,19 @@
 package util
 
 const (
-	CONFIG_FILE_NAME                       = "infisical-config.json"
-	CONFIG_FOLDER_NAME                     = ".infisical"
-	INFISICAL_DEFAULT_API_URL              = "https://app.infisical.com/api"
-	INFISICAL_DEFAULT_URL                  = "https://app.infisical.com"
-	INFISICAL_WORKSPACE_CONFIG_FILE_NAME   = ".infisical.json"
-	INFISICAL_TOKEN_NAME                   = "INFISICAL_TOKEN"
-	INFISICAL_UNIVERSAL_AUTH_CLIENT_ID     = "INFISICAL_UNIVERSAL_AUTH_CLIENT_ID"
-	INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET = "INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET"
-	SECRET_TYPE_PERSONAL                   = "personal"
-	SECRET_TYPE_SHARED                     = "shared"
-	KEYRING_SERVICE_NAME                   = "infisical"
-	PERSONAL_SECRET_TYPE_NAME              = "personal"
-	SHARED_SECRET_TYPE_NAME                = "shared"
+	CONFIG_FILE_NAME                            = "infisical-config.json"
+	CONFIG_FOLDER_NAME                          = ".infisical"
+	INFISICAL_DEFAULT_API_URL                   = "https://app.infisical.com/api"
+	INFISICAL_DEFAULT_URL                       = "https://app.infisical.com"
+	INFISICAL_WORKSPACE_CONFIG_FILE_NAME        = ".infisical.json"
+	INFISICAL_TOKEN_NAME                        = "INFISICAL_TOKEN"
+	INFISICAL_UNIVERSAL_AUTH_CLIENT_ID_NAME     = "INFISICAL_UNIVERSAL_AUTH_CLIENT_ID"
+	INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET_NAME = "INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET"
+	SECRET_TYPE_PERSONAL                        = "personal"
+	SECRET_TYPE_SHARED                          = "shared"
+	KEYRING_SERVICE_NAME                        = "infisical"
+	PERSONAL_SECRET_TYPE_NAME                   = "personal"
+	SHARED_SECRET_TYPE_NAME                     = "shared"
 )
 
 var (
diff --git a/cli/packages/util/helper.go b/cli/packages/util/helper.go
index 4d8074ddd..932a2d068 100644
--- a/cli/packages/util/helper.go
+++ b/cli/packages/util/helper.go
@@ -95,11 +95,11 @@ func GetInfisicalUniversalAuthAccessToken(cmd *cobra.Command) (accessToken strin
 	}
 
 	if universalAuthClientId == "" {
-		universalAuthClientId = os.Getenv(INFISICAL_UNIVERSAL_AUTH_CLIENT_ID)
+		universalAuthClientId = os.Getenv(INFISICAL_UNIVERSAL_AUTH_CLIENT_ID_NAME)
 	}
 
 	if universalAuthClientSecret == "" {
-		universalAuthClientSecret = os.Getenv(INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET)
+		universalAuthClientSecret = os.Getenv(INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET_NAME)
 	}
 
 	if universalAuthClientId != "" || universalAuthClientSecret != "" {