Mise à jour des dépendances et des configurations Docker

Author: RICHARD-Quentin

.gitignore

@@ -39,3 +39,4 @@ docker/docker-compose.yml
 
 documentation/*
 .dev-token.json
+*.mongodb.js

Dockerfile

@@ -1,10 +1,10 @@
 FROM node:18-bookworm-slim as builder
 
 ENV TIMEZONE=Europe/Paris \
-    LANGUAGE=fr_FR.UTF-8 \
-    LANG=fr_FR.UTF-8 \
-    TERM=xterm \
-    DEBIAN_FRONTEND=noninteractive
+  LANGUAGE=fr_FR.UTF-8 \
+  LANG=fr_FR.UTF-8 \
+  TERM=xterm \
+  DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /data
 
@@ -16,15 +16,18 @@ RUN yarn install \
   --non-interactive \
   --production=false
 
+RUN apt-get update -y \
+  && apt-get install -y python3
+
 RUN yarn run build
 
 FROM node:18-bookworm-slim AS production
 
 ENV TIMEZONE=Europe/Paris \
-    LANGUAGE=fr_FR.UTF-8 \
-    LANG=fr_FR.UTF-8 \
-    TERM=xterm \
-    DEBIAN_FRONTEND=noninteractive
+  LANGUAGE=fr_FR.UTF-8 \
+  LANG=fr_FR.UTF-8 \
+  TERM=xterm \
+  DEBIAN_FRONTEND=noninteractive
 
 ARG NODE_ENV=production
 ENV NODE_ENV=${NODE_ENV}
@@ -35,25 +38,25 @@ ADD package.json .
 ADD *.lock .
 
 RUN apt clean -y \
-    && apt update -y \
-    && apt upgrade -y \
-    && apt install -y locales \
-    && export LANGUAGE=${LANGUAGE} \
-    && export LANG=${LANG} \
-    && export LC_ALL=${LC_ALL} \
-    && locale-gen ${LANG} \
-    && dpkg-reconfigure --frontend ${DEBIAN_FRONTEND} locales \
-    && apt install --no-install-recommends -yq \
-      git \
-      jq \
-      nano \
-      openssl
+  && apt update -y \
+  && apt upgrade -y \
+  && apt install -y locales \
+  && export LANGUAGE=${LANGUAGE} \
+  && export LANG=${LANG} \
+  && export LC_ALL=${LC_ALL} \
+  && locale-gen ${LANG} \
+  && dpkg-reconfigure --frontend ${DEBIAN_FRONTEND} locales \
+  && apt install --no-install-recommends -yq \
+  git \
+  jq \
+  nano \
+  openssl
 
 RUN yarn install \
-    --prefer-offline \
-    --pure-lockfile \
-    --non-interactive \
-    --production=true \
+  --prefer-offline \
+  --pure-lockfile \
+  --non-interactive \
+  --production=true \
   && yarn cache clean \
   && yarn autoclean --init \
   && yarn autoclean --force

Makefile

@@ -18,6 +18,7 @@ dev: ## Start development environment
 		-e NODE_ENV=development \
 		-e NODE_TLS_REJECT_UNAUTHORIZED=0 \
 		--add-host host.docker.internal:host-gateway \
+		--platform $(PLATFORM) \
 		--network dev \
 		--name $(APP_NAME) \
 		-p $(APP_PORT):4000 \

package.json

@@ -59,7 +59,7 @@
     "@streamkits/nestjs_module_scrud": "^0.0.16",
     "ajv": "^8.12.0",
     "ajv-errors": "^3.0.0",
-    "argon2": "^0.31.2",
+    "argon2": "^0.40.1",
     "bullmq": "^4.14.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
@@ -91,8 +91,8 @@
     "@nestjs/schematics": "^10.0.2",
     "@nestjs/swagger": "^7.1.16",
     "@nestjs/testing": "^10.1.3",
-    "@swc/cli": "^0.1.63",
-    "@swc/core": "^1.3.99",
+    "@swc/cli": "^0.3.10",
+    "@swc/core": "^1.4.6",
     "@types/cookie-parser": "^1.4.6",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.2",

src/management/identities/identities.service.ts

@@ -1,4 +1,3 @@
-import { additionalFieldsPartDto } from '~/management/identities/_dto/_parts/additionalFields.dto';
 import { HttpException, Injectable, Logger } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Identities } from './_schemas/identities.schema';
@@ -8,7 +7,6 @@ import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema';
 import { IdentitiesValidationService } from './validations/identities.validation.service';
 import { ValidationConfigException, ValidationSchemaException } from '~/_common/errors/ValidationException';
 import { IdentityState } from './_enums/states.enum';
-import { merge } from 'radash';
 
 @Injectable()
 export class IdentitiesService extends AbstractServiceSchema {
@@ -45,6 +43,7 @@ export class IdentitiesService extends AbstractServiceSchema {
       data = this.handleValidationError(error, data, logPrefix);
     }
 
+    //TODO: ameliorer la logique d'upsert
     const identity = await this._model.findOne({ 'inetOrgPerson.uid': data.inetOrgPerson.uid });
     if (identity) {
       Logger.log(`${logPrefix} Identity already exists. Updating.`);