Merge pull request #1555 from Infisical/daniel/cli-expand-secrets-fix

Fix: CLI user authentication
This commit is contained in:
Akhil Mohan
2024-03-12 15:32:00 +05:30
committed by GitHub
2 changed files with 7 additions and 0 deletions
+5
View File
@@ -97,6 +97,11 @@ func RequireLogin() {
} }
} }
func IsLoggedIn() bool {
configFile, _ := GetConfigFile()
return configFile.LoggedInUserEmail != ""
}
func RequireServiceToken() { func RequireServiceToken() {
serviceToken := os.Getenv(INFISICAL_TOKEN_NAME) serviceToken := os.Getenv(INFISICAL_TOKEN_NAME)
if serviceToken == "" { if serviceToken == "" {
+2
View File
@@ -427,6 +427,8 @@ func ExpandSecrets(secrets []models.SingleEnvironmentVariable, auth models.Expan
refSecs, err = GetAllEnvironmentVariables(models.GetAllSecretsParameters{Environment: env, InfisicalToken: auth.InfisicalToken, SecretsPath: secPath}, projectConfigPathDir) refSecs, err = GetAllEnvironmentVariables(models.GetAllSecretsParameters{Environment: env, InfisicalToken: auth.InfisicalToken, SecretsPath: secPath}, projectConfigPathDir)
} else if auth.UniversalAuthAccessToken != "" { } else if auth.UniversalAuthAccessToken != "" {
refSecs, err = GetAllEnvironmentVariables((models.GetAllSecretsParameters{Environment: env, UniversalAuthAccessToken: auth.UniversalAuthAccessToken, SecretsPath: secPath, WorkspaceId: sec.WorkspaceId}), projectConfigPathDir) refSecs, err = GetAllEnvironmentVariables((models.GetAllSecretsParameters{Environment: env, UniversalAuthAccessToken: auth.UniversalAuthAccessToken, SecretsPath: secPath, WorkspaceId: sec.WorkspaceId}), projectConfigPathDir)
} else if IsLoggedIn() {
refSecs, err = GetAllEnvironmentVariables(models.GetAllSecretsParameters{Environment: env, SecretsPath: secPath}, projectConfigPathDir)
} else { } else {
HandleError(errors.New("no authentication provided"), "Please provide authentication to fetch secrets") HandleError(errors.New("no authentication provided"), "Please provide authentication to fetch secrets")
} }