summaryrefslogtreecommitdiff
path: root/src/api/endpoints/auth/session
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-03-09 03:50:09 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-03-09 03:50:09 +0900
commit31f36fa618e02bab9776a943366167e1009ede48 (patch)
tree386dbaa963b3695f6a0febf9b5076e8d42006536 /src/api/endpoints/auth/session
parentMerge pull request #237 from syuilo/greenkeeper/cafy-1.2.0 (diff)
downloadsharkey-31f36fa618e02bab9776a943366167e1009ede48.tar.gz
sharkey-31f36fa618e02bab9776a943366167e1009ede48.tar.bz2
sharkey-31f36fa618e02bab9776a943366167e1009ede48.zip
:v:
Diffstat (limited to 'src/api/endpoints/auth/session')
-rw-r--r--src/api/endpoints/auth/session/generate.ts4
-rw-r--r--src/api/endpoints/auth/session/show.ts4
-rw-r--r--src/api/endpoints/auth/session/userkey.ts6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/api/endpoints/auth/session/generate.ts b/src/api/endpoints/auth/session/generate.ts
index 2378d123f3..510382247e 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 'cafy';
+import $ 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().get();
+ const [appSecret, appSecretErr] = $(params.app_secret).string().$;
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 e16943683f..ede8a67634 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 'cafy';
+import $ 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().get();
+ const [token, tokenErr] = $(params.token).string().$;
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 9816ea2051..afd3250b04 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 'cafy';
+import $ 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().get();
+ const [appSecret, appSecretErr] = $(params.app_secret).string().$;
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().get();
+ const [token, tokenErr] = $(params.token).string().$;
if (tokenErr) return rej('invalid token param');
// Fetch token