awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Spelling fix "JTW" -> "JWT"

Browse Source
This commit is contained in:
x032205
2025-06-14 01:38:29 -04:00
parent de917a5d74
commit edf4e75e55
17 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/packages/api/model.go
View File

@@ -21,7 +21,7 @@ type LoginTwoRequest struct {
} }
type LoginTwoResponse struct { type LoginTwoResponse struct {
JTWToken string `json:"token"` JWTToken string `json:"token"`
RefreshToken string `json:"refreshToken"` RefreshToken string `json:"refreshToken"`
PublicKey string `json:"publicKey"` PublicKey string `json:"publicKey"`
EncryptedPrivateKey string `json:"encryptedPrivateKey"` EncryptedPrivateKey string `json:"encryptedPrivateKey"`

10
cli/packages/cmd/dynamic_secrets.go
View File

@@ -87,7 +87,7 @@ func getDynamicSecretList(cmd *cobra.Command, args []string) {
loggedInUserDetails = util.EstablishUserLoginSession() loggedInUserDetails = util.EstablishUserLoginSession()
} }
infisicalToken = loggedInUserDetails.UserCredentials.JTWToken infisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
httpClient.SetAuthToken(infisicalToken) httpClient.SetAuthToken(infisicalToken)
@@ -211,7 +211,7 @@ func createDynamicSecretLeaseByName(cmd *cobra.Command, args []string) {
if loggedInUserDetails.LoginExpired { if loggedInUserDetails.LoginExpired {
loggedInUserDetails = util.EstablishUserLoginSession() loggedInUserDetails = util.EstablishUserLoginSession()
} }
infisicalToken = loggedInUserDetails.UserCredentials.JTWToken infisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
httpClient.SetAuthToken(infisicalToken) httpClient.SetAuthToken(infisicalToken)
@@ -363,7 +363,7 @@ func renewDynamicSecretLeaseByName(cmd *cobra.Command, args []string) {
loggedInUserDetails = util.EstablishUserLoginSession() loggedInUserDetails = util.EstablishUserLoginSession()
} }
infisicalToken = loggedInUserDetails.UserCredentials.JTWToken infisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
httpClient.SetAuthToken(infisicalToken) httpClient.SetAuthToken(infisicalToken)
@@ -478,7 +478,7 @@ func revokeDynamicSecretLeaseByName(cmd *cobra.Command, args []string) {
loggedInUserDetails = util.EstablishUserLoginSession() loggedInUserDetails = util.EstablishUserLoginSession()
} }
infisicalToken = loggedInUserDetails.UserCredentials.JTWToken infisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
httpClient.SetAuthToken(infisicalToken) httpClient.SetAuthToken(infisicalToken)
@@ -592,7 +592,7 @@ func listDynamicSecretLeaseByName(cmd *cobra.Command, args []string) {
if loggedInUserDetails.LoginExpired { if loggedInUserDetails.LoginExpired {
loggedInUserDetails = util.EstablishUserLoginSession() loggedInUserDetails = util.EstablishUserLoginSession()
} }
infisicalToken = loggedInUserDetails.UserCredentials.JTWToken infisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
httpClient.SetAuthToken(infisicalToken) httpClient.SetAuthToken(infisicalToken)

2
cli/packages/cmd/export.go
View File

@@ -115,7 +115,7 @@ var exportCmd = &cobra.Command{
if err != nil { if err != nil {
util.HandleError(err) util.HandleError(err)
} }
accessToken = loggedInUserDetails.UserCredentials.JTWToken accessToken = loggedInUserDetails.UserCredentials.JWTToken
} }
processedTemplate, err := ProcessTemplate(1, templatePath, nil, accessToken, "", &newEtag, dynamicSecretLeases) processedTemplate, err := ProcessTemplate(1, templatePath, nil, accessToken, "", &newEtag, dynamicSecretLeases)

4
cli/packages/cmd/init.go
View File

@@ -53,7 +53,7 @@ var initCmd = &cobra.Command{
if err != nil { if err != nil {
util.HandleError(err, "Unable to get resty client with custom headers") util.HandleError(err, "Unable to get resty client with custom headers")
} }
httpClient.SetAuthToken(userCreds.UserCredentials.JTWToken) httpClient.SetAuthToken(userCreds.UserCredentials.JWTToken)
organizationResponse, err := api.CallGetAllOrganizations(httpClient) organizationResponse, err := api.CallGetAllOrganizations(httpClient)
if err != nil { if err != nil {
@@ -124,7 +124,7 @@ var initCmd = &cobra.Command{
} }
// set the config jwt token to the new token // set the config jwt token to the new token
userCreds.UserCredentials.JTWToken = tokenResponse.Token userCreds.UserCredentials.JWTToken = tokenResponse.Token
err = util.StoreUserCredsInKeyRing(&userCreds.UserCredentials) err = util.StoreUserCredsInKeyRing(&userCreds.UserCredentials)
httpClient.SetAuthToken(tokenResponse.Token) httpClient.SetAuthToken(tokenResponse.Token)

6
cli/packages/cmd/login.go
View File

@@ -437,7 +437,7 @@ func cliDefaultLogin(userCredentialsToBeStored *models.UserCredentials) {
//updating usercredentials //updating usercredentials
userCredentialsToBeStored.Email = email userCredentialsToBeStored.Email = email
userCredentialsToBeStored.PrivateKey = string(decryptedPrivateKey) userCredentialsToBeStored.PrivateKey = string(decryptedPrivateKey)
userCredentialsToBeStored.JTWToken = newJwtToken userCredentialsToBeStored.JWTToken = newJwtToken
userCredentialsToBeStored.RefreshToken = loginTwoResponse.RefreshToken userCredentialsToBeStored.RefreshToken = loginTwoResponse.RefreshToken
} }
@@ -863,7 +863,7 @@ func askToPasteJwtToken(success chan models.UserCredentials, failure chan error)
os.Exit(1) os.Exit(1)
} }
// verify JTW // verify JWT
httpClient, err := util.GetRestyClientWithCustomHeaders() httpClient, err := util.GetRestyClientWithCustomHeaders()
if err != nil { if err != nil {
failure <- err failure <- err
@@ -872,7 +872,7 @@ func askToPasteJwtToken(success chan models.UserCredentials, failure chan error)
} }
httpClient. httpClient.
SetAuthToken(userCredentials.JTWToken). SetAuthToken(userCredentials.JWTToken).
SetHeader("Accept", "application/json") SetHeader("Accept", "application/json")
isAuthenticated := api.CallIsAuthenticated(httpClient) isAuthenticated := api.CallIsAuthenticated(httpClient)

4
cli/packages/cmd/secrets.go
View File

@@ -245,7 +245,7 @@ var secretsSetCmd = &cobra.Command{
secretOperations, err = util.SetRawSecrets(processedArgs, secretType, environmentName, secretsPath, projectId, &models.TokenDetails{ secretOperations, err = util.SetRawSecrets(processedArgs, secretType, environmentName, secretsPath, projectId, &models.TokenDetails{
Type: "", Type: "",
Token: loggedInUserDetails.UserCredentials.JTWToken, Token: loggedInUserDetails.UserCredentials.JWTToken,
}, file) }, file)
} }
@@ -330,7 +330,7 @@ var secretsDeleteCmd = &cobra.Command{
loggedInUserDetails = util.EstablishUserLoginSession() loggedInUserDetails = util.EstablishUserLoginSession()
} }
httpClient.SetAuthToken(loggedInUserDetails.UserCredentials.JTWToken) httpClient.SetAuthToken(loggedInUserDetails.UserCredentials.JWTToken)
} }
for _, secretName := range args { for _, secretName := range args {

8
cli/packages/cmd/ssh.go
View File

@@ -186,7 +186,7 @@ func issueCredentials(cmd *cobra.Command, args []string) {
if loggedInUserDetails.LoginExpired { if loggedInUserDetails.LoginExpired {
loggedInUserDetails = util.EstablishUserLoginSession() loggedInUserDetails = util.EstablishUserLoginSession()
} }
infisicalToken = loggedInUserDetails.UserCredentials.JTWToken infisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
certificateTemplateId, err := cmd.Flags().GetString("certificateTemplateId") certificateTemplateId, err := cmd.Flags().GetString("certificateTemplateId")
@@ -419,7 +419,7 @@ func signKey(cmd *cobra.Command, args []string) {
if loggedInUserDetails.LoginExpired { if loggedInUserDetails.LoginExpired {
loggedInUserDetails = util.EstablishUserLoginSession() loggedInUserDetails = util.EstablishUserLoginSession()
} }
infisicalToken = loggedInUserDetails.UserCredentials.JTWToken infisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
certificateTemplateId, err := cmd.Flags().GetString("certificateTemplateId") certificateTemplateId, err := cmd.Flags().GetString("certificateTemplateId")
@@ -628,7 +628,7 @@ func sshConnect(cmd *cobra.Command, args []string) {
if loggedInUserDetails.LoginExpired { if loggedInUserDetails.LoginExpired {
loggedInUserDetails = util.EstablishUserLoginSession() loggedInUserDetails = util.EstablishUserLoginSession()
} }
infisicalToken = loggedInUserDetails.UserCredentials.JTWToken infisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
writeHostCaToFile, err := cmd.Flags().GetBool("write-host-ca-to-file") writeHostCaToFile, err := cmd.Flags().GetBool("write-host-ca-to-file")
@@ -881,7 +881,7 @@ func sshAddHost(cmd *cobra.Command, args []string) {
if loggedInUserDetails.LoginExpired { if loggedInUserDetails.LoginExpired {
loggedInUserDetails = util.EstablishUserLoginSession() loggedInUserDetails = util.EstablishUserLoginSession()
} }
infisicalToken = loggedInUserDetails.UserCredentials.JTWToken infisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
projectId, err := cmd.Flags().GetString("projectId") projectId, err := cmd.Flags().GetString("projectId")

4
cli/packages/cmd/tokens.go
View File

@@ -115,7 +115,7 @@ var tokensCreateCmd = &cobra.Command{
} }
} }
workspaceKey, err := util.GetPlainTextWorkspaceKey(loggedInUserDetails.UserCredentials.JTWToken, loggedInUserDetails.UserCredentials.PrivateKey, workspaceId) workspaceKey, err := util.GetPlainTextWorkspaceKey(loggedInUserDetails.UserCredentials.JWTToken, loggedInUserDetails.UserCredentials.PrivateKey, workspaceId)
if err != nil { if err != nil {
util.HandleError(err, "Unable to get workspace key needed to create service token") util.HandleError(err, "Unable to get workspace key needed to create service token")
} }
@@ -140,7 +140,7 @@ var tokensCreateCmd = &cobra.Command{
util.HandleError(err, "Unable to get resty client with custom headers") util.HandleError(err, "Unable to get resty client with custom headers")
} }
httpClient.SetAuthToken(loggedInUserDetails.UserCredentials.JTWToken). httpClient.SetAuthToken(loggedInUserDetails.UserCredentials.JWTToken).
SetHeader("Accept", "application/json") SetHeader("Accept", "application/json")
createServiceTokenResponse, err := api.CallCreateServiceToken(httpClient, api.CreateServiceTokenRequest{ createServiceTokenResponse, err := api.CallCreateServiceToken(httpClient, api.CreateServiceTokenRequest{

4
cli/packages/cmd/user.go
View File

@@ -118,7 +118,7 @@ var userGetTokenCmd = &cobra.Command{
util.HandleError(err, "[infisical user get token]: Unable to get logged in user token") util.HandleError(err, "[infisical user get token]: Unable to get logged in user token")
} }
tokenParts := strings.Split(loggedInUserDetails.UserCredentials.JTWToken, ".") tokenParts := strings.Split(loggedInUserDetails.UserCredentials.JWTToken, ".")
if len(tokenParts) != 3 { if len(tokenParts) != 3 {
util.HandleError(errors.New("invalid token format"), "[infisical user get token]: Invalid token format") util.HandleError(errors.New("invalid token format"), "[infisical user get token]: Invalid token format")
} }
@@ -136,7 +136,7 @@ var userGetTokenCmd = &cobra.Command{
} }
fmt.Println("Session ID:", tokenPayload.TokenVersionId) fmt.Println("Session ID:", tokenPayload.TokenVersionId)
fmt.Println("Token:", loggedInUserDetails.UserCredentials.JTWToken) fmt.Println("Token:", loggedInUserDetails.UserCredentials.JWTToken)
}, },
} }

2
cli/packages/models/cli.go
View File

@@ -5,7 +5,7 @@ import "time"
type UserCredentials struct { type UserCredentials struct {
Email string `json:"email"` Email string `json:"email"`
PrivateKey string `json:"privateKey"` PrivateKey string `json:"privateKey"`
JTWToken string `json:"JTWToken"` JWTToken string `json:"JWTToken"`
RefreshToken string `json:"refreshToken"` RefreshToken string `json:"refreshToken"`
} }

4
cli/packages/util/credentials.go
View File

@@ -90,7 +90,7 @@ func GetCurrentLoggedInUserDetails(setConfigVariables bool) (LoggedInUserDetails
} }
httpClient. httpClient.
SetAuthToken(userCreds.JTWToken). SetAuthToken(userCreds.JWTToken).
SetHeader("Accept", "application/json") SetHeader("Accept", "application/json")
isAuthenticated := api.CallIsAuthenticated(httpClient) isAuthenticated := api.CallIsAuthenticated(httpClient)
@@ -98,7 +98,7 @@ func GetCurrentLoggedInUserDetails(setConfigVariables bool) (LoggedInUserDetails
accessTokenResponse, refreshErr := api.CallGetNewAccessTokenWithRefreshToken(httpClient, userCreds.RefreshToken) accessTokenResponse, refreshErr := api.CallGetNewAccessTokenWithRefreshToken(httpClient, userCreds.RefreshToken)
if refreshErr == nil && accessTokenResponse.Token != "" { if refreshErr == nil && accessTokenResponse.Token != "" {
isAuthenticated = true isAuthenticated = true
userCreds.JTWToken = accessTokenResponse.Token userCreds.JWTToken = accessTokenResponse.Token
} }
} }

10
cli/packages/util/folders.go
View File

@@ -35,7 +35,7 @@ func GetAllFolders(params models.GetAllFoldersParameters) ([]models.SingleFolder
params.WorkspaceId = workspaceFile.WorkspaceId params.WorkspaceId = workspaceFile.WorkspaceId
} }
folders, err := GetFoldersViaJTW(loggedInUserDetails.UserCredentials.JTWToken, params.WorkspaceId, params.Environment, params.FoldersPath) folders, err := GetFoldersViaJWT(loggedInUserDetails.UserCredentials.JWTToken, params.WorkspaceId, params.Environment, params.FoldersPath)
folderErr = err folderErr = err
foldersToReturn = folders foldersToReturn = folders
} else if params.InfisicalToken != "" { } else if params.InfisicalToken != "" {
@@ -60,14 +60,14 @@ func GetAllFolders(params models.GetAllFoldersParameters) ([]models.SingleFolder
return foldersToReturn, folderErr return foldersToReturn, folderErr
} }
func GetFoldersViaJTW(JTWToken string, workspaceId string, environmentName string, foldersPath string) ([]models.SingleFolder, error) { func GetFoldersViaJWT(JWTToken string, workspaceId string, environmentName string, foldersPath string) ([]models.SingleFolder, error) {
// set up resty client // set up resty client
httpClient, err := GetRestyClientWithCustomHeaders() httpClient, err := GetRestyClientWithCustomHeaders()
if err != nil { if err != nil {
return nil, err return nil, err
} }
httpClient.SetAuthToken(JTWToken). httpClient.SetAuthToken(JWTToken).
SetHeader("Accept", "application/json") SetHeader("Accept", "application/json")
getFoldersRequest := api.GetFoldersV1Request{ getFoldersRequest := api.GetFoldersV1Request{
@@ -194,7 +194,7 @@ func CreateFolder(params models.CreateFolderParameters) (models.SingleFolder, er
loggedInUserDetails = EstablishUserLoginSession() loggedInUserDetails = EstablishUserLoginSession()
} }
params.InfisicalToken = loggedInUserDetails.UserCredentials.JTWToken params.InfisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
// set up resty client // set up resty client
@@ -243,7 +243,7 @@ func DeleteFolder(params models.DeleteFolderParameters) ([]models.SingleFolder,
loggedInUserDetails = EstablishUserLoginSession() loggedInUserDetails = EstablishUserLoginSession()
} }
params.InfisicalToken = loggedInUserDetails.UserCredentials.JTWToken params.InfisicalToken = loggedInUserDetails.UserCredentials.JWTToken
} }
// set up resty client // set up resty client

4
cli/packages/util/secrets.go
View File

@@ -302,9 +302,9 @@ func GetAllEnvironmentVariables(params models.GetAllSecretsParameters, projectCo
params.WorkspaceId = infisicalDotJson.WorkspaceId params.WorkspaceId = infisicalDotJson.WorkspaceId
} }
res, err := GetPlainTextSecretsV3(loggedInUserDetails.UserCredentials.JTWToken, params.WorkspaceId, res, err := GetPlainTextSecretsV3(loggedInUserDetails.UserCredentials.JWTToken, params.WorkspaceId,
params.Environment, params.SecretsPath, params.IncludeImport, params.Recursive, params.TagSlugs, true) params.Environment, params.SecretsPath, params.IncludeImport, params.Recursive, params.TagSlugs, true)
log.Debug().Msgf("GetAllEnvironmentVariables: Trying to fetch secrets JTW token [err=%s]", err) log.Debug().Msgf("GetAllEnvironmentVariables: Trying to fetch secrets JWT token [err=%s]", err)
if err == nil { if err == nil {
backupEncryptionKey, err := GetBackupEncryptionKey() backupEncryptionKey, err := GetBackupEncryptionKey()

4
frontend/src/components/utilities/attemptCliLogin.ts
View File

@@ -16,7 +16,7 @@ export interface IsCliLoginSuccessful {
loginResponse?: { loginResponse?: {
email: string; email: string;
privateKey: string; privateKey: string;
JTWToken: string; JWTToken: string;
}; };
success: boolean; success: boolean;
} }
@@ -131,7 +131,7 @@ const attemptLogin = async ({
loginResponse: { loginResponse: {
email, email,
privateKey, privateKey,
JTWToken: token JWTToken: token
}, },
success: true success: true
}); });

4
frontend/src/components/utilities/attemptCliLoginMfa.ts
View File

@@ -14,7 +14,7 @@ interface IsMfaLoginSuccessful {
success: boolean; success: boolean;
loginResponse: { loginResponse: {
privateKey: string; privateKey: string;
JTWToken: string; JWTToken: string;
}; };
} }
@@ -95,7 +95,7 @@ const attemptLoginMfa = async ({
success: true, success: true,
loginResponse: { loginResponse: {
privateKey, privateKey,
JTWToken: token JWTToken: token
} }
}); });
} catch (err) { } catch (err) {

4
frontend/src/pages/auth/LoginPage/components/PasswordStep/PasswordStep.tsx
View File

@@ -96,7 +96,7 @@ export const PasswordStep = ({
const payload = { const payload = {
privateKey, privateKey,
email, email,
JTWToken: token, JWTToken: token,
refreshToken refreshToken
}; };
await instance.post(cliUrl, payload).catch(() => { await instance.post(cliUrl, payload).catch(() => {
@@ -209,7 +209,7 @@ export const PasswordStep = ({
const instance = axios.create(); const instance = axios.create();
const payload = { const payload = {
...isCliLoginSuccessful.loginResponse, ...isCliLoginSuccessful.loginResponse,
JTWToken: token, JWTToken: token,
refreshToken refreshToken
}; };
await instance.post(cliUrl, payload).catch(() => { await instance.post(cliUrl, payload).catch(() => {

2
frontend/src/pages/auth/SelectOrgPage/SelectOrgSection.tsx
View File

@@ -149,7 +149,7 @@ export const SelectOrganizationSection = () => {
} }
const payload = { const payload = {
JTWToken: token, JWTToken: token,
email: user?.email, email: user?.email,
privateKey, privateKey,
refreshToken refreshToken