From 0463c6bb0f8fd32740ceb61ccce04c662272a618 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 23 Apr 2019 22:35:26 +0900
Subject: Refactor API (#4770)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update description.ts

* wip
---
 src/server/api/endpoints/auth/session/generate.ts | 13 +++++++++----
 src/server/api/endpoints/auth/session/userkey.ts  | 11 ++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'src/server/api/endpoints/auth')

diff --git a/src/server/api/endpoints/auth/session/generate.ts b/src/server/api/endpoints/auth/session/generate.ts
index bca8d33483..9bf27c8e77 100644
--- a/src/server/api/endpoints/auth/session/generate.ts
+++ b/src/server/api/endpoints/auth/session/generate.ts
@@ -5,12 +5,13 @@ import define from '../../../define';
 import { ApiError } from '../../../error';
 import { Apps, AuthSessions } from '../../../../../models';
 import { genId } from '../../../../../misc/gen-id';
+import { types, bool } from '../../../../../misc/schema';
 
 export const meta = {
 	tags: ['auth'],
 
 	requireCredential: false,
-	
+
 	desc: {
 		'ja-JP': 'アプリを認証するためのトークンを作成します。',
 		'en-US': 'Generate a token for authorize application.'
@@ -27,14 +28,18 @@ export const meta = {
 	},
 
 	res: {
-		type: 'object',
+		type: types.object,
+		optional: bool.false, nullable: bool.false,
 		properties: {
 			token: {
-				type: 'string',
+				type: types.string,
+				optional: bool.false, nullable: bool.false,
 				description: 'セッションのトークン'
 			},
 			url: {
-				type: 'string',
+				type: types.string,
+				optional: bool.false, nullable: bool.false,
+				format: 'url',
 				description: 'セッションのURL'
 			},
 		}
diff --git a/src/server/api/endpoints/auth/session/userkey.ts b/src/server/api/endpoints/auth/session/userkey.ts
index 7126ac52c1..b7a58c4750 100644
--- a/src/server/api/endpoints/auth/session/userkey.ts
+++ b/src/server/api/endpoints/auth/session/userkey.ts
@@ -3,6 +3,7 @@ import define from '../../../define';
 import { ApiError } from '../../../error';
 import { Apps, AuthSessions, AccessTokens, Users } from '../../../../../models';
 import { ensure } from '../../../../../prelude/ensure';
+import { types, bool } from '../../../../../misc/schema';
 
 export const meta = {
 	tags: ['auth'],
@@ -28,15 +29,19 @@ export const meta = {
 	},
 
 	res: {
-		type: 'object',
+		type: types.object,
+		optional: bool.false, nullable: bool.false,
 		properties: {
 			accessToken: {
-				type: 'string',
+				type: types.string,
+				optional: bool.false, nullable: bool.false,
 				description: 'ユーザーのアクセストークン',
 			},
 
 			user: {
-				type: 'User',
+				type: types.object,
+				optional: bool.false, nullable: bool.false,
+				ref: 'User',
 				description: '認証したユーザー'
 			},
 		}
-- 
cgit v1.2.3-freya