awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 20:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3797 from Infisical/ENG-2690

Browse Source 
feat: Lower token lifetime to 1 day (refresh 14 days) and fix CLI refresh token functionality
This commit is contained in:
x032205
2025-06-19 12:05:24 -04:00
committed by GitHub
parent f385386a4b 77fe2ffb3b
commit 7d90d183fb
21 changed files with 77 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/lib/config/env.ts
+2 -2
View File
@@ -101,9 +101,9 @@ const envSchema = z
LOOPS_API_KEY: zpStr(z.string().optional()), LOOPS_API_KEY: zpStr(z.string().optional()),
// jwt options // jwt options
AUTH_SECRET: zpStr(z.string()).default(process.env.JWT_AUTH_SECRET), // for those still using old JWT_AUTH_SECRET AUTH_SECRET: zpStr(z.string()).default(process.env.JWT_AUTH_SECRET), // for those still using old JWT_AUTH_SECRET
JWT_AUTH_LIFETIME: zpStr(z.string().default("10d")), JWT_AUTH_LIFETIME: zpStr(z.string().default("1d")),
JWT_SIGNUP_LIFETIME: zpStr(z.string().default("15m")), JWT_SIGNUP_LIFETIME: zpStr(z.string().default("15m")),
JWT_REFRESH_LIFETIME: zpStr(z.string().default("90d")), JWT_REFRESH_LIFETIME: zpStr(z.string().default("14d")),
JWT_INVITE_LIFETIME: zpStr(z.string().default("1d")), JWT_INVITE_LIFETIME: zpStr(z.string().default("1d")),
JWT_MFA_LIFETIME: zpStr(z.string().default("5m")), JWT_MFA_LIFETIME: zpStr(z.string().default("5m")),
JWT_PROVIDER_AUTH_LIFETIME: zpStr(z.string().default("15m")), JWT_PROVIDER_AUTH_LIFETIME: zpStr(z.string().default("15m")),
backend/src/server/plugins/auth/inject-identity.ts
+1 -1
View File
@@ -107,7 +107,7 @@ export const injectIdentity = fp(async (server: FastifyZodProvider) => {
server.addHook("onRequest", async (req) => { server.addHook("onRequest", async (req) => {
const appCfg = getConfig(); const appCfg = getConfig();
if (req.url.includes(".well-known/est") || req.url.includes("/api/v3/auth/")) { if (req.url.includes(".well-known/est") || req.url.includes("/api/v3/auth/") || req.url === "/api/v1/auth/token") {
return; return;
} }
backend/src/server/routes/v3/login-router.ts
+7 -4
View File
@@ -50,7 +50,8 @@ export const registerLoginRouter = async (server: FastifyZodProvider) => {
200: z.object({ 200: z.object({
token: z.string(), token: z.string(),
isMfaEnabled: z.boolean(), isMfaEnabled: z.boolean(),
mfaMethod: z.string().optional() mfaMethod: z.string().optional(),
refreshToken: z.string().optional()
}) })
} }
}, },
@@ -101,7 +102,7 @@ export const registerLoginRouter = async (server: FastifyZodProvider) => {
maxAge: 0 maxAge: 0
}); });
return { token: tokens.access, isMfaEnabled: false }; return { token: tokens.access, isMfaEnabled: false, refreshToken: tokens.refresh };
} }
}); });
@@ -129,7 +130,8 @@ export const registerLoginRouter = async (server: FastifyZodProvider) => {
encryptedPrivateKey: z.string(), encryptedPrivateKey: z.string(),
iv: z.string(), iv: z.string(),
tag: z.string(), tag: z.string(),
token: z.string() token: z.string(),
refreshToken: z.string().optional()
}) })
} }
}, },
@@ -172,7 +174,8 @@ export const registerLoginRouter = async (server: FastifyZodProvider) => {
tag: data.user.tag, tag: data.user.tag,
protectedKey: data.user.protectedKey || null, protectedKey: data.user.protectedKey || null,
protectedKeyIV: data.user.protectedKeyIV || null, protectedKeyIV: data.user.protectedKeyIV || null,
protectedKeyTag: data.user.protectedKeyTag || null protectedKeyTag: data.user.protectedKeyTag || null,
refreshToken: data.token.refresh
} as const; } as const;
} }
}); });
cli/packages/api/model.go
+2 -2
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"`
@@ -267,7 +267,7 @@ type GetLoginTwoV2Response struct {
ProtectedKey string `json:"protectedKey"` ProtectedKey string `json:"protectedKey"`
ProtectedKeyIV string `json:"protectedKeyIV"` ProtectedKeyIV string `json:"protectedKeyIV"`
ProtectedKeyTag string `json:"protectedKeyTag"` ProtectedKeyTag string `json:"protectedKeyTag"`
RefreshToken string `json:"RefreshToken"` RefreshToken string `json:"refreshToken"`
} }
type VerifyMfaTokenRequest struct { type VerifyMfaTokenRequest struct {
cli/packages/cmd/dynamic_secrets.go
+5 -5
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)
cli/packages/cmd/export.go
+1 -1
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)
cli/packages/cmd/init.go
+2 -2
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)
cli/packages/cmd/login.go
+5 -4
View File
@@ -111,7 +111,7 @@ var loginCmd = &cobra.Command{
infisicalClient := infisicalSdk.NewInfisicalClient(context.Background(), infisicalSdk.Config{ infisicalClient := infisicalSdk.NewInfisicalClient(context.Background(), infisicalSdk.Config{
SiteUrl: config.INFISICAL_URL, SiteUrl: config.INFISICAL_URL,
UserAgent: api.USER_AGENT, UserAgent: api.USER_AGENT,
AutoTokenRefresh: false, AutoTokenRefresh: true,
CustomHeaders: customHeaders, CustomHeaders: customHeaders,
}) })
@@ -437,7 +437,8 @@ 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
} }
func init() { func init() {
@@ -862,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
@@ -871,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)
cli/packages/cmd/secrets.go
+2 -2
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 {
cli/packages/cmd/ssh.go
+4 -4
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")
cli/packages/cmd/tokens.go
+2 -2
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{
cli/packages/cmd/user.go
+2 -2
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)
}, },
} }
cli/packages/models/cli.go
+2 -2
View File
@@ -5,8 +5,8 @@ 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"`
} }
// The file struct for Infisical config file // The file struct for Infisical config file
cli/packages/util/credentials.go
+13 -13
View File
@@ -9,6 +9,7 @@ import (
"github.com/Infisical/infisical-merge/packages/api" "github.com/Infisical/infisical-merge/packages/api"
"github.com/Infisical/infisical-merge/packages/config" "github.com/Infisical/infisical-merge/packages/config"
"github.com/Infisical/infisical-merge/packages/models" "github.com/Infisical/infisical-merge/packages/models"
"github.com/rs/zerolog/log"
"github.com/zalando/go-keyring" "github.com/zalando/go-keyring"
) )
@@ -90,23 +91,22 @@ 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)
// TODO: add refresh token if !isAuthenticated {
// if !isAuthenticated { accessTokenResponse, refreshErr := api.CallGetNewAccessTokenWithRefreshToken(httpClient, userCreds.RefreshToken)
// accessTokenResponse, err := api.CallGetNewAccessTokenWithRefreshToken(httpClient, userCreds.RefreshToken) if refreshErr == nil && accessTokenResponse.Token != "" {
// if err == nil && accessTokenResponse.Token != "" { isAuthenticated = true
// isAuthenticated = true userCreds.JWTToken = accessTokenResponse.Token
// userCreds.JTWToken = accessTokenResponse.Token }
// } }
// }
// err = StoreUserCredsInKeyRing(&userCreds) err = StoreUserCredsInKeyRing(&userCreds)
// if err != nil { if err != nil {
// log.Debug().Msg("unable to store your user credentials with new access token") log.Debug().Msg("unable to store your user credentials with new access token")
// } }
if !isAuthenticated { if !isAuthenticated {
return LoggedInUserDetails{ return LoggedInUserDetails{
cli/packages/util/folders.go
+5 -5
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
cli/packages/util/secrets.go
+2 -2
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()
frontend/src/components/utilities/attemptCliLogin.ts
+2 -2
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
}); });
frontend/src/components/utilities/attemptCliLoginMfa.ts
+2 -2
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) {
frontend/src/hooks/api/auth/queries.tsx
+1
View File
@@ -73,6 +73,7 @@ export const selectOrganization = async (data: {
}) => { }) => {
const { data: res } = await apiRequest.post<{ const { data: res } = await apiRequest.post<{
token: string; token: string;
refreshToken: string;
isMfaEnabled: boolean; isMfaEnabled: boolean;
mfaMethod?: MfaMethod; mfaMethod?: MfaMethod;
}>("/api/v3/auth/select-organization", data); }>("/api/v3/auth/select-organization", data);
frontend/src/pages/auth/LoginPage/components/PasswordStep/PasswordStep.tsx
+10 -6
View File
@@ -76,7 +76,9 @@ export const PasswordStep = ({
// case: organization ID is present from the provider auth token -- select the org and use the new jwt token in the CLI, then navigate to the org // case: organization ID is present from the provider auth token -- select the org and use the new jwt token in the CLI, then navigate to the org
if (organizationId) { if (organizationId) {
const finishWithOrgWorkflow = async () => { const finishWithOrgWorkflow = async () => {
const { token, isMfaEnabled, mfaMethod } = await selectOrganization({ organizationId }); const { token, isMfaEnabled, mfaMethod, refreshToken } = await selectOrganization({
organizationId
});
if (isMfaEnabled) { if (isMfaEnabled) {
SecurityClient.setMfaToken(token); SecurityClient.setMfaToken(token);
@@ -94,10 +96,11 @@ export const PasswordStep = ({
const payload = { const payload = {
privateKey, privateKey,
email, email,
JTWToken: token JWTToken: token,
refreshToken
}; };
await instance.post(cliUrl, payload).catch(() => { await instance.post(cliUrl, payload).catch(() => {
// if error happens to communicate we set the token with an expiry in sessino storage // if error happens to communicate we set the token with an expiry in session storage
// the cli-redirect page has logic to show this to user and ask them to paste it in terminal // the cli-redirect page has logic to show this to user and ask them to paste it in terminal
sessionStorage.setItem( sessionStorage.setItem(
SessionStorageKeys.CLI_TERMINAL_TOKEN, SessionStorageKeys.CLI_TERMINAL_TOKEN,
@@ -187,7 +190,7 @@ export const PasswordStep = ({
// case: organization ID is present from the provider auth token -- select the org and use the new jwt token in the CLI, then navigate to the org // case: organization ID is present from the provider auth token -- select the org and use the new jwt token in the CLI, then navigate to the org
if (organizationId) { if (organizationId) {
const finishWithOrgWorkflow = async () => { const finishWithOrgWorkflow = async () => {
const { token, isMfaEnabled, mfaMethod } = await selectOrganization({ const { token, isMfaEnabled, mfaMethod, refreshToken } = await selectOrganization({
organizationId organizationId
}); });
@@ -206,10 +209,11 @@ export const PasswordStep = ({
const instance = axios.create(); const instance = axios.create();
const payload = { const payload = {
...isCliLoginSuccessful.loginResponse, ...isCliLoginSuccessful.loginResponse,
JTWToken: token JWTToken: token,
refreshToken
}; };
await instance.post(cliUrl, payload).catch(() => { await instance.post(cliUrl, payload).catch(() => {
// if error happens to communicate we set the token with an expiry in sessino storage // if error happens to communicate we set the token with an expiry in session storage
// the cli-redirect page has logic to show this to user and ask them to paste it in terminal // the cli-redirect page has logic to show this to user and ask them to paste it in terminal
sessionStorage.setItem( sessionStorage.setItem(
SessionStorageKeys.CLI_TERMINAL_TOKEN, SessionStorageKeys.CLI_TERMINAL_TOKEN,
frontend/src/pages/auth/SelectOrgPage/SelectOrgSection.tsx
+5 -4
View File
@@ -112,7 +112,7 @@ export const SelectOrganizationSection = () => {
return; return;
} }
const { token, isMfaEnabled, mfaMethod } = await selectOrg const { token, isMfaEnabled, mfaMethod, refreshToken } = await selectOrg
.mutateAsync({ .mutateAsync({
organizationId: organization.id, organizationId: organization.id,
userAgent: callbackPort ? UserAgentType.CLI : undefined userAgent: callbackPort ? UserAgentType.CLI : undefined
@@ -149,15 +149,16 @@ export const SelectOrganizationSection = () => {
} }
const payload = { const payload = {
JTWToken: token, JWTToken: token,
email: user?.email, email: user?.email,
privateKey privateKey,
refreshToken
} as IsCliLoginSuccessful["loginResponse"]; } as IsCliLoginSuccessful["loginResponse"];
// send request to server endpoint // send request to server endpoint
const instance = axios.create(); const instance = axios.create();
await instance.post(`http://127.0.0.1:${callbackPort}/`, payload).catch(() => { await instance.post(`http://127.0.0.1:${callbackPort}/`, payload).catch(() => {
// if error happens to communicate we set the token with an expiry in sessino storage // if error happens to communicate we set the token with an expiry in session storage
// the cli-redirect page has logic to show this to user and ask them to paste it in terminal // the cli-redirect page has logic to show this to user and ask them to paste it in terminal
sessionStorage.setItem( sessionStorage.setItem(
SessionStorageKeys.CLI_TERMINAL_TOKEN, SessionStorageKeys.CLI_TERMINAL_TOKEN,