awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-04 00:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feat: Unify CLI auth methods

Browse Source
This commit is contained in:
Daniel Hougaard
2024-06-15 08:48:03 +02:00
parent afcf15df55
commit c4f9a3b31e
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/util/folders.go
+30 -14
View File
@@ -172,19 +172,27 @@ func GetFoldersViaMachineIdentity(accessToken string, workspaceId string, envSlu
// CreateFolder creates a folder in Infisical // CreateFolder creates a folder in Infisical
func CreateFolder(params models.CreateFolderParameters) (models.SingleFolder, error) { func CreateFolder(params models.CreateFolderParameters) (models.SingleFolder, error) {
loggedInUserDetails, err := GetCurrentLoggedInUserDetails()
if err != nil {
return models.SingleFolder{}, err
}
if loggedInUserDetails.LoginExpired { // If no token is provided, we will try to get the token from the current logged in user
PrintErrorMessageAndExit("Your login session has expired, please run [infisical login] and try again") if params.InfisicalToken == "" {
RequireLogin()
loggedInUserDetails, err := GetCurrentLoggedInUserDetails()
if err != nil {
return models.SingleFolder{}, err
}
if loggedInUserDetails.LoginExpired {
PrintErrorMessageAndExit("Your login session has expired, please run [infisical login] and try again")
}
params.InfisicalToken = loggedInUserDetails.UserCredentials.JTWToken
} }
// set up resty client // set up resty client
httpClient := resty.New() httpClient := resty.New()
httpClient. httpClient.
SetAuthToken(loggedInUserDetails.UserCredentials.JTWToken). SetAuthToken(params.InfisicalToken).
SetHeader("Accept", "application/json"). SetHeader("Accept", "application/json").
SetHeader("Content-Type", "application/json") SetHeader("Content-Type", "application/json")
@@ -209,19 +217,27 @@ func CreateFolder(params models.CreateFolderParameters) (models.SingleFolder, er
} }
func DeleteFolder(params models.DeleteFolderParameters) ([]models.SingleFolder, error) { func DeleteFolder(params models.DeleteFolderParameters) ([]models.SingleFolder, error) {
loggedInUserDetails, err := GetCurrentLoggedInUserDetails()
if err != nil {
return nil, err
}
if loggedInUserDetails.LoginExpired { // If no token is provided, we will try to get the token from the current logged in user
PrintErrorMessageAndExit("Your login session has expired, please run [infisical login] and try again") if params.InfisicalToken == "" {
RequireLogin()
loggedInUserDetails, err := GetCurrentLoggedInUserDetails()
if err != nil {
return nil, err
}
if loggedInUserDetails.LoginExpired {
PrintErrorMessageAndExit("Your login session has expired, please run [infisical login] and try again")
}
params.InfisicalToken = loggedInUserDetails.UserCredentials.JTWToken
} }
// set up resty client // set up resty client
httpClient := resty.New() httpClient := resty.New()
httpClient. httpClient.
SetAuthToken(loggedInUserDetails.UserCredentials.JTWToken). SetAuthToken(params.InfisicalToken).
SetHeader("Accept", "application/json"). SetHeader("Accept", "application/json").
SetHeader("Content-Type", "application/json") SetHeader("Content-Type", "application/json")