build(deps): replace monstrs runtime packages

.yarnrc.yml

@@ -120,9 +120,6 @@ packageExtensions:
   '@monstrs/nestjs-dataloader@*':
     dependencies:
       '@nestjs/core': '*'
-  '@monstrs/nestjs-signed-url@*':
-    dependencies:
-      '@google-cloud/storage': '*'
   '@nestjs/common@8':
     dependencies:
       '@types/node': '*'

files/application/package.json

@@ -5,9 +5,10 @@
   "type": "module",
   "main": "src/index.ts",
   "dependencies": {
+    "@atls/nestjs-gcs-client": "0.1.2",
+    "@atls/nestjs-signed-url": "0.6.4",
     "@files/domain": "workspace:0.0.2",
     "@files/persistence": "workspace:0.0.2",
-    "@monstrs/nestjs-signed-url": "0.1.3",
     "@nestjs/common": "11.1.27",
     "@nestjs/typeorm": "11.0.2",
     "class-validator": "0.15.1",
@@ -16,7 +17,6 @@
   },
   "devDependencies": {
     "@atls/nestjs-map-errors-interceptor": "^0.1.36",
-    "@google-cloud/storage": "4.3.1",
     "@nestjs/core": "11.1.27",
     "@nestjs/microservices": "11.1.27",
     "@nestjs/testing": "11.1.27",

files/application/src/module.ts

@@ -1,11 +1,24 @@
-import { SignedUrlModule }    from '@monstrs/nestjs-signed-url'
+import { GcsClientFactory }   from '@atls/nestjs-gcs-client'
+import { GcsClientModule }    from '@atls/nestjs-gcs-client'
+import { SignedUrlModule }    from '@atls/nestjs-signed-url'
 import { Module }             from '@nestjs/common'
 
 import { FileQueriesService } from './services/index.js'
 import { UploadService }      from './services/index.js'
 
 @Module({
-  imports: [SignedUrlModule.gcs()],
+  imports: [
+    SignedUrlModule.gcsAsync<[GcsClientFactory]>({
+      imports: [
+        GcsClientModule.register({
+          apiEndpoint: process.env.GCS_API_ENDPOINT,
+          keyFilename: process.env.GCS_KEY_FILENAME,
+        }),
+      ],
+      inject: [GcsClientFactory],
+      useFactory: (factory: GcsClientFactory) => factory.create(),
+    }),
+  ],
   providers: [FileQueriesService, UploadService],
   exports: [FileQueriesService, UploadService],
 })

files/application/src/services/UploadService.ts

@@ -1,4 +1,4 @@
-import { SignedUrlService }       from '@monstrs/nestjs-signed-url'
+import { SignedUrlSigner }        from '@atls/nestjs-signed-url'
 import { Injectable }             from '@nestjs/common'
 import { extname }                from 'path'
 import { format }                 from 'path'
@@ -15,7 +15,7 @@ export class UploadService {
   constructor(
     private readonly uploadRepository: UploadEntityRepository,
     private readonly fileRepository: FileEntityRepository,
-    private readonly signedUrlService: SignedUrlService
+    private readonly signedUrlSigner: SignedUrlSigner
   ) {}
 
   async create(command: CreateUploadCommand): Promise<any> {
@@ -24,9 +24,13 @@ export class UploadService {
       ext: extname(command.name),
     })
 
-    const { url, fields } = await this.signedUrlService.generateWriteUrl(filename, {
-      type: command.type,
-    })
+    const { url, fields } = await this.signedUrlSigner.generateWriteUrl(
+      process.env.GCS_BUCKET,
+      filename,
+      {
+        contentType: command.type,
+      }
+    )
 
     const upload = Upload.create(command.id, command.type, command.name, url, fields)
 

public-gateway/app/package.json

@@ -12,9 +12,9 @@
   "dependencies": {
     "@apollo/server": "4.13.0",
     "@atls/nestjs-dataloader": "0.0.14",
+    "@atls/nestjs-oathkeeper": "0.1.1",
     "@grpc/grpc-js": "^1.5.3",
     "@grpc/proto-loader": "0.5.5",
-    "@monstrs/oathkeeper-auth": "0.1.0",
     "@nestjs/apollo": "13.2.1",
     "@nestjs/common": "11.1.27",
     "@nestjs/core": "11.1.27",

public-gateway/app/src/index.ts

@@ -1,9 +1,8 @@
-import { oathkeeperAuth }     from '@monstrs/oathkeeper-auth'
+import { OathkeeperIdentityMiddleware } from '@atls/nestjs-oathkeeper'
+import { NestFactory }                  from '@nestjs/core'
 
-import { NestFactory }        from '@nestjs/core'
-
-import { ActivityMiddleware } from './middleware/index.js'
-import { ApplicationModule }  from './module.js'
+import { ActivityMiddleware }           from './middleware/index.js'
+import { ApplicationModule }            from './module.js'
 
 declare const module: any
 
@@ -71,16 +70,20 @@ const resolveUserFromKratos = async (req: any, _res: any, next: () => void) => {
   next()
 }
 
+const useOptionalOathkeeperAuth = (middleware: OathkeeperIdentityMiddleware) =>
+  async (req: any, res: any, next: () => void) => {
+    try {
+      await middleware.use(req, res, next)
+    } catch (error) {
+      next()
+    }
+  }
+
 const bootstrap = async () => {
   const app = await NestFactory.create(ApplicationModule)
 
   if (process.env.NODE_ENV !== 'production') {
-    app.use(
-      oathkeeperAuth(
-        process.env.OATHKEEPER_DECISIONS_URL || 'http://serenity-oathkeeper-api:4456/decisions',
-        { host: 'serenity.aunited.dev' }
-      )
-    )
+    app.use(useOptionalOathkeeperAuth(app.get(OathkeeperIdentityMiddleware)))
   }
 
   app.use(resolveUserFromKratos)

public-gateway/app/src/module.ts

@@ -1,11 +1,12 @@
-import { Module }                from '@nestjs/common'
-import { join }                  from 'path'
-
 import { DataLoaderInterceptor } from '@atls/nestjs-dataloader'
+import { OathkeeperModule }      from '@atls/nestjs-oathkeeper'
 import { ApolloDriver }          from '@nestjs/apollo'
 import { ApolloDriverConfig }    from '@nestjs/apollo'
+import { Module }                from '@nestjs/common'
 import { APP_INTERCEPTOR }       from '@nestjs/core'
 import { GraphQLModule }         from '@nestjs/graphql'
+import { join }                  from 'path'
+
 import { CatalogModule }         from '@public-gateway/catalog'
 import { CollaborationModule }   from '@public-gateway/collaboration'
 import { FilesModule }           from '@public-gateway/files'
@@ -15,6 +16,11 @@ import { SearchModule }          from '@public-gateway/search'
 
 import { ActivityMiddleware }    from './middleware/index.js'
 
+const oathkeeperApiUrl =
+  process.env.OATHKEEPER_API_URL ||
+  process.env.OATHKEEPER_DECISIONS_URL?.replace(/\/decisions\/?$/, '') ||
+  'http://serenity-oathkeeper-api:4456'
+
 // eslint-disable-next-line
 const playground =
   process.env.NODE_ENV !== 'production' || Boolean(process.env.PLAYGROUND)
@@ -27,6 +33,17 @@ const playground =
 
 @Module({
   imports: [
+    OathkeeperModule.register({
+      urls: {
+        api: oathkeeperApiUrl,
+      },
+      decision: {
+        forwardedHost: 'serenity.aunited.dev',
+      },
+      middleware: {
+        mode: 'enrich',
+      },
+    }),
     GraphQLModule.forRoot<ApolloDriverConfig>({
       driver: ApolloDriver,
       introspection: true,

search/service/package.json

@@ -14,7 +14,6 @@
     "@collaboration/domain": "0.0.1",
     "@elastic/elasticsearch": "7.5.0",
     "@godaddy/terminus": "4.3.1",
-    "@monstrs/nestjs-elasticsearch-indicator": "0.1.1",
     "@nestjs/common": "11.1.27",
     "@nestjs/core": "11.1.27",
     "@nestjs/elasticsearch": "11.1.0",

site/entrypoints/renderer/package.json

@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@apollo/link-error": "^2.0.0-beta.3",
+    "@atls/nestjs-oathkeeper": "0.1.1",
     "@atls/next-app-with-apollo": "^0.2.67",
     "@atls/next-config-with-extract-intl-messages": "^0.0.1",
     "@atls/next-config-with-pnp-workspaces": "^0.0.1",
@@ -19,15 +20,18 @@
     "@emotion/server": "^11.4.0",
     "@emotion/styled": "^11.3.0",
     "@formatjs/intl-relativetimeformat": "4.4.3",
-    "@monstrs/oathkeeper-auth": "0.1.0",
+    "@nestjs/common": "11.1.27",
+    "@nestjs/core": "11.1.27",
     "@site/specialists-detail-page": "0.0.1",
     "events": "^3.3.0",
     "express": "^4.17.1",
     "graphql": "^16.3.0",
     "next": "16.2.9",
     "next-compose-plugins": "^2.2.0",
     "next-fonts": "0.19.0",
-    "next-images": "1.2.0"
+    "next-images": "1.2.0",
+    "reflect-metadata": "0.2.2",
+    "rxjs": "7.8.2"
   },
   "devDependencies": {
     "@apollo/client": "3.5.8",

site/entrypoints/renderer/src/index.ts

@@ -1,12 +1,80 @@
-import { oathkeeperAuth } from '@monstrs/oathkeeper-auth'
-import express            from 'express'
-import next               from 'next'
-import path               from 'path'
+import type { OathkeeperHeaders }       from '@atls/nestjs-oathkeeper'
+import type { OathkeeperModuleOptions } from '@atls/nestjs-oathkeeper'
+import type { Request }                 from 'express'
+import type { Response }                from 'express'
+
+import { OathkeeperDecisionService }    from '@atls/nestjs-oathkeeper'
+import express                          from 'express'
+import next                             from 'next'
+import path                             from 'path'
+
+const oathkeeperApiUrl =
+  process.env.OATHKEEPER_API_URL ||
+  process.env.OATHKEEPER_DECISIONS_URL?.replace(/\/decisions\/?$/, '') ||
+  'http://serenity-oathkeeper-api:4456'
+
+const createOathkeeperDecisionClient = (apiUrl: string) => ({
+  async decide(headers: OathkeeperHeaders) {
+    const response = await fetch(new URL('/decisions', apiUrl).toString(), {
+      headers,
+      method: 'GET',
+    })
+
+    return {
+      headers: response.headers,
+      status: response.status,
+    }
+  },
+})
+
+const createOathkeeperAuth = (forwardedHost: string) => {
+  const options: OathkeeperModuleOptions = {
+    decision: {
+      forwardedHost,
+    },
+    middleware: {
+      mode: 'enrich',
+    },
+    urls: {
+      api: oathkeeperApiUrl,
+    },
+  }
+
+  const decisions = new OathkeeperDecisionService(
+    createOathkeeperDecisionClient(oathkeeperApiUrl),
+    options
+  )
+
+  return async (req: Request, _res: Response, next: () => void) => {
+    try {
+      const decision = await decisions.decide({
+        headers: req.headers,
+        host: forwardedHost,
+        method: req.method || 'GET',
+        proto: req.protocol,
+        uri: req.url || '/',
+      })
+
+      if (decision.allowed) {
+        if (decision.authorization) {
+          req.headers.authorization = decision.authorization
+        }
+
+        if (decision.user) {
+          req.headers['x-user'] = decision.user
+        }
+      }
+    } catch (error) {}
+
+    next()
+  }
+}
 
 const bootstrap = async () => {
   const app = next({
     dev: process.env.NODE_ENV !== 'production',
-    dir: process.env.NODE_ENV !== 'production' ? path.join(__dirname, '../src/index.js') : __dirname,
+    dir:
+      process.env.NODE_ENV !== 'production' ? path.join(__dirname, '../src/index.js') : __dirname,
   })
 
   const handle = app.getRequestHandler()
@@ -16,12 +84,7 @@ const bootstrap = async () => {
   const server = express()
 
   if (process.env.NODE_ENV !== 'production') {
-    server.use(
-      oathkeeperAuth(
-        process.env.OATHKEEPER_DECISIONS_URL || 'http://serenity-oathkeeper-api:4456/decisions',
-        { host: 'serenity.atls.tech' }
-      )
-    )
+    server.use(createOathkeeperAuth('serenity.atls.tech'))
   }
 
   server.get('*', (req, res) => handle(req, res))