From aa554405c11927355c587e0400e4e08e46a9b6f2 Mon Sep 17 00:00:00 2001
From: Maidul Islam <maidul98@gmail.com>
Date: Fri, 9 Dec 2022 19:36:39 -0500
Subject: [PATCH] fix variable assignment when pulling via token

---
 cli/packages/util/secrets.go | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/cli/packages/util/secrets.go b/cli/packages/util/secrets.go
index d7d4cdc37e..c127111b1b 100644
--- a/cli/packages/util/secrets.go
+++ b/cli/packages/util/secrets.go
@@ -196,7 +196,6 @@ func GetSecretsFromAPIUsingInfisicalToken(infisicalToken string, envName string,
 }
 
 func GetAllEnvironmentVariables(projectId string, envName string) ([]models.SingleEnvironmentVariable, error) {
-	var envsFromApi []models.SingleEnvironmentVariable
 	infisicalToken := os.Getenv(INFISICAL_TOKEN_NAME)
 
 	if infisicalToken == "" {
@@ -204,19 +203,19 @@ func GetAllEnvironmentVariables(projectId string, envName string) ([]models.Sing
 		if err != nil {
 			log.Info("Unexpected issue occurred while checking login status. To see more details, add flag --debug")
 			log.Debugln(err)
-			return envsFromApi, err
+			return nil, err
 		}
 
 		if !hasUserLoggedInbefore {
 			log.Infoln("No logged in user. To login, please run command [infisical login]")
-			return envsFromApi, fmt.Errorf("user not logged in")
+			return nil, fmt.Errorf("user not logged in")
 		}
 
 		userCreds, err := GetUserCredsFromKeyRing(loggedInUserEmail)
 		if err != nil {
 			log.Infoln("Unable to get user creds from key ring")
 			log.Debug(err)
-			return envsFromApi, err
+			return nil, err
 		}
 
 		workspaceConfigs, err := GetAllWorkSpaceConfigsStartingFromCurrentPath()
@@ -226,25 +225,28 @@ func GetAllEnvironmentVariables(projectId string, envName string) ([]models.Sing
 
 		if len(workspaceConfigs) == 0 {
 			log.Infoln("Your local project is not connected to a Infisical project yet. Run command [infisical init]")
-			return envsFromApi, fmt.Errorf("project not initialized")
+			return nil, fmt.Errorf("project not initialized")
 		}
 
-		envsFromApi, err = GetSecretsFromAPIUsingCurrentLoggedInUser(envName, userCreds)
+		envsFromApi, err := GetSecretsFromAPIUsingCurrentLoggedInUser(envName, userCreds)
 		if err != nil {
 			log.Errorln("Something went wrong when pulling secrets using your logged in credentials. If the issue persists, double check your project id/try logging in again.")
 			log.Debugln(err)
-			return envsFromApi, err
+			return nil, err
 		}
+
+		return envsFromApi, nil
+
 	} else {
 		envsFromApi, err := GetSecretsFromAPIUsingInfisicalToken(infisicalToken, envName, projectId)
 		if err != nil {
 			log.Errorln("Something went wrong when pulling secrets using your Infisical token. Double check the token, project id or environment name (dev, prod, ect.)")
 			log.Debugln(err)
-			return envsFromApi, err
+			return nil, err
 		}
-	}
 
-	return envsFromApi, nil
+		return envsFromApi, nil
+	}
 }
 
 func GetWorkSpacesFromAPI(userCreds models.UserCredentials) (workspaces []models.Workspace, err error) {