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

Fix merge conflicts

Browse Source
This commit is contained in:
Tuan Dang
2023-12-12 15:50:14 +07:00
parent 93aeacc6b6 f940f8b79d
commit b551ee50e7
5 changed files with 31 additions and 27 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
// incremental lifetime
type: Number,
default: 7200,
default: 2592000, // 30 days
required: true
},
accessTokenMaxTTL: { // seconds
// max lifetime
type: Number,
default: 7200,
default: 2592000, // 30 days
required: true
},
accessTokenTrustedIps: {
backend/src/validation/auth.ts
+6 -2
View File
@@ -117,7 +117,9 @@ export const AddUniversalAuthToIdentityV1 = z.object({
.min(1)
.default([{ ipAddress: "0.0.0.0/0" }]),
accessTokenTTL: z.number().int().min(0).default(7200),
accessTokenMaxTTL: z.number().int().min(0).default(2592000),
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)
})
});
@@ -143,7 +145,9 @@ export const UpdateUniversalAuthToIdentityV1 = z.object({
.optional(),
accessTokenTTL: z.number().int().min(0).optional(),
accessTokenNumUsesLimit: z.number().int().min(0).optional(),
accessTokenMaxTTL: z.number().int().min(0).optional(),
accessTokenMaxTTL: z.number().int().refine(value => value !== 0, {
message: "accessTokenMaxTTL must have a non zero number",
}).optional(),
}),
});