diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-03-26 15:34:00 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-26 15:34:00 +0900 |
| commit | 1c67c26bd87aae64fe0f2ef45140e12a78564699 (patch) | |
| tree | 633a3fad1c5841ea20bc39d6b681b455bbdeabf3 /packages/backend/src/server/api/authenticate.ts | |
| parent | .js (diff) | |
| download | sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.gz sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.bz2 sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.zip | |
refactor: migrate to typeorm 3.0 (#8443)
* wip
* wip
* wip
* Update following.ts
* wip
* wip
* wip
* Update resolve-user.ts
* maxQueryExecutionTime
* wip
* wip
Diffstat (limited to 'packages/backend/src/server/api/authenticate.ts')
| -rw-r--r-- | packages/backend/src/server/api/authenticate.ts | 9 |
1 files changed, 4 insertions, 5 deletions
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<ILocalUser | null>); + () => Users.findOneBy({ token }) as Promise<ILocalUser | null>); 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<ILocalUser>); if (accessToken.appId) { const app = await appCache.fetch(accessToken.appId, - () => Apps.findOneOrFail(accessToken.appId!)); + () => Apps.findOneByOrFail({ id: accessToken.appId! })); return [user, { id: accessToken.id, |