Merge pull request #1048 from joshunrau/dev

Author: joshunrau

apps/api/package.json

@@ -5,6 +5,8 @@
   "private": true,
   "license": "Apache-2.0",
   "scripts": {
+    "_dev": "NODE_ENV=development env-cmd -f ../../.env node --enable-source-maps --import @swc-node/register/esm-register --watch src/main.ts",
+    "_dev:test": "NODE_ENV=test env-cmd -f ../../.env node --enable-source-maps --import @swc-node/register/esm-register --watch src/main.ts",
     "build": "NODE_ENV=production tsx scripts/build.ts",
     "db:generate": "prisma generate",
     "dev": "NODE_ENV=development env-cmd -f ../../.env tsx scripts/dev.ts",

apps/api/scripts/build.ts

@@ -24,7 +24,7 @@ const outfile = path.resolve(outdir, 'app.js');
 
 const runtimeV1Dir = path.dirname(require.resolve('@opendatacapture/runtime-v1/package.json'));
 
-const options: { external: NonNullable<unknown>; plugins: NonNullable<unknown> } & BuildOptions = {
+const options: BuildOptions & { external: NonNullable<unknown>; plugins: NonNullable<unknown> } = {
   banner: {
     js: "Object.defineProperties(globalThis, { __dirname: { value: import.meta.dirname, writable: false }, __filename: { value: import.meta.filename, writable: false }, require: { value: (await import('module')).createRequire(import.meta.url), writable: false } });"
   },

apps/api/src/ability/ability.factory.ts

@@ -1,17 +1,18 @@
 import { AbilityBuilder, detectSubjectType } from '@casl/ability';
 import { createPrismaAbility } from '@casl/prisma';
-import { Injectable, Logger } from '@nestjs/common';
+import { LoggingService } from '@douglasneuroinformatics/libnest/logging';
+import { Injectable } from '@nestjs/common';
 import type { AppSubjectName } from '@opendatacapture/schemas/core';
 import { type UserModel } from '@prisma/generated-client';
 
 import type { AppAbility } from '@/core/types';
 
 @Injectable()
 export class AbilityFactory {
-  private readonly logger = new Logger(AbilityFactory.name);
+  constructor(private readonly loggingService: LoggingService) {}
 
   createForUser(user: UserModel): AppAbility {
-    this.logger.verbose('Creating ability for user: ' + user.username);
+    this.loggingService.verbose('Creating ability for user: ' + user.username);
     const ability = new AbilityBuilder<AppAbility>(createPrismaAbility);
     switch (user.basePermissionLevel) {
       case 'ADMIN':

apps/api/src/app.module.ts

@@ -1,4 +1,5 @@
-import { CryptoModule, LoggingModule } from '@douglasneuroinformatics/libnest/modules';
+import { CryptoModule } from '@douglasneuroinformatics/libnest/crypto';
+import { LoggingModule } from '@douglasneuroinformatics/libnest/logging';
 import { Module } from '@nestjs/common';
 import { APP_GUARD } from '@nestjs/core';
 import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';

apps/api/src/auth/__tests__/auth.integration.spec.ts

@@ -1,5 +1,5 @@
 import { ValidationPipe } from '@douglasneuroinformatics/libnest/core';
-import { CryptoService } from '@douglasneuroinformatics/libnest/modules';
+import { CryptoService } from '@douglasneuroinformatics/libnest/crypto';
 import { MockFactory } from '@douglasneuroinformatics/libnest/testing';
 import { HttpStatus } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';

apps/api/src/auth/__tests__/auth.service.spec.ts

@@ -1,4 +1,4 @@
-import { CryptoService } from '@douglasneuroinformatics/libnest/modules';
+import { CryptoService } from '@douglasneuroinformatics/libnest/crypto';
 import { type MockedInstance, MockFactory } from '@douglasneuroinformatics/libnest/testing';
 import { NotFoundException, UnauthorizedException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';

apps/api/src/auth/auth.service.ts

@@ -1,4 +1,4 @@
-import { CryptoService } from '@douglasneuroinformatics/libnest/modules';
+import { CryptoService } from '@douglasneuroinformatics/libnest/crypto';
 import { Injectable, InternalServerErrorException, NotFoundException, UnauthorizedException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import type { AuthPayload, JwtPayload } from '@opendatacapture/schemas/auth';

apps/api/src/auth/guards/authentication.guard.ts

@@ -1,4 +1,5 @@
-import { type ExecutionContext, Injectable, Logger } from '@nestjs/common';
+import { LoggingService } from '@douglasneuroinformatics/libnest/logging';
+import { type ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 import { type Request } from 'express';
@@ -9,14 +10,15 @@ import { type RouteAccessType } from '@/core/decorators/route-access.decorator';
 /** Allows request to proceed if the route is public or the user provides a valid JWT */
 @Injectable()
 export class AuthenticationGuard extends AuthGuard('jwt') {
-  private readonly logger = new Logger(AuthenticationGuard.name);
-
-  constructor(private readonly reflector: Reflector) {
+  constructor(
+    private readonly loggingService: LoggingService,
+    private readonly reflector: Reflector
+  ) {
     super();
   }
 
   override canActivate(context: ExecutionContext): boolean | Observable<boolean> | Promise<boolean> {
-    this.logger.verbose(`Request URL: ${context.switchToHttp().getRequest<Request>().url}`);
+    this.loggingService.verbose(`Request URL: ${context.switchToHttp().getRequest<Request>().url}`);
     return this.isPublicRoute(context) || super.canActivate(context);
   }
 
@@ -26,7 +28,7 @@ export class AuthenticationGuard extends AuthGuard('jwt') {
       context.getClass()
     ]);
     const result = routeAccess === 'public';
-    this.logger.verbose(`Public Route: ${result}`);
+    this.loggingService.verbose(`Public Route: ${result}`);
     return result;
   }
 }

apps/api/src/auth/guards/authorization.guard.ts

@@ -1,4 +1,5 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { LoggingService } from '@douglasneuroinformatics/libnest/logging';
+import { Injectable } from '@nestjs/common';
 import type { CanActivate, ExecutionContext } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import type { Request } from 'express';
@@ -8,13 +9,14 @@ import type { RouteAccessType } from '@/core/decorators/route-access.decorator';
 
 @Injectable()
 export class AuthorizationGuard implements CanActivate {
-  private readonly logger = new Logger(AuthorizationGuard.name);
-
-  constructor(private readonly reflector: Reflector) {}
+  constructor(
+    private readonly loggingService: LoggingService,
+    private readonly reflector: Reflector
+  ) {}
 
   canActivate(context: ExecutionContext): boolean | Observable<boolean> | Promise<boolean> {
     const request = context.switchToHttp().getRequest<Request>();
-    this.logger.verbose(`Request URL: ${request.url}`);
+    this.loggingService.verbose(`Request URL: ${request.url}`);
 
     const routeAccess = this.reflector.getAllAndOverride<RouteAccessType | undefined>('RouteAccess', [
       context.getHandler(),

apps/api/src/auth/strategies/jwt.strategy.ts

@@ -1,4 +1,5 @@
-import { Injectable, Logger, NotFoundException, UnauthorizedException } from '@nestjs/common';
+import { LoggingService } from '@douglasneuroinformatics/libnest/logging';
+import { Injectable, NotFoundException, UnauthorizedException } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import type { JwtPayload } from '@opendatacapture/schemas/auth';
 import type { GroupModel, UserModel } from '@prisma/generated-client';
@@ -11,11 +12,10 @@ import { UsersService } from '@/users/users.service';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
-  private readonly logger = new Logger(JwtStrategy.name);
-
   constructor(
     config: ConfigurationService,
     private readonly abilityFactory: AbilityFactory,
+    private readonly loggingService: LoggingService,
     private readonly usersService: UsersService
   ) {
     super({
@@ -29,7 +29,7 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
   async validate({ username }: JwtPayload): Promise<Request['user']> {
     const user = await this.getUser(username);
     const ability = this.abilityFactory.createForUser(user);
-    this.logger.verbose(`Validated Token for User: ${username}`);
+    this.loggingService.verbose(`Validated Token for User: ${username}`);
     return { ...user, ability };
   }