From e5333e271828235ac1ed706352ae72ab822990c4 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Wed, 24 Apr 2024 02:07:45 +0200
Subject: [PATCH 1/2] Fix: UA token being overwritten by service token

---
 cli/packages/util/folders.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/cli/packages/util/folders.go b/cli/packages/util/folders.go
index 165b975346..82e5451a5c 100644
--- a/cli/packages/util/folders.go
+++ b/cli/packages/util/folders.go
@@ -2,7 +2,6 @@ package util
 
 import (
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/Infisical/infisical-merge/packages/api"
@@ -13,10 +12,6 @@ import (
 
 func GetAllFolders(params models.GetAllFoldersParameters) ([]models.SingleFolder, error) {
 
-	if params.InfisicalToken == "" {
-		params.InfisicalToken = os.Getenv(INFISICAL_TOKEN_NAME)
-	}
-
 	var foldersToReturn []models.SingleFolder
 	var folderErr error
 	if params.InfisicalToken == "" && params.UniversalAuthAccessToken == "" {

From f04f3aee2555edb3f4b45e35479a26ce531d3ce7 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Wed, 24 Apr 2024 02:36:29 +0200
Subject: [PATCH 2/2] Fix: Allow service token & UA access token to be used as
 authentication

---
 cli/packages/cmd/folder.go   | 4 ----
 cli/packages/util/folders.go | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cli/packages/cmd/folder.go b/cli/packages/cmd/folder.go
index b306960f48..9cb76a312b 100644
--- a/cli/packages/cmd/folder.go
+++ b/cli/packages/cmd/folder.go
@@ -22,10 +22,6 @@ var folderCmd = &cobra.Command{
 var getCmd = &cobra.Command{
 	Use:   "get",
 	Short: "Get folders in a directory",
-	PersistentPreRun: func(cmd *cobra.Command, args []string) {
-		util.RequireLocalWorkspaceFile()
-		util.RequireLogin()
-	},
 	Run: func(cmd *cobra.Command, args []string) {
 
 		environmentName, _ := cmd.Flags().GetString("env")
diff --git a/cli/packages/util/folders.go b/cli/packages/util/folders.go
index 82e5451a5c..18fe5c888d 100644
--- a/cli/packages/util/folders.go
+++ b/cli/packages/util/folders.go
@@ -15,6 +15,8 @@ func GetAllFolders(params models.GetAllFoldersParameters) ([]models.SingleFolder
 	var foldersToReturn []models.SingleFolder
 	var folderErr error
 	if params.InfisicalToken == "" && params.UniversalAuthAccessToken == "" {
+		RequireLogin()
+		RequireLocalWorkspaceFile()
 
 		log.Debug().Msg("GetAllFolders: Trying to fetch folders using logged in details")