Refactor domain, entity, and action shared types

.github/workflows/authz_ci.yml

@@ -40,7 +40,6 @@ jobs:
         shell: bash
         run: |
           make authz/copy-default-env
-          make authz/db/generate-types
 
       - name: Test types
         shell: bash

apps/authz/Makefile

@@ -12,8 +12,6 @@ authz/start/dev:
 authz/setup:
 	make authz/copy-default-env
 	make authz/rego/compile
-	make authz/db/setup
-	make authz/test/db/setup
 
 authz/copy-default-env:
 	cp ${AUTHZ_PROJECT_DIR}/.env.default ${AUTHZ_PROJECT_DIR}/.env
@@ -33,41 +31,9 @@ authz/format/check:
 authz/lint/check:
 	npx nx lint ${AUTHZ_PROJECT_NAME}
 
-# === Database ===
-
-authz/db/generate-types:
-	npx prisma generate \
-		--schema ${AUTHZ_DATABASE_SCHEMA}
-
-authz/db/migrate:
-	npx dotenv -e ${AUTHZ_PROJECT_DIR}/.env -- \
-		prisma migrate dev \
-			--schema ${AUTHZ_DATABASE_SCHEMA}
-
-authz/db/setup:
-	@echo ""
-	@echo "${TERM_GREEN}🛠️  Setting up Authz development database${TERM_NO_COLOR}"
-	@echo ""
-	npx dotenv -e ${AUTHZ_PROJECT_DIR}/.env -- \
-		prisma migrate reset \
-			--schema ${AUTHZ_DATABASE_SCHEMA} \
-			--force
-
-	@echo ""
-	@echo "${TERM_GREEN}🛠️  Setting up Authz test database${TERM_NO_COLOR}"
-	@echo ""
-	make authz/test/db/setup
-
-authz/db/create-migration:
-	npx dotenv -e ${AUTHZ_PROJECT_DIR}/.env -- \
-		prisma migrate dev \
-			--schema ${AUTHZ_DATABASE_SCHEMA} \
-			--name ${NAME}
-
 # === Testing ===
 
 authz/test/type:
-	make authz/db/generate-types
 	npx tsc \
 		--project ${AUTHZ_PROJECT_DIR}/tsconfig.app.json \
 		--noEmit

apps/authz/README.md

@@ -11,8 +11,6 @@ TBD
 ## Getting started
 
 ```bash
-# Boot PostgreSQL and Redis
-make docker/up
 make authz/setup
 ```
 

apps/authz/src/app/app.module.ts

@@ -2,7 +2,6 @@ import { HttpModule } from '@nestjs/axios'
 import { Module, ValidationPipe } from '@nestjs/common'
 import { ConfigModule } from '@nestjs/config'
 import { APP_PIPE } from '@nestjs/core'
-import { PersistenceModule } from '../shared/module/persistence/persistence.module'
 import { load } from './app.config'
 import { AppController } from './app.controller'
 import { AppService } from './app.service'
@@ -17,8 +16,7 @@ import { EntityRepository } from './persistence/repository/entity.repository'
       load: [load],
       isGlobal: true
     }),
-    HttpModule,
-    PersistenceModule
+    HttpModule
   ],
   controllers: [AppController, AdminController],
   providers: [

apps/authz/src/app/app.service.ts

@@ -1,7 +1,7 @@
 import {
   Action,
   Alg,
-  AuthCredential,
+  CredentialEntity,
   Decision,
   EvaluationRequest,
   EvaluationResponse,
@@ -70,7 +70,7 @@ export const finalizeDecision = (response: OpaResult[]) => {
 export class AppService {
   constructor(private opaService: OpaService, private entityRepository: EntityRepository) {}
 
-  async #verifySignature(requestSignature: Signature, verificationMessage: string): Promise<AuthCredential> {
+  async #verifySignature(requestSignature: Signature, verificationMessage: string): Promise<CredentialEntity> {
     const { pubKey, alg, sig } = requestSignature
     const credential = this.entityRepository.getCredentialForPubKey(pubKey)
 
@@ -103,7 +103,7 @@ export class AppService {
   async #populateApprovals(
     approvals: Signature[] | undefined,
     verificationMessage: string
-  ): Promise<AuthCredential[] | null> {
+  ): Promise<CredentialEntity[] | null> {
     if (!approvals) return null
     const approvalSigs = await Promise.all(
       approvals.map(async ({ sig, alg, pubKey }) => {
@@ -121,9 +121,9 @@ export class AppService {
     intent,
     transfers
   }: {
-    principal: AuthCredential
+    principal: CredentialEntity
     request: Request
-    approvals: AuthCredential[] | null
+    approvals: CredentialEntity[] | null
     intent?: Intent
     transfers?: HistoricalTransfer[]
   }): RegoInput {

apps/authz/src/app/persistence/repository/entity.repository.ts

@@ -1,4 +1,4 @@
-import { AuthCredential, Entities } from '@narval/authz-shared'
+import { CredentialEntity, Entities } from '@narval/authz-shared'
 import { HttpService } from '@nestjs/axios'
 import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common'
 import { ORGANIZATION } from 'packages/authz-shared/src/lib/dev.fixture'
@@ -31,7 +31,7 @@ export class EntityRepository implements OnApplicationBootstrap {
     )
   }
 
-  getCredentialForPubKey(pubKey: string): AuthCredential | null {
+  getCredentialForPubKey(pubKey: string): CredentialEntity | null {
     if (this.entities) {
       return this.entities.credentials.find((cred) => cred.pubKey === pubKey) || null
     }