@meith/accounts 0.22.0 → 0.23.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/accounts",
-  "version": "0.22.0",
+  "version": "0.23.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -20,6 +20,6 @@
   },
   "dependencies": {
     "hash-wasm": "^4.12.0",
-    "@meith/i18n": "0.22.0"
+    "@meith/i18n": "0.23.1"
   }
 }

package/src/ban-filters-not-consulted.ts

@@ -0,0 +1,5 @@
+import type { BanFilterRepository } from './ports'
+
+export const BAN_FILTERS_NOT_CONSULTED: BanFilterRepository = {
+  listAll: async () => [],
+}

package/src/index.ts

@@ -8,6 +8,7 @@ export {
   type BanFilterType,
   matchBanFilter,
 } from './ban-filter'
+export { BAN_FILTERS_NOT_CONSULTED } from './ban-filters-not-consulted'
 export { type BanInput, BanService, type BanServiceDeps } from './ban-service'
 export { foldIdentifier } from './case-fold'
 export {
@@ -114,10 +115,13 @@ export type {
   AuthEventKind,
   AuthEventRecord,
   AuthEventRepository,
+  BanFilterAdminRepository,
+  BanFilterRecord,
   BanFilterRepository,
   BanRecord,
   BanRepository,
   Clock,
+  CreateBanFilterInput,
   CreateBanInput,
   CredentialPurpose,
   CredentialTokenRepository,

package/src/memory-bans.ts

@@ -1,9 +1,14 @@
-import type { BanFilter } from './ban-filter'
+import { ValidationError } from '@meith/core'
+import { msg } from '@meith/i18n'
+
+import { assertUsableFilter, type BanFilter } from './ban-filter'
 import type {
   AccountRepository,
-  BanFilterRepository,
+  BanFilterAdminRepository,
+  BanFilterRecord,
   BanRecord,
   BanRepository,
+  CreateBanFilterInput,
   CreateBanInput,
 } from './ports'
 
@@ -72,17 +77,60 @@ export class MemoryBans implements BanRepository {
   }
 }
 
-export class MemoryBanFilters implements BanFilterRepository {
-  private readonly rows: BanFilter[] = []
+export class MemoryBanFilters implements BanFilterAdminRepository {
+  private readonly rows: BanFilterRecord[] = []
   private nextId = 1
 
-  add(type: BanFilter['type'], pattern: string): BanFilter {
-    const row = { id: this.nextId++, type, pattern }
-    this.rows.push(row)
-    return row
+  add(type: BanFilter['type'], pattern: string, note: string | null = null): BanFilter {
+    return this.insert({ type, pattern, note, createdByUserId: null })
   }
 
   async listAll(): Promise<readonly BanFilter[]> {
-    return [...this.rows]
+    return this.rows.map((row) => ({ id: row.id, type: row.type, pattern: row.pattern }))
+  }
+
+  async listForAdmin(): Promise<readonly BanFilterRecord[]> {
+    return [...this.rows].sort((a, b) => b.id - a.id)
+  }
+
+  async create(input: CreateBanFilterInput): Promise<number> {
+    assertUsableFilter(input.type, input.pattern)
+
+    const pattern = input.pattern.trim()
+    const note = input.note?.trim()
+
+    if (this.rows.some((row) => row.type === input.type && row.pattern === pattern)) {
+      throw new ValidationError(msg('error.accounts.ban-filter-already-held'))
+    }
+
+    return this.insert({
+      type: input.type,
+      pattern,
+      note: note === undefined || note === '' ? null : note,
+      createdByUserId: input.createdByUserId,
+    }).id
+  }
+
+  async remove(id: number): Promise<void> {
+    const at = this.rows.findIndex((row) => row.id === id)
+    if (at !== -1) this.rows.splice(at, 1)
+  }
+
+  private insert(input: {
+    type: BanFilter['type']
+    pattern: string
+    note: string | null
+    createdByUserId: number | null
+  }): BanFilterRecord {
+    const row: BanFilterRecord = {
+      id: this.nextId++,
+      type: input.type,
+      pattern: input.pattern,
+      note: input.note,
+      createdByUserId: input.createdByUserId,
+      createdAt: new Date(),
+    }
+    this.rows.push(row)
+    return row
   }
 }

package/src/ports.ts

@@ -1,4 +1,4 @@
-import type { BanFilter } from './ban-filter'
+import type { BanFilter, BanFilterType } from './ban-filter'
 
 export type AccountState = 'active' | 'awaiting_activation' | 'banned'
 
@@ -388,3 +388,24 @@ export interface BanRepository {
 export interface BanFilterRepository {
   listAll(): Promise<readonly BanFilter[]>
 }
+
+export interface BanFilterRecord extends BanFilter {
+  readonly note: string | null
+  readonly createdByUserId: number | null
+  readonly createdAt: Date
+}
+
+export interface CreateBanFilterInput {
+  readonly type: BanFilterType
+  readonly pattern: string
+  readonly note?: string | null
+  readonly createdByUserId: number | null
+}
+
+export interface BanFilterAdminRepository extends BanFilterRepository {
+  listForAdmin(): Promise<readonly BanFilterRecord[]>
+
+  create(input: CreateBanFilterInput): Promise<number>
+
+  remove(id: number): Promise<void>
+}

package/src/service.ts

@@ -20,7 +20,7 @@ export interface IdentityDeps {
   readonly store: AccountStore
   readonly config: AuthConfig
   readonly clock?: Clock
-  readonly banFilters?: BanFilterRepository
+  readonly banFilters: BanFilterRepository
   readonly bans?: BanLookup
   readonly secondFactor?: SecondFactorLookup
 }
@@ -117,7 +117,7 @@ export class IdentityService {
   private readonly config: AuthConfig
   private readonly now: Clock
 
-  private readonly banFilters: BanFilterRepository | undefined
+  private readonly banFilters: BanFilterRepository
 
   private readonly bans: BanLookup | undefined
 
@@ -506,8 +506,6 @@ export class IdentityService {
   }
 
   private async assertNotFiltered(subject: BanFilterSubject): Promise<void> {
-    if (!this.banFilters) return
-
     const match = matchBanFilter(await this.banFilters.listAll(), subject)
     if (match) {
       throw new ForbiddenError(msg('error.accounts.account-used-board-contact-administrator'))