From 0af581d8a9d06d0de5b00a65915694cec6d270d2 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Fri, 30 Apr 2021 10:32:48 +0200
Subject: [PATCH] fix: docker-compose missing var + add admin verification on
ES index reset
---
docker-compose.yml | 12 ++++++++++++
src/structures/structures.controller.ts | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 2f38db773..4ded1583c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,18 @@ services:
MONGO_NON_ROOT_USERNAME: ${MONGO_NON_ROOT_USERNAME}
MONGO_NON_ROOT_PASSWORD: ${MONGO_NON_ROOT_PASSWORD}
MONGO_DB_HOST_AND_PORT: ${MONGO_DB_HOST_AND_PORT}
+ JWT_SECRET: ${JWT_SECRET}
+ SALT: ${SALT}
+ MAIL_URL: ${MAIL_URL}
+ MAIL_TOKEN: ${MAIL_TOKEN}
+ NODE_ENV: ${NODE_ENV}
+ APTIC_TOKEN: ${APTIC_TOKEN}
+ GHOST_HOST_AND_PORT: ${GHOST_HOST_AND_PORT}
+ GHOST_ADMIN_API_KEY: ${GHOST_ADMIN_API_KEY}
+ GHOST_CONTENT_API_KEY: ${GHOST_CONTENT_API_KEY}
+ ELASTICSEARCH_NODE: ${ELASTICSEARCH_NODE}
+ ELASTICSEARCH_USERNAME: ${ELASTICSEARCH_USERNAME}
+ ELASTICSEARCH_PASSWORD: ${ELASTICSEARCH_PASSWORD}
restart: unless-stopped
depends_on:
- database-ram
diff --git a/src/structures/structures.controller.ts b/src/structures/structures.controller.ts
index 3121e59c8..65dcfd00b 100644
--- a/src/structures/structures.controller.ts
+++ b/src/structures/structures.controller.ts
@@ -29,7 +29,7 @@ import { QueryStructure } from './dto/query-structure.dto';
import { structureDto } from './dto/structure.dto';
import { Structure, StructureDocument } from './schemas/structure.schema';
import { StructuresService } from './services/structures.service';
-import { StructureSearchBody } from './interfaces/structure-search-body.interface';
+import { RolesGuard } from '../users/guards/roles.guard';
@Controller('structures')
export class StructuresController {
@@ -70,6 +70,8 @@ export class StructuresController {
}
@Post('resetSearchIndex')
+ @UseGuards(JwtAuthGuard, RolesGuard)
+ @Roles('admin')
public async resetES(): Promise<StructureDocument[]> {
return this.structureService.initiateStructureIndex();
}
--
GitLab