Merge pull request #609 from TaloDev/load-org-games-in-verify2fa

Load organisation.games in verify2fa, add more testing

Author: tudddorrr

src/services/public/user-public.service.ts

@@ -288,7 +288,7 @@ export default class UserPublicService extends Service {
     const { code, userId } = req.body
     const em: EntityManager = req.ctx.em
 
-    const user = await em.getRepository(User).findOneOrFail(userId)
+    const user = await em.repo(User).findOneOrFail(userId, { populate: ['organisation.games'] })
 
     const redis: Redis = req.ctx.redis
     const hasSession = (await redis.get(`2fa:${user.id}`)) === 'true'

tests/services/_public/user-public/login.test.ts

@@ -1,11 +1,15 @@
 import request from 'supertest'
 import UserFactory from '../../../fixtures/UserFactory'
 import { differenceInMinutes, sub } from 'date-fns'
+import createOrganisationAndGame from '../../../utils/createOrganisationAndGame'
 
 describe('User public service - login', () => {
   it('should let a user login', async () => {
-    const user = await new UserFactory().loginable().one()
-    user.lastSeenAt = new Date(2020, 1, 1)
+    const [organisation] = await createOrganisationAndGame()
+    const user = await new UserFactory().loginable().state(() => ({
+      organisation,
+      lastSeenAt: new Date(2020, 1, 1)
+    })).one()
     await em.persistAndFlush(user)
 
     const res = await request(app)
@@ -16,7 +20,7 @@ describe('User public service - login', () => {
     expect(res.body.accessToken).toBeTruthy()
     expect(res.body.user).toBeTruthy()
     expect(res.body.user.organisation).toBeTruthy()
-    expect(res.body.user.organisation.games).toEqual([])
+    expect(res.body.user.organisation.games).toHaveLength(1)
     expect(new Date(res.body.user.lastSeenAt).getDay()).toEqual(new Date().getDay())
   })
 

tests/services/_public/user-public/refresh.test.ts

@@ -1,11 +1,15 @@
 import request from 'supertest'
 import UserSession from '../../../../src/entities/user-session'
 import UserFactory from '../../../fixtures/UserFactory'
+import createOrganisationAndGame from '../../../utils/createOrganisationAndGame'
 
 describe('User public service - refresh', () => {
   it('should let a user refresh their session if they have one', async () => {
-    const user = await new UserFactory().one()
-    user.lastSeenAt = new Date(2020, 1, 1)
+    const [organisation] = await createOrganisationAndGame()
+    const user = await new UserFactory().state(() => ({
+      organisation,
+      lastSeenAt: new Date(2020, 1, 1)
+    })).one()
     const session = new UserSession(user)
     await em.persistAndFlush(session)
 
@@ -17,7 +21,7 @@ describe('User public service - refresh', () => {
     expect(res.body.accessToken).toBeTruthy()
     expect(res.body.user).toBeTruthy()
     expect(res.body.user.organisation).toBeTruthy()
-    expect(res.body.user.organisation.games).toEqual([])
+    expect(res.body.user.organisation.games).toHaveLength(1)
 
     expect(new Date(res.body.user.lastSeenAt).getDay()).toEqual(new Date().getDay())
   })

tests/services/_public/user-public/use-recovery-code.test.ts

@@ -5,6 +5,7 @@ import createUserAndToken from '../../../utils/createUserAndToken'
 import UserTwoFactorAuth from '../../../../src/entities/user-two-factor-auth'
 import User from '../../../../src/entities/user'
 import generateRecoveryCodes from '../../../../src/lib/auth/generateRecoveryCodes'
+import createOrganisationAndGame from '../../../utils/createOrganisationAndGame'
 
 async function setTwoFactorAuthSession(user: User) {
   await redis.set(`2fa:${user.id}`, 'true')
@@ -15,9 +16,10 @@ async function removeTwoFactorAuthSession(user: User) {
 }
 
 async function createUserWithTwoFactorAuth(em: EntityManager): Promise<[string, User]> {
+  const [organisation] = await createOrganisationAndGame()
   const [token, user] = await createUserAndToken({
     twoFactorAuth: new UserTwoFactorAuth('blah')
-  })
+  }, organisation)
 
   user.twoFactorAuth!.enabled = true
   user.recoveryCodes = new Collection<UserRecoveryCode>(user, generateRecoveryCodes(user))
@@ -39,7 +41,7 @@ describe('User public service - use recovery code', () => {
 
     expect(res.body.user).toBeTruthy()
     expect(res.body.user.organisation).toBeTruthy()
-    expect(res.body.user.organisation.games).toEqual([])
+    expect(res.body.user.organisation.games).toHaveLength(1)
 
     expect(res.body.accessToken).toBeTruthy()
     expect(res.body.newRecoveryCodes).toBeUndefined()

tests/services/_public/user-public/verify-2fa.test.ts

@@ -2,12 +2,15 @@ import request from 'supertest'
 import { authenticator } from '@otplib/preset-default'
 import UserTwoFactorAuth from '../../../../src/entities/user-two-factor-auth'
 import createUserAndToken from '../../../utils/createUserAndToken'
+import createOrganisationAndGame from '../../../utils/createOrganisationAndGame'
 
 describe('User public service - verify 2fa', () => {
   it('should let users verify their 2fa code and login', async () => {
     const twoFactorAuth = new UserTwoFactorAuth('blah')
     twoFactorAuth.enabled = true
-    const [token, user] = await createUserAndToken({ twoFactorAuth })
+
+    const [organisation] = await createOrganisationAndGame()
+    const [token, user] = await createUserAndToken({ twoFactorAuth }, organisation)
 
     await redis.set(`2fa:${user.id}`, 'true')
 
@@ -21,7 +24,7 @@ describe('User public service - verify 2fa', () => {
 
     expect(res.body.user).toBeTruthy()
     expect(res.body.user.organisation).toBeTruthy()
-    expect(res.body.user.organisation.games).toEqual([])
+    expect(res.body.user.organisation.games).toHaveLength(1)
 
     expect(res.body.accessToken).toBeTruthy()
 

tests/services/user/confirm-2fa.test.ts

@@ -3,12 +3,14 @@ import request from 'supertest'
 import UserTwoFactorAuth from '../../../src/entities/user-two-factor-auth'
 import { authenticator } from '@otplib/preset-default'
 import createUserAndToken from '../../utils/createUserAndToken'
+import createOrganisationAndGame from '../../utils/createOrganisationAndGame'
 
 describe('User service - confirm 2fa', () => {
   it('should let users confirm enabling 2fa', async () => {
+    const [organisation] = await createOrganisationAndGame()
     const [token, user] = await createUserAndToken({
       twoFactorAuth: new UserTwoFactorAuth('blah')
-    })
+    }, organisation)
 
     authenticator.check = vi.fn().mockReturnValueOnce(true)
 
@@ -20,7 +22,7 @@ describe('User service - confirm 2fa', () => {
 
     expect(res.body.user).toBeTruthy()
     expect(res.body.user.organisation).toBeTruthy()
-    expect(res.body.user.organisation.games).toEqual([])
+    expect(res.body.user.organisation.games).toHaveLength(1)
 
     expect(res.body.recoveryCodes).toHaveLength(8)
 

tests/services/user/confirm-email.test.ts

@@ -1,10 +1,12 @@
 import request from 'supertest'
 import UserAccessCode from '../../../src/entities/user-access-code'
 import createUserAndToken from '../../utils/createUserAndToken'
+import createOrganisationAndGame from '../../utils/createOrganisationAndGame'
 
 describe('User service - confirm email', () => {
   it('should let a user confirm their email', async () => {
-    const [token, user] = await createUserAndToken()
+    const [organisation] = await createOrganisationAndGame()
+    const [token, user] = await createUserAndToken({}, organisation)
 
     const date = new Date()
     date.setDate(date.getDate() + 1)
@@ -19,7 +21,7 @@ describe('User service - confirm email', () => {
 
     expect(res.body.user.emailConfirmed).toBe(true)
     expect(res.body.user.organisation).toBeTruthy()
-    expect(res.body.user.organisation.games).toEqual([])
+    expect(res.body.user.organisation.games).toHaveLength(1)
 
     const updatedAccessCode = await em.getRepository(UserAccessCode).findOne({ code: accessCode.code })
     expect(updatedAccessCode).toBeNull()

tests/services/user/disable-2fa.test.ts

@@ -2,12 +2,15 @@ import request from 'supertest'
 import UserTwoFactorAuth from '../../../src/entities/user-two-factor-auth'
 import UserRecoveryCode from '../../../src/entities/user-recovery-code'
 import createUserAndToken from '../../utils/createUserAndToken'
+import createOrganisationAndGame from '../../utils/createOrganisationAndGame'
 
 describe('User service - disable 2fa', () => {
   it('should let users disable 2fa', async () => {
     const twoFactorAuth = new UserTwoFactorAuth('blah')
     twoFactorAuth.enabled = true
-    const [token, user] = await createUserAndToken({ twoFactorAuth })
+
+    const [organisation] = await createOrganisationAndGame()
+    const [token, user] = await createUserAndToken({ twoFactorAuth }, organisation)
 
     const res = await request(app)
       .post('/users/2fa/disable')
@@ -17,7 +20,7 @@ describe('User service - disable 2fa', () => {
 
     expect(res.body.user.has2fa).toBe(false)
     expect(res.body.user.organisation).toBeTruthy()
-    expect(res.body.user.organisation.games).toEqual([])
+    expect(res.body.user.organisation.games).toHaveLength(1)
 
     const recoveryCodes = await em.getRepository(UserRecoveryCode).find({ user })
     expect(recoveryCodes).toHaveLength(0)