Merge branch 'master' into douglasduteil/chore-tsc-add-noPropertyAcce…

…ssFromIndexSignature-option

src/config/env.ts

@@ -59,7 +59,6 @@ export const {
   MAGIC_LINK_TOKEN_EXPIRATION_DURATION_IN_MINUTES,
   MAX_DURATION_BETWEEN_TWO_EMAIL_ADDRESS_VERIFICATION_IN_MINUTES,
   MAX_SUGGESTED_ORGANIZATIONS,
-  MODERATION_TAG,
   MONCOMPTEPRO_HOST,
   MONCOMPTEPRO_LABEL,
   NODE_ENV,
@@ -75,8 +74,6 @@ export const {
   TEST_CONTACT_EMAIL,
   TRUSTED_BROWSER_COOKIE_MAX_AGE_IN_SECONDS,
   VERIFY_EMAIL_TOKEN_EXPIRATION_DURATION_IN_MINUTES,
-  ZAMMAD_TOKEN,
-  ZAMMAD_URL,
 } = parsedEnv.data;
 
 export const MONCOMPTEPRO_IDENTIFIER = new URL(MONCOMPTEPRO_HOST).hostname;

src/config/env.zod.ts

@@ -4,8 +4,6 @@ import { defaultJWKS } from "./default-jwks";
 export const emailEnvSchema = z.object({
   BREVO_API_KEY: z.string().optional(),
   DO_NOT_SEND_MAIL: zodTrueFalseBoolean().default("True"),
-  ZAMMAD_TOKEN: z.string().optional(),
-  ZAMMAD_URL: z.string().url().default("https://support.etalab.gouv.fr"),
 });
 
 export const connectorEnvSchema = z.object({
@@ -83,7 +81,6 @@ export const paramsEnvSchema = z.object({
     .nonnegative()
     .default(3 * 30 * 24 * 60), // 3 months in minutes
   MAX_SUGGESTED_ORGANIZATIONS: z.coerce.number().int().nonnegative().default(3),
-  MODERATION_TAG: z.string().default("github-action-e2e-test"),
   MONCOMPTEPRO_HOST: z.string().url().default("http://localhost:3000"),
   MONCOMPTEPRO_LABEL: z.string().default("MonComptePro"),
   NODE_ENV: z

src/config/oidc-provider-configuration.ts

@@ -1,5 +1,5 @@
-import { Request } from "express";
-import { Configuration } from "oidc-provider";
+import type { Request } from "express";
+import type { Configuration } from "oidc-provider";
 import { destroyAuthenticatedSession } from "../managers/session/authenticated";
 import epochTime from "../services/epoch-time";
 import { findAccount } from "../services/oidc-account-adapter";

src/connectors/api-annuaire-education-nationale.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosError, AxiosResponse } from "axios";
+import axios, { AxiosError, type AxiosResponse } from "axios";
 import { isEmpty, isString } from "lodash-es";
 import {
   DO_NOT_USE_ANNUAIRE_EMAILS,

src/connectors/api-annuaire-service-public.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosError, AxiosResponse } from "axios";
+import axios, { AxiosError, type AxiosResponse } from "axios";
 import { isEmpty, isString } from "lodash-es";
 import {
   DO_NOT_USE_ANNUAIRE_EMAILS,

src/connectors/api-sirene/index.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosError, AxiosResponse } from "axios";
+import axios, { AxiosError, type AxiosResponse } from "axios";
 import { cloneDeep, set } from "lodash-es";
 import {
   HTTP_CLIENT_TIMEOUT,

src/connectors/brevo.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosError, AxiosResponse } from "axios";
+import axios, { AxiosError, type AxiosResponse } from "axios";
 import { chain, isEmpty } from "lodash-es";
 import path from "path";
 import { BREVO_API_KEY, DO_NOT_SEND_MAIL } from "../config/env";

src/connectors/crisp.ts

@@ -1,7 +1,7 @@
 //
 
 import { fetch_crisp, type Config } from "@numerique-gouv/crisp";
-import {
+import type {
   CreateConversationRoute,
   SendMessageInAConversationRoute,
   UpdateConversationMetaRoute,

src/connectors/debounce.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosResponse } from "axios";
+import axios, { type AxiosResponse } from "axios";
 import {
   DEBOUNCE_API_KEY,
   DO_NOT_CHECK_EMAIL_DELIVERABILITY,

src/connectors/github-passkey-authenticator-aaguids.ts

@@ -1,5 +1,5 @@
 import * as Sentry from "@sentry/node";
-import axios, { AxiosResponse } from "axios";
+import axios, { type AxiosResponse } from "axios";
 import { mapValues, memoize } from "lodash-es";
 import { HTTP_CLIENT_TIMEOUT } from "../config/env";
 import { logger } from "../services/log";

src/connectors/redis.ts

@@ -1,7 +1,7 @@
 import {
   default as Redis,
   default as RedisClient,
-  RedisOptions,
+  type RedisOptions,
 } from "ioredis";
 import { REDIS_URL } from "../config/env";
 import { logger } from "../services/log";

src/controllers/api.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import HttpErrors from "http-errors";
 import { z, ZodError } from "zod";
 import {

src/controllers/interaction.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import Provider, { errors } from "oidc-provider";
 import { ENABLE_FIXED_ACR } from "../config/env";
 import {

src/controllers/main.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import HttpErrors from "http-errors";
 import { isEmpty } from "lodash-es";
 import moment from "moment/moment";

src/controllers/organization.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import HttpErrors from "http-errors";
 import { isEmpty } from "lodash-es";
 import { z, ZodError } from "zod";

src/controllers/totp.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import { z } from "zod";
 import { InvalidTotpTokenError, NotFoundError } from "../config/errors";
 import {

src/controllers/user/2fa-sign-in.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import {
   getUserFromAuthenticatedSession,
   isPasskeyAuthenticatedSession,

src/controllers/user/delete.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import {
   destroyAuthenticatedSession,
   getUserFromAuthenticatedSession,

src/controllers/user/issue-session-or-redirect.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import { getTrustedReferrerPath } from "../../services/security";
 
 export const issueSessionOrRedirectController = async (

src/controllers/user/magic-link.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import { z, ZodError } from "zod";
 import { MONCOMPTEPRO_HOST } from "../../config/env";
 import { InvalidEmailError, InvalidMagicLinkError } from "../../config/errors";

src/controllers/user/official-contact-email-verification.ts

@@ -1,5 +1,5 @@
 import { to } from "await-to-js";
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import { z } from "zod";
 import {
   ApiAnnuaireError,

src/controllers/user/select-organization.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import { z } from "zod";
 import {
   getOrganizationsByUserId,

src/controllers/user/signin-signup.ts

@@ -1,5 +1,5 @@
 import * as Sentry from "@sentry/node";
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import { z, ZodError } from "zod";
 import { DISPLAY_TEST_ENV_WARNING } from "../../config/env";
 import {

src/controllers/user/update-password.ts

@@ -1,5 +1,5 @@
 import * as Sentry from "@sentry/node";
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import { z, ZodError } from "zod";
 import { MONCOMPTEPRO_HOST } from "../../config/env";
 import {

src/controllers/user/update-personal-informations.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import { z, ZodError } from "zod";
 import {
   getUserFromAuthenticatedSession,

src/controllers/user/verify-email.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import { z, ZodError } from "zod";
 import {
   InvalidTokenError,

src/controllers/user/welcome.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import {
   getUserFromAuthenticatedSession,
   updateUserInAuthenticatedSession,

src/controllers/webauthn.ts

@@ -2,7 +2,7 @@ import type {
   AuthenticationResponseJSON,
   RegistrationResponseJSON,
 } from "@simplewebauthn/types";
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import HttpErrors from "http-errors";
 import { z, ZodError } from "zod";
 import {

src/index.ts

@@ -1,14 +1,15 @@
 import * as Sentry from "@sentry/node";
 import RedisStore from "connect-redis";
-import express, { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
+import express from "express";
 import session from "express-session";
 import fs from "fs";
 import helmet from "helmet";
 import { Server } from "http";
 import HttpErrors from "http-errors";
 import { isNull, omitBy } from "lodash-es";
 import morgan from "morgan";
-import Provider, { ClientMetadata, errors } from "oidc-provider";
+import Provider, { type ClientMetadata, errors } from "oidc-provider";
 import path from "path";
 import { ZodError } from "zod";
 import {

src/managers/browser-authentication.ts

@@ -1,5 +1,5 @@
 import cookieParser from "cookie-parser";
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import {
   DO_NOT_AUTHENTICATE_BROWSER,
   SECURE_COOKIES,

src/managers/oidc-client.ts

@@ -1,6 +1,6 @@
 import * as Sentry from "@sentry/node";
 import { isEmpty, isString } from "lodash-es";
-import { KoaContextWithOIDC } from "oidc-provider";
+import type { KoaContextWithOIDC } from "oidc-provider";
 import { NotFoundError } from "../config/errors";
 import {
   addConnection,

src/managers/session/authenticated.ts

@@ -1,6 +1,6 @@
 import * as Sentry from "@sentry/node";
-import { Request, Response } from "express";
-import { Session, SessionData } from "express-session";
+import type { Request, Response } from "express";
+import { Session, type SessionData } from "express-session";
 import { isEmpty } from "lodash-es";
 import { RECENT_LOGIN_INTERVAL_IN_SECONDS } from "../../config/env";
 import { UserNotLoggedInError } from "../../config/errors";
@@ -12,7 +12,7 @@ import {
   isOneFactorAuthenticated,
   isTwoFactorAuthenticated,
 } from "../../services/security";
-import {
+import type {
   AmrValue,
   AuthenticatedSessionData,
 } from "../../types/express-session";

src/managers/session/dirty-ds-redirect.ts

@@ -1,4 +1,4 @@
-import { Request } from "express";
+import type { Request } from "express";
 import { UserNotLoggedInError } from "../../config/errors";
 import { isWithinAuthenticatedSession } from "./authenticated";
 

src/managers/session/temporary-totp-key.ts

@@ -1,4 +1,4 @@
-import { Request } from "express";
+import type { Request } from "express";
 import { SYMMETRIC_ENCRYPTION_KEY } from "../../config/env";
 import { UserNotLoggedInError } from "../../config/errors";
 import {

src/managers/session/unauthenticated.ts

@@ -1,4 +1,4 @@
-import { Request } from "express";
+import type { Request } from "express";
 import { isEmpty } from "lodash-es";
 import { NoEmailFoundInLoggedOutSessionError } from "../../config/errors";
 import { findByEmail, update } from "../../repositories/user";

src/managers/webauthn.ts

@@ -1,8 +1,8 @@
 import {
   generateAuthenticationOptions,
   generateRegistrationOptions,
-  VerifiedAuthenticationResponse,
-  VerifiedRegistrationResponse,
+  type VerifiedAuthenticationResponse,
+  type VerifiedRegistrationResponse,
   verifyAuthenticationResponse,
   verifyRegistrationResponse,
 } from "@simplewebauthn/server";

src/middlewares/connection-count.ts

@@ -1,6 +1,6 @@
 import * as Sentry from "@sentry/node";
-import { NextFunction } from "express";
-import { KoaContextWithOIDC } from "oidc-provider";
+import type { NextFunction } from "express";
+import type { KoaContextWithOIDC } from "oidc-provider";
 import { recordNewConnection } from "../managers/oidc-client";
 import { logger } from "../services/log";
 

src/middlewares/csrf-protection.ts

@@ -1,5 +1,5 @@
 import { csrfSync } from "csrf-sync";
-import { Request } from "express";
+import type { Request } from "express";
 
 const { generateToken, csrfSynchronisedProtection } = csrfSync({
   getTokenFromRequest: (req: Request) => {

src/middlewares/rate-limiter.ts

@@ -1,5 +1,5 @@
 import * as Sentry from "@sentry/node";
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import HttpErrors from "http-errors";
 import { RateLimiterRedis } from "rate-limiter-flexible";
 import { DO_NOT_RATE_LIMIT } from "../config/env";

src/middlewares/user.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express";
+import type { NextFunction, Request, Response } from "express";
 import HttpErrors from "http-errors";
 import { isEmpty } from "lodash-es";
 import { UserNotFoundError } from "../config/errors";