From df950d2fc535e5d793cfc4d9f0f09a145ab47a57 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 15 Apr 2019 23:37:35 +0900 Subject: Clean up --- src/server/api/endpoints/notes/create.ts | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/server') diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts index 83649015d8..994dfb4dca 100644 --- a/src/server/api/endpoints/notes/create.ts +++ b/src/server/api/endpoints/notes/create.ts @@ -238,8 +238,6 @@ export default define(meta, async (ps, user, app) => { userId: user.id }) ))).filter(file => file != null) as DriveFile[]; - - files = files; } let renote: Note | undefined; -- cgit v1.2.3-freya From bce8c5a315330e6500faae37f559a5d114df69d3 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 16 Apr 2019 01:05:21 +0900 Subject: Refactor --- src/server/api/common/generate-native-user-token.ts | 2 +- src/server/api/common/is-native-token.ts | 2 +- src/server/api/endpoints/auth/accept.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/src/server/api/common/generate-native-user-token.ts b/src/server/api/common/generate-native-user-token.ts index 9d44885630..a372221a0a 100644 --- a/src/server/api/common/generate-native-user-token.ts +++ b/src/server/api/common/generate-native-user-token.ts @@ -1,3 +1,3 @@ import rndstr from 'rndstr'; -export default () => `0${rndstr('a-zA-Z0-9', 15)}`; +export default () => rndstr('a-zA-Z0-9', 16); diff --git a/src/server/api/common/is-native-token.ts b/src/server/api/common/is-native-token.ts index 22af84aad2..2833c570c8 100644 --- a/src/server/api/common/is-native-token.ts +++ b/src/server/api/common/is-native-token.ts @@ -1 +1 @@ -export default (token: string) => token.startsWith('0'); +export default (token: string) => token.length === 16; diff --git a/src/server/api/endpoints/auth/accept.ts b/src/server/api/endpoints/auth/accept.ts index a584e7267b..be7f3b5468 100644 --- a/src/server/api/endpoints/auth/accept.ts +++ b/src/server/api/endpoints/auth/accept.ts @@ -39,7 +39,7 @@ export default define(meta, async (ps, user) => { } // Generate access token - const accessToken = '1' + rndstr('a-zA-Z0-9', 15); + const accessToken = rndstr('a-zA-Z0-9', 32); // Fetch exist access token const exist = await AccessTokens.findOne({ -- cgit v1.2.3-freya From 8fefb3a4c9d19a4b618b3b1040da98da6615127d Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 16 Apr 2019 01:20:28 +0900 Subject: Update authenticate.ts --- src/server/api/authenticate.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/api/authenticate.ts b/src/server/api/authenticate.ts index ecf4a82c45..519ed77388 100644 --- a/src/server/api/authenticate.ts +++ b/src/server/api/authenticate.ts @@ -31,7 +31,9 @@ export default async (token: string): Promise<[User | null | undefined, App | nu .findOne(accessToken.appId); const user = await Users - .findOne(accessToken.userId); + .findOne({ + id: accessToken.userId // findOne(accessToken.userId) のように書かないのは後方互換性のため + }); return [user, app]; } -- cgit v1.2.3-freya