From 1c67c26bd87aae64fe0f2ef45140e12a78564699 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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/private/signin.ts         | 13 +++++++------
 packages/backend/src/server/api/private/signup-pending.ts |  4 ++--
 packages/backend/src/server/api/private/signup.ts         |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'packages/backend/src/server/api/private')

diff --git a/packages/backend/src/server/api/private/signin.ts b/packages/backend/src/server/api/private/signin.ts
index b0f88948a0..3f7118ad22 100644
--- a/packages/backend/src/server/api/private/signin.ts
+++ b/packages/backend/src/server/api/private/signin.ts
@@ -8,6 +8,7 @@ import { ILocalUser } from '@/models/entities/user.js';
 import { genId } from '@/misc/gen-id.js';
 import { verifyLogin, hash } from '../2fa.js';
 import { randomBytes } from 'node:crypto';
+import { IsNull } from 'typeorm';
 
 export default async (ctx: Koa.Context) => {
 	ctx.set('Access-Control-Allow-Origin', config.url);
@@ -39,9 +40,9 @@ export default async (ctx: Koa.Context) => {
 	}
 
 	// Fetch user
-	const user = await Users.findOne({
+	const user = await Users.findOneBy({
 		usernameLower: username.toLowerCase(),
-		host: null,
+		host: IsNull(),
 	}) as ILocalUser;
 
 	if (user == null) {
@@ -58,7 +59,7 @@ export default async (ctx: Koa.Context) => {
 		return;
 	}
 
-	const profile = await UserProfiles.findOneOrFail(user.id);
+	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 
 	// Compare password
 	const same = await bcrypt.compare(password, profile.password!);
@@ -123,7 +124,7 @@ export default async (ctx: Koa.Context) => {
 
 		const clientDataJSON = Buffer.from(body.clientDataJSON, 'hex');
 		const clientData = JSON.parse(clientDataJSON.toString('utf-8'));
-		const challenge = await AttestationChallenges.findOne({
+		const challenge = await AttestationChallenges.findOneBy({
 			userId: user.id,
 			id: body.challengeId,
 			registrationChallenge: false,
@@ -149,7 +150,7 @@ export default async (ctx: Koa.Context) => {
 			return;
 		}
 
-		const securityKey = await UserSecurityKeys.findOne({
+		const securityKey = await UserSecurityKeys.findOneBy({
 			id: Buffer.from(
 				body.credentialId
 					.replace(/-/g, '+')
@@ -191,7 +192,7 @@ export default async (ctx: Koa.Context) => {
 			return;
 		}
 
-		const keys = await UserSecurityKeys.find({
+		const keys = await UserSecurityKeys.findBy({
 			userId: user.id,
 		});
 
diff --git a/packages/backend/src/server/api/private/signup-pending.ts b/packages/backend/src/server/api/private/signup-pending.ts
index 1a667ddb43..e5e39ba00d 100644
--- a/packages/backend/src/server/api/private/signup-pending.ts
+++ b/packages/backend/src/server/api/private/signup-pending.ts
@@ -9,7 +9,7 @@ export default async (ctx: Koa.Context) => {
 	const code = body['code'];
 
 	try {
-		const pendingUser = await UserPendings.findOneOrFail({ code });
+		const pendingUser = await UserPendings.findOneByOrFail({ code });
 
 		const { account, secret } = await signup({
 			username: pendingUser.username,
@@ -20,7 +20,7 @@ export default async (ctx: Koa.Context) => {
 			id: pendingUser.id,
 		});
 
-		const profile = await UserProfiles.findOneOrFail(account.id);
+		const profile = await UserProfiles.findOneByOrFail({ userId: account.id });
 
 		await UserProfiles.update({ userId: profile.userId }, {
 			email: pendingUser.email,
diff --git a/packages/backend/src/server/api/private/signup.ts b/packages/backend/src/server/api/private/signup.ts
index 01f284a57f..26f172637c 100644
--- a/packages/backend/src/server/api/private/signup.ts
+++ b/packages/backend/src/server/api/private/signup.ts
@@ -56,7 +56,7 @@ export default async (ctx: Koa.Context) => {
 			return;
 		}
 
-		const ticket = await RegistrationTickets.findOne({
+		const ticket = await RegistrationTickets.findOneBy({
 			code: invitationCode,
 		});
 
-- 
cgit v1.2.3-freya