Merge branch 'feat/update-packages' into 'develop'

Update dependencies to fix vulnerabilities

See merge request sibmip/gateway!41

api/Dockerfile

-FROM node:12.13-alpine As development
+FROM node:16.14-alpine As development
 
 WORKDIR /usr/src/app
 
@@ -12,22 +12,22 @@ RUN npm run build
 
 RUN npm run test
 
-FROM node:12.13-alpine as production
+FROM node:16.14-alpine as production
 
 ARG NODE_ENV=production
 ENV NODE_ENV=${NODE_ENV}
 
 RUN apk update && apk add bash
-RUN apk add --no-cache bash
 
 WORKDIR /usr/src/app
 
 COPY package*.json ./
 
-RUN npm ci --production
+RUN npm ci --production --ignore-scripts
 
 COPY . .
 
 COPY --from=development /usr/src/app/dist ./dist
+COPY --from=development /usr/src/app/assets ./assets
 
 CMD ["node", "dist/main"]

api/package.json

@@ -23,14 +23,15 @@
     "prepare": "cd .. && husky install api/.husky"
   },
   "dependencies": {
-    "@nestjs/axios": "^0.0.1",
+    "@nestjs/apollo": "^10.0.6",
+    "@nestjs/axios": "^0.0.7",
     "@nestjs/common": "^8.0.0",
     "@nestjs/config": "^1.0.1",
     "@nestjs/core": "^8.0.0",
-    "@nestjs/graphql": "^9.0.4",
+    "@nestjs/graphql": "^10.0.6",
     "@nestjs/platform-express": "^8.0.0",
     "@nestjs/typeorm": "^8.0.2",
-    "apollo-server-express": "^3.3.0",
+    "apollo-server-express": "^3.6.3",
     "axios": "^0.21.1",
     "graphql": "^15.5.3",
     "graphql-type-json": "^0.3.2",
@@ -41,7 +42,7 @@
     "ts-md5": "^1.2.11"
   },
   "devDependencies": {
-    "@eclass/semantic-release-docker": "^2.0.0",
+    "@eclass/semantic-release-docker": "^3.0.0",
     "@nestjs/cli": "^8.0.0",
     "@nestjs/schematics": "^8.0.0",
     "@nestjs/testing": "^8.2.2",

api/src/engine/assets.service.ts

@@ -34,6 +34,8 @@ export class AssetsService {
       );
     }
 
+    if (!filePath.includes('assets/engines')) return undefined;
+
     return fs.existsSync(filePath) ? filePath : undefined;
   }
 

api/src/engine/connectors/exareme/main.connector.ts

@@ -199,7 +199,7 @@ export default class ExaremeService implements IEngineService {
 
     return this.httpService
       .get<string>(path, {
-        headers: this.req.headers,
+        headers: this.headers,
       })
       .pipe(map((response) => response.data));
   }
@@ -209,7 +209,7 @@ export default class ExaremeService implements IEngineService {
 
     return this.httpService
       .post<string>(path, this.req.body, {
-        headers: this.req.headers,
+        headers: this.headers,
       })
       .pipe(map((response) => response.data));
   }
@@ -219,7 +219,7 @@ export default class ExaremeService implements IEngineService {
 
     return this.httpService
       .get<string>(path, {
-        headers: this.req.headers,
+        headers: this.headers,
       })
       .pipe(map((response) => response.data));
   }
@@ -229,7 +229,7 @@ export default class ExaremeService implements IEngineService {
 
     return this.httpService
       .delete(path, {
-        headers: this.req.headers,
+        headers: this.headers,
       })
       .pipe(map((response) => response.data));
   }
@@ -239,7 +239,7 @@ export default class ExaremeService implements IEngineService {
 
     return this.httpService
       .patch(path, this.req.body, {
-        headers: this.req.headers,
+        headers: this.headers,
       })
       .pipe(map((response) => response.data));
   }
@@ -249,7 +249,7 @@ export default class ExaremeService implements IEngineService {
 
     return this.httpService
       .post(path, this.req.body, {
-        headers: this.req.headers,
+        headers: this.headers,
       })
       .pipe(map((response) => response.data));
   }
@@ -259,7 +259,7 @@ export default class ExaremeService implements IEngineService {
 
     return this.httpService
       .post(path, this.req.body, {
-        headers: this.req.headers,
+        headers: this.headers,
       })
       .pipe(map((response) => response.data));
   }

api/src/engine/engine.module.ts

+import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
 import { HttpModule, HttpService } from '@nestjs/axios';
 import { DynamicModule, Global, Logger, Module } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
@@ -33,7 +34,8 @@ export class EngineModule {
       module: EngineModule,
       imports: [
         HttpModule,
-        GraphQLModule.forRoot({
+        GraphQLModule.forRoot<ApolloDriverConfig>({
+          driver: ApolloDriver,
           autoSchemaFile: join(process.cwd(), 'src/schema.gql'),
           context: ({ req, res }) => ({ req, res }),
           cors: {

api/src/schema.gql

@@ -209,14 +209,14 @@ type ListExperiments {
 type Query {
   configuration: Configuration!
   domains(ids: [String!] = []): [Domain!]!
-  experimentList(name: String = "", page: Float = 0): ListExperiments!
+  experimentList(page: Float = 0, name: String = ""): ListExperiments!
   experiment(id: String!): Experiment!
   algorithms: [Algorithm!]!
 }
 
 type Mutation {
-  createExperiment(isTransient: Boolean = false, data: ExperimentCreateInput!): Experiment!
-  editExperiment(data: ExperimentEditInput!, id: String!): Experiment!
+  createExperiment(data: ExperimentCreateInput!, isTransient: Boolean = false): Experiment!
+  editExperiment(id: String!, data: ExperimentEditInput!): Experiment!
   removeExperiment(id: String!): PartialExperiment!
 }