feat: merge develop

Signed-off-by: Jeroen Branje <[email protected]>

apps/envited.ascs.digital/app/dashboard/users/page.tsx

@@ -6,3 +6,5 @@ export default async function Index() {
 
   return <Users users={users} />
 }
+
+export const dynamic = 'force-dynamic'

apps/envited.ascs.digital/common/database/queries/queries.ts

@@ -6,9 +6,10 @@ import { connectDb } from '../database'
 import * as schema from '../schema'
 import { fetchTables } from './common'
 import { maybeUpdatePublishedState, update as updateProfile } from './profiles'
-import { getUserById, getUserWithProfileById, getUsersByIssuerId, insertUserTx } from './users'
+import { deleteUserById, getUserById, getUserWithProfileById, getUsersByIssuerId, insertUserTx } from './users'
 
 const queries = {
+  deleteUserById,
   fetchTables,
   getUserById,
   getUserWithProfileById,

apps/envited.ascs.digital/common/database/queries/users.test.ts

@@ -241,6 +241,7 @@ describe('common/database/users', () => {
         streetAddress: 'Teststraße 1',
         updatedAt: new Date(),
         vatId: 'vatId',
+        isActive: true,
       })
       expect(transaction).toEqual({
         id: 'USER_ID',

apps/envited.ascs.digital/common/database/queries/users.ts

@@ -19,6 +19,13 @@ import {
 } from '../schema'
 import { Credential, DatabaseConnection, Issuer, User } from '../types'
 
+export const deleteUserById = (db: DatabaseConnection) => async (id: string) =>
+  db
+    .update(user)
+    .set({ isActive: false, updatedAt: new Date() })
+    .where(eq(user.id, id))
+    .returning({ updatedId: user.id })
+
 export const getUserById = (db: DatabaseConnection) => async (id: string) =>
   db.select().from(user).where(eq(user.id, id))
 
@@ -162,6 +169,7 @@ export const _txn =
           issuerId: id,
           issuanceDate: new Date(issuanceDate),
           expirationDate: new Date(expirationDate),
+          isActive: true,
           createdAt: new Date(),
           updatedAt: new Date(),
         })

apps/envited.ascs.digital/common/database/schema.ts

@@ -21,6 +21,7 @@ export const user = pgTable('user', {
   addressTypeId: uuid('address_type_id').references(() => addressType.id),
   issuanceDate: timestamp('issuance_date'),
   expirationDate: timestamp('expiration_date'),
+  isActive: boolean('is_active').default(true),
   createdAt: timestamp('created_at'),
   updatedAt: timestamp('updated_at'),
 })

apps/envited.ascs.digital/common/database/types.ts

@@ -65,6 +65,7 @@ export interface User {
   issuerId: StringChange
   issuanceDate: string
   expirationDate: string
+  isActive: boolean
   createdAt: string
   updatedAt: string
 }

apps/envited.ascs.digital/common/serverActions/users/deleteUserById.test.ts

@@ -0,0 +1,68 @@
+import * as SUT from './deleteUserById'
+
+describe('common/serverActions/users/deleteUserById', () => {
+  it('should return a deleted user as expected', async () => {
+    // when ... we request a user by id
+    // then ... it returns a user as expected
+    const getServerSessionStub = jest.fn().mockResolvedValue({
+      user: {
+        pkh: 'ISSUER_PKH',
+      },
+    })
+    const user = {
+      id: 'USER_PKH',
+      issuerId: 'ISSUER_PKH',
+    }
+
+    const expected = {
+      updatedId: 'USER_PKH',
+    }
+    const dbStub = jest.fn().mockResolvedValue({
+      getUserById: jest.fn().mockResolvedValue([user]),
+      deleteUserById: jest.fn().mockResolvedValue([{ updatedId: 'USER_PKH' }]),
+    })
+
+    const result = await SUT._deleteUserById({ db: dbStub, getServerSession: getServerSessionStub })('USER_ID')
+    expect(result).toEqual(expected)
+  })
+
+  it('should throw because of missing session', async () => {
+    // when ... we request a user by id without a session
+    // then ... it throws as expected
+    const getServerSessionStub = jest.fn().mockResolvedValue(null)
+    const user = {
+      id: 'USER_PKH',
+      issuerId: 'ISSUER_PKH',
+    }
+    const dbStub = jest.fn().mockResolvedValue({
+      getUserById: jest.fn().mockResolvedValue([user]),
+      deleteUserById: jest.fn().mockResolvedValue([{ updatedId: 'USER_PKH' }]),
+    })
+
+    await expect(
+      SUT._deleteUserById({ db: dbStub, getServerSession: getServerSessionStub })('USER_ID'),
+    ).rejects.toThrow('Something went wrong')
+  })
+
+  it('should throw because requester is not allowed to get this resource', async () => {
+    // when ... we request a user by id, but the requested user is not issued by the requester OR is not their own user
+    // then ... it throws as expected
+    const getServerSessionStub = jest.fn().mockResolvedValue({
+      user: {
+        pkh: 'ISSUER_PKH',
+      },
+    })
+    const user = {
+      id: 'USER_PKH',
+      issuerId: 'FEDERATOR_PKH',
+    }
+    const dbStub = jest.fn().mockResolvedValue({
+      getUserById: jest.fn().mockResolvedValue([user]),
+      deleteUserById: jest.fn().mockResolvedValue([{ updatedId: 'USER_PKH' }]),
+    })
+
+    await expect(
+      SUT._deleteUserById({ db: dbStub, getServerSession: getServerSessionStub })('USER_ID'),
+    ).rejects.toThrow('Something went wrong')
+  })
+})

apps/envited.ascs.digital/common/serverActions/users/deleteUserById.ts

@@ -0,0 +1,38 @@
+import { isNil } from 'ramda'
+import { cache } from 'react'
+
+import { getServerSession } from '../../auth'
+import { db } from '../../database/queries'
+import { Database } from '../../database/types'
+import { userIsIssuedByLoggedInUser } from '../../guards'
+import { User } from '../../types'
+import { Session } from '../../types/types'
+import { badRequestError, error, unauthorizedError } from '../../utils'
+
+export const _deleteUserById =
+  ({ db, getServerSession }: { db: Database; getServerSession: () => Promise<Session | null> }) =>
+  async (id: string): Promise<User> => {
+    try {
+      const session = await getServerSession()
+
+      if (isNil(session)) {
+        throw unauthorizedError()
+      }
+
+      const connection = await db()
+      const [user] = await connection.getUserById(id)
+
+      if (!userIsIssuedByLoggedInUser(user)(session)) {
+        throw badRequestError('Incorrect permissions')
+      }
+
+      const [deletedUser] = await connection.deleteUserById(user.id)
+
+      return deletedUser
+    } catch (e) {
+      console.log('error', e)
+      throw error()
+    }
+  }
+
+export const deleteUserById = cache(_deleteUserById({ db, getServerSession }))

apps/envited.ascs.digital/common/types/types.ts

@@ -71,6 +71,7 @@ export interface User {
   streetAddress: string
   updatedAt: string
   vatId?: string
+  isActive: boolean
 }
 
 export interface Profile {

apps/envited.ascs.digital/drizzle/development/0006_complete_caretaker.sql

@@ -0,0 +1 @@
+ALTER TABLE "user" ADD COLUMN "is_active" boolean DEFAULT true;