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

* ✌️

* Fix
This commit is contained in:
syuilo
2019-02-22 11:46:58 +09:00
committed by GitHub
parent fc52e95ad0
commit 2756f553c6
181 changed files with 2010 additions and 1322 deletions

View File

@@ -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
});
}));
};
});