diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-03-04 04:28:38 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-03-04 04:28:38 +0900 |
| commit | 3c1b92baa1ac15c23fe63e2f50739105252ca516 (patch) | |
| tree | 35a0ae58802891f05209c83e780440775075e088 /src/api/endpoints/auth | |
| parent | Merge pull request #233 from syuilo/greenkeeper/inquirer-3.0.6 (diff) | |
| download | sharkey-3c1b92baa1ac15c23fe63e2f50739105252ca516.tar.gz sharkey-3c1b92baa1ac15c23fe63e2f50739105252ca516.tar.bz2 sharkey-3c1b92baa1ac15c23fe63e2f50739105252ca516.zip | |
Follow linter
Diffstat (limited to 'src/api/endpoints/auth')
| -rw-r--r-- | src/api/endpoints/auth/accept.ts | 6 | ||||
| -rw-r--r-- | src/api/endpoints/auth/session/generate.ts | 6 | ||||
| -rw-r--r-- | src/api/endpoints/auth/session/show.ts | 6 | ||||
| -rw-r--r-- | src/api/endpoints/auth/session/userkey.ts | 97 |
4 files changed, 50 insertions, 65 deletions
diff --git a/src/api/endpoints/auth/accept.ts b/src/api/endpoints/auth/accept.ts index 2c104ef1c6..7fc4a8a878 100644 --- a/src/api/endpoints/auth/accept.ts +++ b/src/api/endpoints/auth/accept.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -40,9 +38,7 @@ import AccessToken from '../../models/access-token'; * @param {any} user * @return {Promise<any>} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'token' parameter const [token, tokenErr] = it(params.token).expect.string().required().qed(); if (tokenErr) return rej('invalid token param'); diff --git a/src/api/endpoints/auth/session/generate.ts b/src/api/endpoints/auth/session/generate.ts index 6e730123c1..ceb3079ae2 100644 --- a/src/api/endpoints/auth/session/generate.ts +++ b/src/api/endpoints/auth/session/generate.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -46,9 +44,7 @@ import config from '../../../../conf'; * @param {any} params * @return {Promise<any>} */ -module.exports = (params) => - new Promise(async (res, rej) => -{ +module.exports = (params) => new Promise(async (res, rej) => { // Get 'app_secret' parameter const [appSecret, appSecretErr] = it(params.app_secret).expect.string().required().qed(); if (appSecretErr) return rej('invalid app_secret param'); diff --git a/src/api/endpoints/auth/session/show.ts b/src/api/endpoints/auth/session/show.ts index 55641929d8..77f8c5dc9e 100644 --- a/src/api/endpoints/auth/session/show.ts +++ b/src/api/endpoints/auth/session/show.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -54,9 +52,7 @@ import serialize from '../../../serializers/auth-session'; * @param {any} user * @return {Promise<any>} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'token' parameter const [token, tokenErr] = it(params.token).expect.string().required().qed(); if (tokenErr) return rej('invalid token param'); diff --git a/src/api/endpoints/auth/session/userkey.ts b/src/api/endpoints/auth/session/userkey.ts index fdb8c26d4e..121c9ce269 100644 --- a/src/api/endpoints/auth/session/userkey.ts +++ b/src/api/endpoints/auth/session/userkey.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -51,62 +49,61 @@ import serialize from '../../../serializers/user'; * @param {any} params * @return {Promise<any>} */ -module.exports = (params) => - new Promise(async (res, rej) => { - // Get 'app_secret' parameter - const [appSecret, appSecretErr] = it(params.app_secret).expect.string().required().qed(); - if (appSecretErr) return rej('invalid app_secret param'); +module.exports = (params) => new Promise(async (res, rej) => { + // Get 'app_secret' parameter + const [appSecret, appSecretErr] = it(params.app_secret).expect.string().required().qed(); + if (appSecretErr) return rej('invalid app_secret param'); - // Lookup app - const app = await App.findOne({ - secret: appSecret - }); + // Lookup app + const app = await App.findOne({ + secret: appSecret + }); - if (app == null) { - return rej('app not found'); - } + if (app == null) { + return rej('app not found'); + } - // Get 'token' parameter - const [token, tokenErr] = it(params.token).expect.string().required().qed(); - if (tokenErr) return rej('invalid token param'); + // Get 'token' parameter + const [token, tokenErr] = it(params.token).expect.string().required().qed(); + if (tokenErr) return rej('invalid token param'); - // Fetch token - const session = await AuthSess - .findOne({ - token: token, - app_id: app._id - }); + // Fetch token + const session = await AuthSess + .findOne({ + token: token, + app_id: app._id + }); - if (session === null) { - return rej('session not found'); - } + if (session === null) { + return rej('session not found'); + } - if (session.user_id == null) { - return rej('this session is not allowed yet'); - } + if (session.user_id == null) { + return rej('this session is not allowed yet'); + } - // Lookup access token - const accessToken = await AccessToken.findOne({ - app_id: app._id, - user_id: session.user_id - }); + // Lookup access token + const accessToken = await AccessToken.findOne({ + app_id: app._id, + user_id: session.user_id + }); - // Delete session + // Delete session - /* https://github.com/Automattic/monk/issues/178 - AuthSess.deleteOne({ - _id: session._id - }); - */ - AuthSess.remove({ - _id: session._id - }); + /* https://github.com/Automattic/monk/issues/178 + AuthSess.deleteOne({ + _id: session._id + }); + */ + AuthSess.remove({ + _id: session._id + }); - // Response - res({ - access_token: accessToken.token, - user: await serialize(session.user_id, null, { - detail: true - }) - }); + // Response + res({ + access_token: accessToken.token, + user: await serialize(session.user_id, null, { + detail: true + }) }); +}); |