nameId廃止 & アプリ作成時にシークレットを返すように

3 files changed, 6 insertions, 51 deletions

diff --git a/src/server/api/endpoints/app/create.ts b/src/server/api/endpoints/app/create.ts
index b2a5fb73c1..afe3ab35af 100644
--- a/src/server/api/endpoints/app/create.ts
+++ b/src/server/api/endpoints/app/create.ts
@@ -1,6 +1,6 @@
 import rndstr from 'rndstr';
 import $ from 'cafy';
-import App, { isValidNameId, pack } from '../../../../models/app';
+import App, { pack } from '../../../../models/app';
 import { ILocalUser } from '../../../../models/user';
 
 export const meta = {
@@ -11,10 +11,6 @@ export const meta = {
  * Create an app
  */
 export default async (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
-	// Get 'nameId' parameter
-	const [nameId, nameIdErr] = $.str.pipe(isValidNameId).get(params.nameId);
-	if (nameIdErr) return rej('invalid nameId param');
-
 	// Get 'name' parameter
 	const [name, nameErr] = $.str.get(params.name);
 	if (nameErr) return rej('invalid name param');
@@ -40,8 +36,6 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 		createdAt: new Date(),
 		userId: user && user._id,
 		name: name,
-		nameId: nameId,
-		nameIdLower: nameId.toLowerCase(),
 		description: description,
 		permission: permission,
 		callbackUrl: callbackUrl,
@@ -49,5 +43,7 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	});
 
 	// Response
-	res(await pack(app));
+	res(await pack(app, null, {
+		includeSecret: true
+	}));
 });
diff --git a/src/server/api/endpoints/app/name_id/available.ts b/src/server/api/endpoints/app/name_id/available.ts
deleted file mode 100644
index 2cd56e92d6..0000000000
--- a/src/server/api/endpoints/app/name_id/available.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Module dependencies
- */
-import $ from 'cafy';
-import App from '../../../../../models/app';
-import { isValidNameId } from '../../../../../models/app';
-
-/**
- * Check available nameId of app
- *
- * @param {any} params
- * @return {Promise<any>}
- */
-export default async (params: any) => new Promise(async (res, rej) => {
-	// Get 'nameId' parameter
-	const [nameId, nameIdErr] = $.str.pipe(isValidNameId).get(params.nameId);
-	if (nameIdErr) return rej('invalid nameId param');
-
-	// Get exist
-	const exist = await App
-		.count({
-			nameIdLower: nameId.toLowerCase()
-		}, {
-			limit: 1
-		});
-
-	// Reply
-	res({
-		available: exist === 0
-	});
-});
diff --git a/src/server/api/endpoints/app/show.ts b/src/server/api/endpoints/app/show.ts
index 6668d0f243..072fbaeb79 100644
--- a/src/server/api/endpoints/app/show.ts
+++ b/src/server/api/endpoints/app/show.ts
@@ -9,21 +9,11 @@ export default (params: any, user: ILocalUser, app: IApp) => new Promise(async (
 	const isSecure = user != null && app == null;
 
 	// Get 'appId' parameter
-	const [appId, appIdErr] = $.type(ID).optional.get(params.appId);
+	const [appId, appIdErr] = $.type(ID).get(params.appId);
 	if (appIdErr) return rej('invalid appId param');
 
-	// Get 'nameId' parameter
-	const [nameId, nameIdErr] = $.str.optional.get(params.nameId);
-	if (nameIdErr) return rej('invalid nameId param');
-
-	if (appId === undefined && nameId === undefined) {
-		return rej('appId or nameId is required');
-	}
-
 	// Lookup app
-	const ap = appId !== undefined
-		? await App.findOne({ _id: appId })
-		: await App.findOne({ nameIdLower: nameId.toLowerCase() });
+	const ap = await App.findOne({ _id: appId });
 
 	if (ap === null) {
 		return rej('app not found');