feat(core): change user update to also create user-email

packages/server/modules/core/repositories/users.ts

@@ -6,6 +6,8 @@ import { metaHelpers } from '@/modules/core/helpers/meta'
 import { UserValidationError } from '@/modules/core/errors/user'
 import { Knex } from 'knex'
 import { Roles, ServerRoles } from '@speckle/shared'
+import { updateUserEmailFactory } from '@/modules/user-emails/repositories/userEmails'
+import knexInstance from '@/db/knex'
 
 export type UserWithOptionalRole<User extends LimitedUserRecord = UserRecord> = User & {
   /**
@@ -206,6 +208,14 @@ export async function updateUser(
   validateInputRecord(update)
 
   const [newUser] = await Users.knex().where(Users.col.id, userId).update(update, '*')
+
+  if (update.email) {
+    await updateUserEmailFactory({ db: knexInstance })(
+      { userId, primary: true },
+      { email: update.email }
+    )
+  }
+
   return newUser as Nullable<UserRecord>
 }
 

packages/server/modules/core/tests/integration/update-user.spec.ts

@@ -0,0 +1,60 @@
+import { expect } from 'chai'
+import { createUser, getUser } from '../../services/users'
+import { beforeEach, describe, it } from 'mocha'
+import { beforeEachContext } from '@/test/hooks'
+import knexInstance from '@/db/knex'
+import { createRandomEmail, createRandomPassword } from '../../helpers/test-helpers'
+import { USER_EMAILS_TABLE_NAME } from '@/modules/user-emails/constants'
+import { updateUser } from '../../repositories/users'
+
+const db = knexInstance
+const userEmailsDB = db(USER_EMAILS_TABLE_NAME)
+
+describe('Users @core-users', () => {
+  beforeEach(async () => {
+    await beforeEachContext()
+  })
+
+  it('should throw an error if avatar is too big', async () => {
+    const longAvatar = ''.padEnd(524288, '1') + '0'
+    try {
+      await updateUser('123456', { avatar: longAvatar })
+
+      expect.fail('Did not throw')
+    } catch (err) {
+      expect((err as Error).message).eq(
+        'User avatar is too big, please try a smaller one'
+      )
+    }
+  })
+
+  it('should throw an error if update payload is empty', async () => {
+    try {
+      await updateUser('123456', {})
+
+      expect.fail('Did not throw')
+    } catch (err) {
+      expect((err as Error).message).eq('User update payload empty')
+    }
+  })
+
+  it('Should update user email if skipClean is true', async () => {
+    const email = createRandomEmail()
+    const newUser = {
+      name: 'John Doe',
+      email,
+      password: createRandomPassword()
+    }
+
+    const userId = await createUser(newUser)
+
+    const newEmail = createRandomEmail()
+    await updateUser(userId, { email: newEmail }, { skipClean: true })
+
+    const updated = await getUser(userId)
+    const updatedUserEmail = await userEmailsDB.where({ userId, primary: true }).first()
+
+    expect(updated.email).eq(newEmail)
+    expect(updatedUserEmail.email).eq(newEmail)
+  })
+})