diff options
Diffstat (limited to 'src/server/api/endpoints/auth')
| -rw-r--r-- | src/server/api/endpoints/auth/accept.ts | 10 | ||||
| -rw-r--r-- | src/server/api/endpoints/auth/session/generate.ts | 9 | ||||
| -rw-r--r-- | src/server/api/endpoints/auth/session/show.ts | 10 | ||||
| -rw-r--r-- | src/server/api/endpoints/auth/session/userkey.ts | 9 |
4 files changed, 12 insertions, 26 deletions
diff --git a/src/server/api/endpoints/auth/accept.ts b/src/server/api/endpoints/auth/accept.ts index ed1c2fa390..b7e11bd463 100644 --- a/src/server/api/endpoints/auth/accept.ts +++ b/src/server/api/endpoints/auth/accept.ts @@ -4,8 +4,7 @@ import $ from 'cafy'; import App from '../../../../models/app'; import AuthSess from '../../../../models/auth-session'; import AccessToken from '../../../../models/access-token'; -import { ILocalUser } from '../../../../models/user'; -import getParams from '../../get-params'; +import define from '../../define'; export const meta = { requireCredential: true, @@ -19,10 +18,7 @@ export const meta = { } }; -export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { - const [ps, psErr] = getParams(meta, params); - if (psErr) return rej(psErr); - +export default define(meta, (ps, user) => new Promise(async (res, rej) => { // Fetch token const session = await AuthSess .findOne({ token: ps.token }); @@ -70,4 +66,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = // Response res(); -}); +})); diff --git a/src/server/api/endpoints/auth/session/generate.ts b/src/server/api/endpoints/auth/session/generate.ts index 79eb34d96a..5ef3404b73 100644 --- a/src/server/api/endpoints/auth/session/generate.ts +++ b/src/server/api/endpoints/auth/session/generate.ts @@ -3,7 +3,7 @@ import $ from 'cafy'; import App from '../../../../../models/app'; import AuthSess from '../../../../../models/auth-session'; import config from '../../../../../config'; -import getParams from '../../../get-params'; +import define from '../../../define'; export const meta = { requireCredential: false, @@ -15,10 +15,7 @@ export const meta = { } }; -export default (params: any) => new Promise(async (res, rej) => { - const [ps, psErr] = getParams(meta, params); - if (psErr) return rej(psErr); - +export default define(meta, (ps) => new Promise(async (res, rej) => { // Lookup app const app = await App.findOne({ secret: ps.appSecret @@ -43,4 +40,4 @@ export default (params: any) => new Promise(async (res, rej) => { token: doc.token, url: `${config.auth_url}/${doc.token}` }); -}); +})); diff --git a/src/server/api/endpoints/auth/session/show.ts b/src/server/api/endpoints/auth/session/show.ts index 9e7f4f52d4..cc63c43ad3 100644 --- a/src/server/api/endpoints/auth/session/show.ts +++ b/src/server/api/endpoints/auth/session/show.ts @@ -1,7 +1,6 @@ import $ from 'cafy'; import AuthSess, { pack } from '../../../../../models/auth-session'; -import { ILocalUser } from '../../../../../models/user'; -import getParams from '../../../get-params'; +import define from '../../../define'; export const meta = { requireCredential: false, @@ -13,10 +12,7 @@ export const meta = { } }; -export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { - const [ps, psErr] = getParams(meta, params); - if (psErr) return rej(psErr); - +export default define(meta, (ps, user) => new Promise(async (res, rej) => { // Lookup session const session = await AuthSess.findOne({ token: ps.token @@ -28,4 +24,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = // Response res(await pack(session, user)); -}); +})); diff --git a/src/server/api/endpoints/auth/session/userkey.ts b/src/server/api/endpoints/auth/session/userkey.ts index 50edf12abc..9f924d27a0 100644 --- a/src/server/api/endpoints/auth/session/userkey.ts +++ b/src/server/api/endpoints/auth/session/userkey.ts @@ -3,7 +3,7 @@ import App from '../../../../../models/app'; import AuthSess from '../../../../../models/auth-session'; import AccessToken from '../../../../../models/access-token'; import { pack } from '../../../../../models/user'; -import getParams from '../../../get-params'; +import define from '../../../define'; export const meta = { requireCredential: false, @@ -19,10 +19,7 @@ export const meta = { } }; -export default (params: any) => new Promise(async (res, rej) => { - const [ps, psErr] = getParams(meta, params); - if (psErr) return rej(psErr); - +export default define(meta, (ps) => new Promise(async (res, rej) => { // Lookup app const app = await App.findOne({ secret: ps.appSecret @@ -71,4 +68,4 @@ export default (params: any) => new Promise(async (res, rej) => { detail: true }) }); -}); +})); |