extract domain auth + entity

apps/hcdc-access-service/package.json

@@ -12,12 +12,12 @@
     "lint": "tsc && rimraf dist"
   },
   "dependencies": {
-    "@casl/ability": "^6.5.0",
-    "@casl/mongoose": "^7.2.2",
     "@diut/common": "workspace:*",
     "@diut/hcdc": "workspace:*",
     "@diut/nestjs-infra": "workspace:*",
     "@diut/services": "workspace:*",
+    "@casl/ability": "^6.5.0",
+    "@casl/mongoose": "^7.2.2",
     "@nestjs/cli": "^10.3.2",
     "@nestjs/common": "^10.3.3",
     "@nestjs/config": "^3.2.0",
@@ -28,7 +28,6 @@
     "@nestjs/passport": "^10.0.3",
     "@nestjs/platform-express": "^10.3.3",
     "@nestjs/swagger": "^7.3.0",
-    "@ucast/mongo2js": "^1.3.4",
     "argon2": "^0.31.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",

apps/hcdc-access-service/src/domain/auth/setup-subject.ts

@@ -0,0 +1,22 @@
+import '@casl/mongoose'
+
+declare module '@casl/mongoose' {
+  interface RecordTypes {
+    BioProduct: true
+    Branch: true
+    Diagnosis: true
+    Doctor: true
+    Instrument: true
+    Patient: true
+    PatientType: true
+    PrintForm: true
+    Role: true
+    Sample: true
+    SampleType: true
+    Test: true
+    TestCategory: true
+    TestCombo: true
+    TestElement: true
+    User: true
+  }
+}

apps/hcdc-access-service/src/domain/auth/utils.ts

@@ -1,44 +1,22 @@
-import {
-  MongoAbility,
-  subject as assignSubject,
-  buildMongoQueryMatcher,
-  createMongoAbility,
-} from '@casl/ability'
-import { $or, or } from '@ucast/mongo2js'
+import { MongoAbility } from '@casl/ability'
 import type { FilterQuery } from 'mongoose'
 import { accessibleBy } from '@casl/mongoose'
 import type { PopulatePath } from '@diut/nestjs-infra'
-
-import { AuthAction, AuthActionUnionType } from './action'
 import {
+  AUTH_ACTION_ALL,
+  AUTH_SUBJECT_ALL,
+  AuthAction,
+  AuthActionUnionType,
   AuthSubject,
   AuthSubjectUnionType,
+  BaseEntity,
   SubjectEntityMapping,
-} from './subject'
+  checkPermission,
+} from '@diut/hcdc'
+
 import { EAuthzPermissionDenied } from 'src/domain/exception'
-import { AUTH_ACTION_ALL, AUTH_SUBJECT_ALL } from './constants'
-import { BaseEntity, PermissionRule } from '../entity'
 import { EntityFindOneOptions } from '../interface'
 
-const conditionsMatcher = buildMongoQueryMatcher({ $or }, { or })
-
-export function createAbility(permissionRules: PermissionRule[]) {
-  return createMongoAbility(permissionRules, { conditionsMatcher })
-}
-
-export function checkPermission<TSubject extends keyof typeof AuthSubject>(
-  ability: MongoAbility,
-  subject: TSubject | typeof AUTH_SUBJECT_ALL,
-  action: (typeof AuthAction)[TSubject][number] | typeof AUTH_ACTION_ALL,
-  object?: Partial<SubjectEntityMapping[TSubject]> | null,
-) {
-  if (object != undefined) {
-    return ability.can(action, assignSubject(subject, object))
-  }
-
-  return ability.can(action, subject)
-}
-
 export function assertPermission<TSubject extends keyof typeof AuthSubject>(
   ability: MongoAbility,
   subject: TSubject | typeof AUTH_SUBJECT_ALL,

apps/hcdc-access-service/src/domain/entity/base-entity.ts

@@ -1,17 +1,8 @@
-import { exampleMongoObjectId } from '@diut/nestjs-infra'
+import { exampleMongoObjectId } from '@diut/common'
+import { BaseEntity } from '@diut/hcdc'
 import { ApiPropertyOptions } from '@nestjs/swagger'
 import { omit } from 'lodash'
 
-export type BaseEntity = {
-  _id: string
-
-  createdAt: Date
-  updatedAt: Date
-
-  isDeleted: boolean
-  deletedAt?: Date
-}
-
 export const exampleBaseEntity = {
   _id: exampleMongoObjectId,
   createdAt: {

apps/hcdc-access-service/src/domain/entity/bio-product/example.ts

@@ -1,7 +1,7 @@
-import { exampleMongoObjectId } from '@diut/nestjs-infra'
+import { exampleMongoObjectId } from '@diut/common'
+import { BioProduct } from '@diut/hcdc'
 
 import { EntityDataExample } from '../base-entity'
-import { BioProduct } from './entity'
 
 export const exampleBioProduct = {
   displayIndex: {

apps/hcdc-access-service/src/domain/entity/bio-product/index.ts

@@ -1,3 +1 @@
-export * from './entity'
 export * from './example'
-export * from './auth'

apps/hcdc-access-service/src/domain/entity/branch/example.ts

@@ -1,7 +1,7 @@
-import { exampleMongoObjectIds } from '@diut/nestjs-infra'
+import { exampleMongoObjectIds } from '@diut/common'
+import { Branch, BranchType } from '@diut/hcdc'
 
 import { EntityDataExample } from '../base-entity'
-import { Branch, BranchType } from './entity'
 
 export const exampleBranch = {
   displayIndex: {

apps/hcdc-access-service/src/domain/entity/branch/index.ts

@@ -1,3 +1 @@
-export * from './entity'
 export * from './example'
-export * from './auth'

apps/hcdc-access-service/src/domain/entity/diagnosis/example.ts

@@ -1,7 +1,7 @@
-import { exampleMongoObjectId } from '@diut/nestjs-infra'
+import { exampleMongoObjectId } from '@diut/common'
+import { Diagnosis } from '@diut/hcdc'
 
 import { EntityDataExample } from '../base-entity'
-import { Diagnosis } from './entity'
 
 export const exampleDiagnosis = {
   displayIndex: {

apps/hcdc-access-service/src/domain/entity/diagnosis/index.ts

@@ -1,3 +1 @@
-export * from './entity'
 export * from './example'
-export * from './auth'

apps/hcdc-access-service/src/domain/entity/doctor/example.ts

@@ -1,7 +1,7 @@
-import { exampleMongoObjectId } from '@diut/nestjs-infra'
+import { exampleMongoObjectId } from '@diut/common'
+import { Doctor } from '@diut/hcdc'
 
 import { EntityDataExample } from '../base-entity'
-import { Doctor } from './entity'
 
 export const exampleDoctor = {
   displayIndex: {

apps/hcdc-access-service/src/domain/entity/doctor/index.ts

@@ -1,3 +1 @@
-export * from './entity'
 export * from './example'
-export * from './auth'

apps/hcdc-access-service/src/domain/entity/instrument/example.ts

@@ -1,7 +1,7 @@
-import { exampleMongoObjectId } from '@diut/nestjs-infra'
+import { exampleMongoObjectId } from '@diut/common'
+import { Instrument } from '@diut/hcdc'
 
 import { EntityDataExample } from '../base-entity'
-import { Instrument } from './entity'
 
 export const exampleInstrument = {
   displayIndex: {

apps/hcdc-access-service/src/domain/entity/instrument/index.ts

@@ -1,3 +1 @@
-export * from './entity'
 export * from './example'
-export * from './auth'

apps/hcdc-access-service/src/domain/entity/patient-type/example.ts

@@ -1,7 +1,7 @@
-import { exampleMongoObjectId } from '@diut/nestjs-infra'
+import { exampleMongoObjectId } from '@diut/common'
+import { PatientType } from '@diut/hcdc'
 
 import { EntityDataExample } from '../base-entity'
-import { PatientType } from './entity'
 
 export const examplePatientType = {
   displayIndex: {

apps/hcdc-access-service/src/domain/entity/patient-type/index.ts

@@ -1,3 +1 @@
-export * from './entity'
 export * from './example'
-export * from './auth'

apps/hcdc-access-service/src/domain/entity/patient/example.ts

@@ -1,7 +1,7 @@
-import { exampleMongoObjectId } from '@diut/nestjs-infra'
+import { exampleMongoObjectId } from '@diut/common'
+import { Patient, PatientGender } from '@diut/hcdc'
 
 import { EntityDataExample } from '../base-entity'
-import { Patient, PatientGender } from './entity'
 
 export const examplePatient = {
   externalId: {

apps/hcdc-access-service/src/domain/entity/patient/index.ts

@@ -1,3 +1 @@
-export * from './entity'
 export * from './example'
-export * from './auth'

apps/hcdc-access-service/src/domain/entity/permission-rule/example.ts

@@ -1,6 +1,7 @@
+import { PermissionRule } from '@diut/hcdc'
+
 import { AuthActionValues, AuthSubjectValues } from 'src/domain/auth'
 import { EntityDataExample } from '../base-entity'
-import { PermissionRule } from './entity'
 
 export const examplePermissionRule = {
   subject: {

apps/hcdc-access-service/src/domain/entity/permission-rule/index.ts

@@ -1,2 +1 @@
-export * from './entity'
 export * from './example'

apps/hcdc-access-service/src/domain/entity/print-form/example.ts

@@ -1,7 +1,7 @@
-import { exampleMongoObjectId } from '@diut/nestjs-infra'
+import { exampleMongoObjectId } from '@diut/common'
+import { PrintForm, PrintTemplate } from '@diut/hcdc'
 
 import { EntityDataExample } from '../base-entity'
-import { PrintForm, PrintTemplate } from './entity'
 
 export const examplePrintForm = {
   displayIndex: {

apps/hcdc-access-service/src/domain/entity/print-form/index.ts

@@ -1,3 +1 @@
-export * from './entity'
 export * from './example'
-export * from './auth'

apps/hcdc-access-service/src/domain/entity/role/example.ts

@@ -1,7 +1,7 @@
-import { exampleMongoObjectId } from '@diut/nestjs-infra'
+import { exampleMongoObjectId } from '@diut/common'
+import { Role } from '@diut/hcdc'
 
 import { EntityDataExample } from '../base-entity'
-import { Role } from './entity'
 
 export const exampleRole = {
   displayIndex: {

apps/hcdc-access-service/src/domain/entity/role/index.ts

@@ -1,3 +1 @@
-export * from './entity'
-export * from './auth'
 export * from './example'