github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Using Joi.object when configuring route validation (#24596)

Browse source 
* Using Joi.object when configuring route validation

* Adding forgotten API

* Fixing test
This commit is contained in:
Brandon Kobel 2018-11-01 05:32:12 -07:00 • committed by GitHub
parent 157477a2d7
commit 70f1a4094e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/security/server/lib/user_schema.js
View file

@ -6,7 +6,7 @@
import Joi from 'joi';
export const userSchema = {
export const userSchema = Joi.object({
username: Joi.string().required(),
password: Joi.string(),
roles: Joi.array().items(Joi.string()),
@ -14,4 +14,4 @@ export const userSchema = {
email: Joi.string().allow(null, ''),
metadata: Joi.object(),
enabled: Joi.boolean().default(true)
};
});

8
x-pack/plugins/security/server/routes/api/v1/__tests__/authenticate.js
View file

@ -62,10 +62,10 @@ describe('Authentication routes', () => {
expect(loginRoute.config).to.eql({
auth: false,
validate: {
payload: {
payload: Joi.object({
username: Joi.string().required(),
password: Joi.string().required()
}
})
},
response: {
emptyStatusCode: 204,
@ -304,10 +304,10 @@ describe('Authentication routes', () => {
expect(samlAcsRoute.config).to.eql({
auth: false,
validate: {
payload: {
payload: Joi.object({
SAMLResponse: Joi.string().required(),
RelayState: Joi.string().allow('')
}
})
}
});
});

4
x-pack/plugins/security/server/routes/api/v1/__tests__/users.js
View file

@ -60,10 +60,10 @@ describe('User routes', () => {
expect(changePasswordRoute.config).to.have.property('pre');
expect(changePasswordRoute.config.pre).to.have.length(1);
expect(changePasswordRoute.config.validate).to.eql({
payload: {
payload: Joi.object({
password: Joi.string(),
newPassword: Joi.string().required()
}
})
});
});

8
x-pack/plugins/security/server/routes/api/v1/authenticate.js
View file

@ -18,10 +18,10 @@ export function initAuthenticateApi(server) {
config: {
auth: false,
validate: {
payload: {
payload: Joi.object({
username: Joi.string().required(),
password: Joi.string().required()
}
})
},
response: {
emptyStatusCode: 204,
@ -58,10 +58,10 @@ export function initAuthenticateApi(server) {
config: {
auth: false,
validate: {
payload: {
payload: Joi.object({
SAMLResponse: Joi.string().required(),
RelayState: Joi.string().allow('')
}
})
}
},
async handler(request, h) {

4
x-pack/plugins/security/server/routes/api/v1/users.js
View file

@ -121,10 +121,10 @@ export function initUsersApi(server) {
},
config: {
validate: {
payload: {
payload: Joi.object({
password: Joi.string(),
newPassword: Joi.string().required()
}
})
},
pre: [routePreCheckLicenseFn]
}