summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/private
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-03-26 15:34:00 +0900
committerGitHub <noreply@github.com>2022-03-26 15:34:00 +0900
commit1c67c26bd87aae64fe0f2ef45140e12a78564699 (patch)
tree633a3fad1c5841ea20bc39d6b681b455bbdeabf3 /packages/backend/src/server/api/private
parent.js (diff)
downloadmisskey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.gz
misskey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.bz2
misskey-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/private')
-rw-r--r--packages/backend/src/server/api/private/signin.ts13
-rw-r--r--packages/backend/src/server/api/private/signup-pending.ts4
-rw-r--r--packages/backend/src/server/api/private/signup.ts2
3 files changed, 10 insertions, 9 deletions
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,
});