diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-03-05 12:00:39 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-03-05 12:00:39 +0900 |
| commit | 17a23c3eb508bd15bc68999f448224eb7cc64354 (patch) | |
| tree | ef7ece8bf80ea957981856746b30be9beac544af /src/api/endpoints/app | |
| parent | Clean up :sparkles: (diff) | |
| download | sharkey-17a23c3eb508bd15bc68999f448224eb7cc64354.tar.gz sharkey-17a23c3eb508bd15bc68999f448224eb7cc64354.tar.bz2 sharkey-17a23c3eb508bd15bc68999f448224eb7cc64354.zip | |
Use cafy
Diffstat (limited to 'src/api/endpoints/app')
| -rw-r--r-- | src/api/endpoints/app/create.ts | 12 | ||||
| -rw-r--r-- | src/api/endpoints/app/name_id/available.ts | 4 | ||||
| -rw-r--r-- | src/api/endpoints/app/show.ts | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/api/endpoints/app/create.ts b/src/api/endpoints/app/create.ts index a357280aab..43f533d216 100644 --- a/src/api/endpoints/app/create.ts +++ b/src/api/endpoints/app/create.ts @@ -2,7 +2,7 @@ * Module dependencies */ import rndstr from 'rndstr'; -import it from '../../it'; +import it from 'cafy'; import App from '../../models/app'; import { isValidNameId } from '../../models/app'; import serialize from '../../serializers/app'; @@ -69,24 +69,24 @@ import serialize from '../../serializers/app'; */ module.exports = async (params, user) => new Promise(async (res, rej) => { // Get 'name_id' parameter - const [nameId, nameIdErr] = it(params.name_id).expect.string().required().validate(isValidNameId).qed(); + const [nameId, nameIdErr] = it(params.name_id).expect.string().required().validate(isValidNameId).get(); if (nameIdErr) return rej('invalid name_id param'); // Get 'name' parameter - const [name, nameErr] = it(params.name).expect.string().required().qed(); + const [name, nameErr] = it(params.name).expect.string().required().get(); if (nameErr) return rej('invalid name param'); // Get 'description' parameter - const [description, descriptionErr] = it(params.description).expect.string().required().qed(); + const [description, descriptionErr] = it(params.description).expect.string().required().get(); if (descriptionErr) return rej('invalid description param'); // Get 'permission' parameter - const [permission, permissionErr] = it(params.permission).expect.array().unique().allString().required().qed(); + const [permission, permissionErr] = it(params.permission).expect.array().unique().allString().required().get(); if (permissionErr) return rej('invalid permission param'); // Get 'callback_url' parameter // TODO: Check it is valid url - const [callbackUrl, callbackUrlErr] = it(params.callback_url).expect.nullable.string().default(null).qed(); + const [callbackUrl = null, callbackUrlErr] = it(params.callback_url).expect.nullable.string().get(); if (callbackUrlErr) return rej('invalid callback_url param'); // Generate secret diff --git a/src/api/endpoints/app/name_id/available.ts b/src/api/endpoints/app/name_id/available.ts index 64171fc73f..ac38c89847 100644 --- a/src/api/endpoints/app/name_id/available.ts +++ b/src/api/endpoints/app/name_id/available.ts @@ -1,7 +1,7 @@ /** * Module dependencies */ -import it from '../../../it'; +import it from 'cafy'; import App from '../../../models/app'; import { isValidNameId } from '../../../models/app'; @@ -42,7 +42,7 @@ import { isValidNameId } from '../../../models/app'; */ module.exports = async (params) => new Promise(async (res, rej) => { // Get 'name_id' parameter - const [nameId, nameIdErr] = it(params.name_id).expect.string().required().validate(isValidNameId).qed(); + const [nameId, nameIdErr] = it(params.name_id).expect.string().required().validate(isValidNameId).get(); if (nameIdErr) return rej('invalid name_id param'); // Get exist diff --git a/src/api/endpoints/app/show.ts b/src/api/endpoints/app/show.ts index e0ff02cf4b..e4aa3dc0fd 100644 --- a/src/api/endpoints/app/show.ts +++ b/src/api/endpoints/app/show.ts @@ -1,7 +1,7 @@ /** * Module dependencies */ -import it from '../../it'; +import it from 'cafy'; import App from '../../models/app'; import serialize from '../../serializers/app'; |