From 2756f553c68082342a784ef716c62da6cea6f3ca Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 22 Feb 2019 11:46:58 +0900 Subject: Improve error handling of API (#4345) * wip * wip * wip * Update attached_notes.ts * wip * Refactor * wip * wip * wip * wip * wip * wip * wip * wip * Update call.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * :v: * Fix --- src/server/api/endpoints/sw/register.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/api/endpoints/sw') diff --git a/src/server/api/endpoints/sw/register.ts b/src/server/api/endpoints/sw/register.ts index 095c1b765d..870c13555f 100644 --- a/src/server/api/endpoints/sw/register.ts +++ b/src/server/api/endpoints/sw/register.ts @@ -21,7 +21,7 @@ export const meta = { } }; -export default define(meta, (ps, user) => new Promise(async (res, rej) => { +export default define(meta, async (ps, user) => { // if already subscribed const exist = await Subscription.findOne({ userId: user._id, @@ -34,10 +34,10 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { const instance = await fetchMeta(); if (exist != null) { - return res({ + return { state: 'already-subscribed', key: instance.swPublicKey - }); + }; } await Subscription.insert({ @@ -47,8 +47,8 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { publickey: ps.publickey }); - res({ + return { state: 'subscribed', key: instance.swPublicKey - }); -})); + }; +}); -- cgit v1.2.3-freya