From 0c1de7b1b6e9ac10b62d8b3157cb064c79aa21d1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 18 Jul 2020 12:12:10 +0900
Subject: feat: トークン手動発行機能
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/api/endpoints/miauth/gen-token.ts |  6 +++++-
 src/server/api/index.ts                      |  2 +-
 src/server/api/kinds.ts                      | 28 ----------------------------
 src/server/api/openapi/description.ts        |  2 +-
 4 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 src/server/api/kinds.ts

(limited to 'src/server/api')

diff --git a/src/server/api/endpoints/miauth/gen-token.ts b/src/server/api/endpoints/miauth/gen-token.ts
index d8c74ec8d7..6476e79d77 100644
--- a/src/server/api/endpoints/miauth/gen-token.ts
+++ b/src/server/api/endpoints/miauth/gen-token.ts
@@ -13,7 +13,7 @@ export const meta = {
 
 	params: {
 		session: {
-			validator: $.str
+			validator: $.nullable.str
 		},
 
 		name: {
@@ -52,4 +52,8 @@ export default define(meta, async (ps, user) => {
 		iconUrl: ps.iconUrl,
 		permission: ps.permission,
 	});
+
+	return {
+		token: accessToken
+	};
 });
diff --git a/src/server/api/index.ts b/src/server/api/index.ts
index 93c6cfdac0..aec4a97379 100644
--- a/src/server/api/index.ts
+++ b/src/server/api/index.ts
@@ -78,7 +78,7 @@ router.post('/miauth/:session/check', async ctx => {
 		session: ctx.params.session
 	});
 
-	if (token && !token.fetched) {
+	if (token && token.session != null && !token.fetched) {
 		AccessTokens.update(token.id, {
 			fetched: true
 		});
diff --git a/src/server/api/kinds.ts b/src/server/api/kinds.ts
deleted file mode 100644
index be3c30f7d9..0000000000
--- a/src/server/api/kinds.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-export const kinds = [
-	'read:account',
-	'write:account',
-	'read:blocks',
-	'write:blocks',
-	'read:drive',
-	'write:drive',
-	'read:favorites',
-	'write:favorites',
-	'read:following',
-	'write:following',
-	'read:messaging',
-	'write:messaging',
-	'read:mutes',
-	'write:mutes',
-	'write:notes',
-	'read:notifications',
-	'write:notifications',
-	'read:reactions',
-	'write:reactions',
-	'write:votes',
-	'read:pages',
-	'write:pages',
-	'write:page-likes',
-	'read:page-likes',
-	'read:user-groups',
-	'write:user-groups',
-];
diff --git a/src/server/api/openapi/description.ts b/src/server/api/openapi/description.ts
index 15831b3c9a..e0527dd1ae 100644
--- a/src/server/api/openapi/description.ts
+++ b/src/server/api/openapi/description.ts
@@ -1,6 +1,6 @@
 import endpoints from '../endpoints';
 import * as locale from '../../../../locales/';
-import { kinds as kindsList } from '../kinds';
+import { kinds as kindsList } from '../../../misc/api-permissions';
 
 export interface IKindInfo {
 	endpoints: string[];
-- 
cgit v1.2.3-freya