mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-11 03:28:58 +00:00
Fix: UA token being overwritten by service token
This commit is contained in:
@@ -2,7 +2,6 @@ package util
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/Infisical/infisical-merge/packages/api"
|
"github.com/Infisical/infisical-merge/packages/api"
|
||||||
@@ -13,10 +12,6 @@ import (
|
|||||||
|
|
||||||
func GetAllFolders(params models.GetAllFoldersParameters) ([]models.SingleFolder, error) {
|
func GetAllFolders(params models.GetAllFoldersParameters) ([]models.SingleFolder, error) {
|
||||||
|
|
||||||
if params.InfisicalToken == "" {
|
|
||||||
params.InfisicalToken = os.Getenv(INFISICAL_TOKEN_NAME)
|
|
||||||
}
|
|
||||||
|
|
||||||
var foldersToReturn []models.SingleFolder
|
var foldersToReturn []models.SingleFolder
|
||||||
var folderErr error
|
var folderErr error
|
||||||
if params.InfisicalToken == "" && params.UniversalAuthAccessToken == "" {
|
if params.InfisicalToken == "" && params.UniversalAuthAccessToken == "" {
|
||||||
|
|||||||
Reference in New Issue
Block a user