refactor(server): use user model on oauth plugin (#10031)

close CLOUD-117
This commit is contained in:
fengmk2
2025-02-10 12:01:14 +00:00
parent 23364b59a0
commit 67b6c28d67
5 changed files with 48 additions and 64 deletions
@@ -187,7 +187,7 @@ test('should revoke token after change user identify', async t => {
// change password
{
const u3Email = 'u3@affine.pro';
const u3Email = 'u3333@affine.pro';
await app.logout();
const u3 = await app.signup(u3Email);
@@ -1,4 +1,3 @@
import { PrismaClient } from '@prisma/client';
import ava, { TestFn } from 'ava';
import Sinon from 'sinon';
@@ -276,16 +275,13 @@ test('should trigger user.deleted event', async t => {
});
test('should paginate users', async t => {
const db = t.context.module.get(PrismaClient);
const now = Date.now();
await Promise.all(
Array.from({ length: 100 }).map((_, i) =>
db.user.create({
data: {
name: `test${i}`,
email: `test${i}@affine.pro`,
createdAt: new Date(now + i),
},
t.context.user.create({
name: `test-paginate-${i}`,
email: `test-paginate-${i}@affine.pro`,
createdAt: new Date(now + i),
})
)
);
@@ -294,7 +290,7 @@ test('should paginate users', async t => {
t.is(users.length, 10);
t.deepEqual(
users.map(user => user.email),
Array.from({ length: 10 }).map((_, i) => `test${i}@affine.pro`)
Array.from({ length: 10 }).map((_, i) => `test-paginate-${i}@affine.pro`)
);
});
@@ -308,7 +308,7 @@ test('should not throw if account registered', async t => {
});
test('should be able to fullfil user with oauth sign in', async t => {
const { app, db } = t.context;
const { app, models } = t.context;
const u3 = await app.createUser('u3@affine.pro');
@@ -321,11 +321,11 @@ test('should be able to fullfil user with oauth sign in', async t => {
t.truthy(sessionUser);
t.is(sessionUser!.email, u3.email);
const account = await db.connectedAccount.findFirst({
where: {
userId: u3.id,
},
});
const account = await models.user.getConnectedAccount(
OAuthProviderName.Google,
'1'
);
t.truthy(account);
t.is(account!.user.id, u3.id);
});