From a7e6b766be6b30b37839beb13f31d96b141cc25a Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 2 Nov 2018 12:49:08 +0900 Subject: Resolve #2623 --- src/server/api/endpoints/username/available.ts | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'src/server/api/endpoints/username') diff --git a/src/server/api/endpoints/username/available.ts b/src/server/api/endpoints/username/available.ts index ff12b797ed..b61be84c3b 100644 --- a/src/server/api/endpoints/username/available.ts +++ b/src/server/api/endpoints/username/available.ts @@ -1,20 +1,27 @@ import $ from 'cafy'; import User from '../../../../models/user'; import { validateUsername } from '../../../../models/user'; +import getParams from '../../get-params'; + +export const meta = { + requireCredential: false, + + params: { + username: { + validator: $.str.pipe(validateUsername) + } + } +}; -/** - * Check available username - */ export default async (params: any) => new Promise(async (res, rej) => { - // Get 'username' parameter - const [username, usernameError] = $.str.pipe(validateUsername).get(params.username); - if (usernameError) return rej('invalid username param'); + const [ps, psErr] = getParams(meta, params); + if (psErr) return rej(psErr); // Get exist const exist = await User .count({ host: null, - usernameLower: username.toLowerCase() + usernameLower: ps.username.toLowerCase() }, { limit: 1 }); -- cgit v1.2.3-freya