fix(common_files): serve .env and .htaccess files (#327)

Author: tamirGer

charts/brokencrystals/Chart.yaml

@@ -4,7 +4,7 @@ description: |
   Benchmark application that uses modern technologies and implements a set of
   common security vulnerabilities
 type: application
-version: 0.0.61
+version: 0.0.62
 keywords:
   - brokencrystals
   - brkn

client/src/pages/marketplace/Marketplace.tsx

@@ -54,7 +54,7 @@ export const Marketplace: FC<Props> = (props: Props) => {
       ? getLatestProducts().then((data) => setProducts(data))
       : getProducts(
           new Date(new Date().setFullYear(new Date().getFullYear() - 1)),
-          new Date()
+          new Date(new Date().setDate(new Date().getDate() + 1))
         ).then((data) => setProducts(data));
   }, []);
 

package-lock.json

@@ -36,7 +36,6 @@
     "@nestjs/graphql": "^11.0.0",
     "@nestjs/mercurius": "^11.0.3",
     "@nestjs/platform-fastify": "^9.3.9",
-    "@nestjs/serve-static": "^4.0.1",
     "@nestjs/swagger": "^6.2.1",
     "@sectester/bus": "^0.16.5",
     "@sectester/core": "^0.16.5",

package.json

@@ -13,8 +13,6 @@ import { HttpClientModule as HttpClientModule } from './httpclient/httpclient.mo
 import { TraceMiddleware } from './components/trace.middleware';
 import { GraphQLModule } from '@nestjs/graphql';
 import { MercuriusDriver, MercuriusDriverConfig } from '@nestjs/mercurius';
-import { ServeStaticModule } from '@nestjs/serve-static';
-import { join } from 'path';
 import { AppService } from './app.service';
 import { UsersService } from './users/users.service';
 import { AppResolver } from './app.resolver';
@@ -39,10 +37,6 @@ import { PartnersModule } from './partners/partners.module';
       graphiql: true,
       autoSchemaFile: true,
     }),
-    ServeStaticModule.forRoot({
-      rootPath: join(__dirname, '..', 'client', 'build'),
-      serveStaticOptions: { dotfiles: 'allow' },
-    }),
   ],
   controllers: [AppController],
   providers: [

src/app.module.ts

@@ -6,7 +6,7 @@ import fastifyCookie from '@fastify/cookie';
 import session from '@fastify/session';
 import { GlobalExceptionFilter } from './components/global-exception.filter';
 import * as os from 'os';
-import { readFileSync, readdirSync } from 'fs';
+import { readFileSync, readFile, readdirSync } from 'fs';
 import * as cluster from 'cluster';
 import {
   FastifyAdapter,
@@ -91,8 +91,45 @@ async function bootstrap() {
         : null,
   });
 
+  server.setDefaultRoute((req, res) => {
+    if (req.url && req.url.startsWith('/api')) {
+      res.statusCode = 404;
+      return res.end({
+        success: false,
+        error: {
+          kind: 'user_input',
+          message: 'Not Found',
+        },
+      });
+    }
+
+    readFile(
+      join(__dirname, '..', 'client', 'build', 'index.html'),
+      'utf8',
+      (err, data) => {
+        if (err) {
+          res.statusCode = 500;
+          res.end('Internal Server Error');
+          return;
+        }
+        res.statusCode = 200;
+        res.setHeader('Content-Type', 'text/html');
+        res.end(data);
+      },
+    );
+  });
+
+  await server.register(fastifyStatic, {
+    root: join(__dirname, '..', 'client', 'build'),
+    prefix: `/`,
+    decorateReply: false,
+    redirect: false,
+    wildcard: false,
+    serveDotFiles: true,
+  });
+
   for (const dir of readdirSync(join(__dirname, '..', 'client', 'vcs'))) {
-    server.register(fastifyStatic, {
+    await server.register(fastifyStatic, {
       root: join(__dirname, '..', 'client', 'vcs', dir),
       prefix: `/.${dir}`,
       decorateReply: false,
@@ -106,7 +143,7 @@ async function bootstrap() {
     });
   }
 
-  server.register(fastifyStatic, {
+  await server.register(fastifyStatic, {
     root: join(__dirname, '..', 'client', 'build', 'vendor'),
     prefix: `/vendor`,
     decorateReply: false,

src/main.ts

@@ -74,7 +74,7 @@ export class ProductsController {
   ): Promise<ProductDto[]> {
     this.logger.debug('Get all products.');
     let df = new Date(new Date().setFullYear(new Date().getFullYear() - 1));
-    let dt = new Date();
+    let dt = new Date(new Date().setDate(new Date().getDate() + 1));
     if (dateFrom) {
       df = this.parseDate(dateFrom);
     }