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/endpoints/auth/accept.ts           | 6 +++---
 packages/backend/src/server/api/endpoints/auth/session/generate.ts | 4 ++--
 packages/backend/src/server/api/endpoints/auth/session/show.ts     | 2 +-
 packages/backend/src/server/api/endpoints/auth/session/userkey.ts  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'packages/backend/src/server/api/endpoints/auth')

diff --git a/packages/backend/src/server/api/endpoints/auth/accept.ts b/packages/backend/src/server/api/endpoints/auth/accept.ts
index 0760eef52b..b5c06792bb 100644
--- a/packages/backend/src/server/api/endpoints/auth/accept.ts
+++ b/packages/backend/src/server/api/endpoints/auth/accept.ts
@@ -33,7 +33,7 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, user) => {
 	// Fetch token
 	const session = await AuthSessions
-		.findOne({ token: ps.token });
+		.findOneBy({ token: ps.token });
 
 	if (session == null) {
 		throw new ApiError(meta.errors.noSuchSession);
@@ -43,14 +43,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	const accessToken = secureRndstr(32, true);
 
 	// Fetch exist access token
-	const exist = await AccessTokens.findOne({
+	const exist = await AccessTokens.findOneBy({
 		appId: session.appId,
 		userId: user.id,
 	});
 
 	if (exist == null) {
 		// Lookup app
-		const app = await Apps.findOneOrFail(session.appId);
+		const app = await Apps.findOneByOrFail({ id: session.appId });
 
 		// Generate Hash
 		const sha256 = crypto.createHash('sha256');
diff --git a/packages/backend/src/server/api/endpoints/auth/session/generate.ts b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
index bd571327d2..717c3e5086 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/generate.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
@@ -46,7 +46,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps) => {
 	// Lookup app
-	const app = await Apps.findOne({
+	const app = await Apps.findOneBy({
 		secret: ps.appSecret,
 	});
 
@@ -63,7 +63,7 @@ export default define(meta, paramDef, async (ps) => {
 		createdAt: new Date(),
 		appId: app.id,
 		token: token,
-	}).then(x => AuthSessions.findOneOrFail(x.identifiers[0]));
+	}).then(x => AuthSessions.findOneByOrFail(x.identifiers[0]));
 
 	return {
 		token: doc.token,
diff --git a/packages/backend/src/server/api/endpoints/auth/session/show.ts b/packages/backend/src/server/api/endpoints/auth/session/show.ts
index d40c9363c6..3f3a4d1427 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/show.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/show.ts
@@ -48,7 +48,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	// Lookup session
-	const session = await AuthSessions.findOne({
+	const session = await AuthSessions.findOneBy({
 		token: ps.token,
 	});
 
diff --git a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts
index b699c6fa25..89884ed38a 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts
@@ -57,7 +57,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps) => {
 	// Lookup app
-	const app = await Apps.findOne({
+	const app = await Apps.findOneBy({
 		secret: ps.appSecret,
 	});
 
@@ -66,7 +66,7 @@ export default define(meta, paramDef, async (ps) => {
 	}
 
 	// Fetch token
-	const session = await AuthSessions.findOne({
+	const session = await AuthSessions.findOneBy({
 		token: ps.token,
 		appId: app.id,
 	});
@@ -80,7 +80,7 @@ export default define(meta, paramDef, async (ps) => {
 	}
 
 	// Lookup access token
-	const accessToken = await AccessTokens.findOneOrFail({
+	const accessToken = await AccessTokens.findOneByOrFail({
 		appId: app.id,
 		userId: session.userId,
 	});
-- 
cgit v1.2.3-freya