MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Budibase/budibase

This commit is contained in:
mike12345567 2023-08-09 10:57:30 +01:00
parent c1438b2988 0fc1f13daa
commit a33449531a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.9.14", "version": "2.9.15",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

14
packages/worker/src/api/routes/validation/users.ts
View File

@ -1,12 +1,14 @@
import { auth } from "@budibase/backend-core" import { auth } from "@budibase/backend-core"
import Joi from "joi" import Joi from "joi"
const OPTIONAL_STRING = Joi.string().allow(null, "")
let schema: any = { let schema: any = {
email: Joi.string().allow(null, ""), email: OPTIONAL_STRING,
password: Joi.string().allow(null, ""), password: OPTIONAL_STRING,
forceResetPassword: Joi.boolean().optional(), forceResetPassword: Joi.boolean().optional(),
firstName: Joi.string().allow(null, ""), firstName: OPTIONAL_STRING,
lastName: Joi.string().allow(null, ""), lastName: OPTIONAL_STRING,
builder: Joi.object({ builder: Joi.object({
global: Joi.boolean().optional(), global: Joi.boolean().optional(),
apps: Joi.array().optional(), apps: Joi.array().optional(),
@ -21,8 +23,8 @@ export const buildSelfSaveValidation = () => {
schema = { schema = {
password: Joi.string().optional(), password: Joi.string().optional(),
forceResetPassword: Joi.boolean().optional(), forceResetPassword: Joi.boolean().optional(),
firstName: Joi.string().allow("").optional(), firstName: OPTIONAL_STRING,
lastName: Joi.string().allow("").optional(), lastName: OPTIONAL_STRING,
onboardedAt: Joi.string().optional(), onboardedAt: Joi.string().optional(),
} }
return auth.joiValidator.body(Joi.object(schema).required().unknown(false)) return auth.joiValidator.body(Joi.object(schema).required().unknown(false))