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

non-zero-max-ttl

Browse Source
This commit is contained in:
Maidul Islam
2023-12-11 14:21:51 -05:00
parent f3e8ef1537
commit 1f97ac5192
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/models/identityAccessToken.ts
+2 -2
View File
@@ -53,13 +53,13 @@ const identityAccessTokenSchema = new Schema(
accessTokenTTL: { // seconds accessTokenTTL: { // seconds
// incremental lifetime // incremental lifetime
type: Number, type: Number,
default: 7200, default: 2592000, // 30 days
required: true required: true
}, },
accessTokenMaxTTL: { // seconds accessTokenMaxTTL: { // seconds
// max lifetime // max lifetime
type: Number, type: Number,
default: 7200, default: 2592000, // 30 days
required: true required: true
}, },
accessTokenTrustedIps: { accessTokenTrustedIps: {
backend/src/validation/auth.ts
+6 -2
View File
@@ -117,7 +117,9 @@ export const AddUniversalAuthToIdentityV1 = z.object({
.min(1) .min(1)
.default([{ ipAddress: "0.0.0.0/0" }]), .default([{ ipAddress: "0.0.0.0/0" }]),
accessTokenTTL: z.number().int().min(0).default(7200), accessTokenTTL: z.number().int().min(0).default(7200),
accessTokenMaxTTL: z.number().int().min(0).default(0), accessTokenMaxTTL: z.number().int().refine(value => value !== 0, {
message: "accessTokenMaxTTL must have a non zero number",
}).default(2592000), // 30 days
accessTokenNumUsesLimit: z.number().int().min(0).default(0) accessTokenNumUsesLimit: z.number().int().min(0).default(0)
}) })
}); });
@@ -143,7 +145,9 @@ export const UpdateUniversalAuthToIdentityV1 = z.object({
.optional(), .optional(),
accessTokenTTL: z.number().int().min(0).optional(), accessTokenTTL: z.number().int().min(0).optional(),
accessTokenNumUsesLimit: z.number().int().min(0).optional(), accessTokenNumUsesLimit: z.number().int().min(0).optional(),
accessTokenMaxTTL: z.number().int().min(0).default(0), accessTokenMaxTTL: z.number().int().refine(value => value !== 0, {
message: "accessTokenMaxTTL must have a non zero number",
}).default(2592000),
}), }),
}); });
frontend/src/views/Org/MembersPage/components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx
+9 -9
View File
@@ -88,8 +88,8 @@ export const IdentityUniversalAuthForm = ({
} = useForm<FormData>({ } = useForm<FormData>({
resolver: yupResolver(schema), resolver: yupResolver(schema),
defaultValues: { defaultValues: {
accessTokenTTL: "7200", accessTokenTTL: "2592000",
accessTokenMaxTTL: "0", accessTokenMaxTTL: "2592000",
accessTokenNumUsesLimit: "0", accessTokenNumUsesLimit: "0",
clientSecretTrustedIps: [{ clientSecretTrustedIps: [{
ipAddress: "0.0.0.0/0" ipAddress: "0.0.0.0/0"
@@ -136,8 +136,8 @@ export const IdentityUniversalAuthForm = ({
}); });
} else { } else {
reset({ reset({
accessTokenTTL: "7200", accessTokenTTL: "2592000",
accessTokenMaxTTL: "0", accessTokenMaxTTL: "2592000",
accessTokenNumUsesLimit: "0", accessTokenNumUsesLimit: "0",
clientSecretTrustedIps: [{ clientSecretTrustedIps: [{
ipAddress: "0.0.0.0/0" ipAddress: "0.0.0.0/0"
@@ -211,7 +211,7 @@ export const IdentityUniversalAuthForm = ({
<form onSubmit={handleSubmit(onFormSubmit)}> <form onSubmit={handleSubmit(onFormSubmit)}>
<Controller <Controller
control={control} control={control}
defaultValue="7200" defaultValue="2592000"
name="accessTokenTTL" name="accessTokenTTL"
render={({ field, fieldState: { error } }) => ( render={({ field, fieldState: { error } }) => (
<FormControl <FormControl
@@ -221,7 +221,7 @@ export const IdentityUniversalAuthForm = ({
> >
<Input <Input
{...field} {...field}
placeholder="7200" placeholder="2592000"
type="number" type="number"
min="0" min="0"
step="1" step="1"
@@ -231,7 +231,7 @@ export const IdentityUniversalAuthForm = ({
/> />
<Controller <Controller
control={control} control={control}
defaultValue="7200" defaultValue="2592000"
name="accessTokenMaxTTL" name="accessTokenMaxTTL"
render={({ field, fieldState: { error } }) => ( render={({ field, fieldState: { error } }) => (
<FormControl <FormControl
@@ -241,9 +241,9 @@ export const IdentityUniversalAuthForm = ({
> >
<Input <Input
{...field} {...field}
placeholder="7200" placeholder="2592000"
type="number" type="number"
min="0" min="1"
step="1" step="1"
/> />
</FormControl> </FormControl>