From 2756f553c68082342a784ef716c62da6cea6f3ca Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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/auth/session/generate.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'src/server/api/endpoints/auth/session/generate.ts')

diff --git a/src/server/api/endpoints/auth/session/generate.ts b/src/server/api/endpoints/auth/session/generate.ts
index 5ef3404b73..9f0f184719 100644
--- a/src/server/api/endpoints/auth/session/generate.ts
+++ b/src/server/api/endpoints/auth/session/generate.ts
@@ -4,6 +4,7 @@ import App from '../../../../../models/app';
 import AuthSess from '../../../../../models/auth-session';
 import config from '../../../../../config';
 import define from '../../../define';
+import { ApiError } from '../../../error';
 
 export const meta = {
 	requireCredential: false,
@@ -12,17 +13,25 @@ export const meta = {
 		appSecret: {
 			validator: $.str
 		}
+	},
+
+	errors: {
+		noSuchApp: {
+			message: 'No such app.',
+			code: 'NO_SUCH_APP',
+			id: '92f93e63-428e-4f2f-a5a4-39e1407fe998'
+		}
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
+export default define(meta, async (ps) => {
 	// Lookup app
 	const app = await App.findOne({
 		secret: ps.appSecret
 	});
 
 	if (app == null) {
-		return rej('app not found');
+		throw new ApiError(meta.errors.noSuchApp);
 	}
 
 	// Generate token
@@ -35,9 +44,8 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
 		token: token
 	});
 
-	// Response
-	res({
+	return {
 		token: doc.token,
 		url: `${config.auth_url}/${doc.token}`
-	});
-}));
+	};
+});
-- 
cgit v1.2.3-freya