From 1c67c26bd87aae64fe0f2ef45140e12a78564699 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 26 Mar 2022 15:34:00 +0900 Subject: refactor: migrate to typeorm 3.0 (#8443) * wip * wip * wip * Update following.ts * wip * wip * wip * Update resolve-user.ts * maxQueryExecutionTime * wip * wip --- packages/backend/src/server/api/authenticate.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'packages/backend/src/server/api/authenticate.ts') diff --git a/packages/backend/src/server/api/authenticate.ts b/packages/backend/src/server/api/authenticate.ts index 8fb397ca5f..65ccfcf551 100644 --- a/packages/backend/src/server/api/authenticate.ts +++ b/packages/backend/src/server/api/authenticate.ts @@ -21,9 +21,8 @@ export default async (token: string | null): Promise<[CacheableLocalUser | null } if (isNativeToken(token)) { - // TODO: typeorm 3.0にしたら .then(x => x || null) は消せる const user = await localUserByNativeTokenCache.fetch(token, - () => Users.findOne({ token }).then(x => x || null) as Promise); + () => Users.findOneBy({ token }) as Promise); if (user == null) { throw new AuthenticationError('user not found'); @@ -48,13 +47,13 @@ export default async (token: string | null): Promise<[CacheableLocalUser | null }); const user = await localUserByIdCache.fetch(accessToken.userId, - () => Users.findOne({ - id: accessToken.userId, // findOne(accessToken.userId) のように書かないのは後方互換性のため + () => Users.findOneBy({ + id: accessToken.userId, }) as Promise); if (accessToken.appId) { const app = await appCache.fetch(accessToken.appId, - () => Apps.findOneOrFail(accessToken.appId!)); + () => Apps.findOneByOrFail({ id: accessToken.appId! })); return [user, { id: accessToken.id, -- cgit v1.2.3-freya