From 17a23c3eb508bd15bc68999f448224eb7cc64354 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 5 Mar 2017 12:00:39 +0900 Subject: Use cafy --- src/api/endpoints/auth/session/generate.ts | 4 ++-- src/api/endpoints/auth/session/show.ts | 4 ++-- src/api/endpoints/auth/session/userkey.ts | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/api/endpoints/auth/session') diff --git a/src/api/endpoints/auth/session/generate.ts b/src/api/endpoints/auth/session/generate.ts index ceb3079ae2..2378d123f3 100644 --- a/src/api/endpoints/auth/session/generate.ts +++ b/src/api/endpoints/auth/session/generate.ts @@ -2,7 +2,7 @@ * Module dependencies */ import * as uuid from 'uuid'; -import it from '../../../it'; +import it from 'cafy'; import App from '../../../models/app'; import AuthSess from '../../../models/auth-session'; import config from '../../../../conf'; @@ -46,7 +46,7 @@ import config from '../../../../conf'; */ module.exports = (params) => new Promise(async (res, rej) => { // Get 'app_secret' parameter - const [appSecret, appSecretErr] = it(params.app_secret).expect.string().required().qed(); + const [appSecret, appSecretErr] = it(params.app_secret).expect.string().required().get(); if (appSecretErr) return rej('invalid app_secret param'); // Lookup app diff --git a/src/api/endpoints/auth/session/show.ts b/src/api/endpoints/auth/session/show.ts index 77f8c5dc9e..e16943683f 100644 --- a/src/api/endpoints/auth/session/show.ts +++ b/src/api/endpoints/auth/session/show.ts @@ -1,7 +1,7 @@ /** * Module dependencies */ -import it from '../../../it'; +import it from 'cafy'; import AuthSess from '../../../models/auth-session'; import serialize from '../../../serializers/auth-session'; @@ -54,7 +54,7 @@ import serialize from '../../../serializers/auth-session'; */ module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'token' parameter - const [token, tokenErr] = it(params.token).expect.string().required().qed(); + const [token, tokenErr] = it(params.token).expect.string().required().get(); if (tokenErr) return rej('invalid token param'); // Lookup session diff --git a/src/api/endpoints/auth/session/userkey.ts b/src/api/endpoints/auth/session/userkey.ts index 121c9ce269..9816ea2051 100644 --- a/src/api/endpoints/auth/session/userkey.ts +++ b/src/api/endpoints/auth/session/userkey.ts @@ -1,7 +1,7 @@ /** * Module dependencies */ -import it from '../../../it'; +import it from 'cafy'; import App from '../../../models/app'; import AuthSess from '../../../models/auth-session'; import AccessToken from '../../../models/access-token'; @@ -51,7 +51,7 @@ import serialize from '../../../serializers/user'; */ module.exports = (params) => new Promise(async (res, rej) => { // Get 'app_secret' parameter - const [appSecret, appSecretErr] = it(params.app_secret).expect.string().required().qed(); + const [appSecret, appSecretErr] = it(params.app_secret).expect.string().required().get(); if (appSecretErr) return rej('invalid app_secret param'); // Lookup app @@ -64,7 +64,7 @@ module.exports = (params) => new Promise(async (res, rej) => { } // Get 'token' parameter - const [token, tokenErr] = it(params.token).expect.string().required().qed(); + const [token, tokenErr] = it(params.token).expect.string().required().get(); if (tokenErr) return rej('invalid token param'); // Fetch token -- cgit v1.2.3-freya