Skip to content

Commit

Permalink
chore: use import type
Browse files Browse the repository at this point in the history
  • Loading branch information
douglasduteil committed Sep 17, 2024
1 parent fd62f0f commit 37ef34e
Show file tree
Hide file tree
Showing 45 changed files with 48 additions and 47 deletions.
4 changes: 2 additions & 2 deletions src/config/oidc-provider-configuration.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/api-annuaire-education-nationale.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/api-annuaire-service-public.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/api-sirene/index.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/brevo.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/crisp.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//

import { fetch_crisp, type Config } from "@numerique-gouv/crisp";
import {
import type {
CreateConversationRoute,
SendMessageInAConversationRoute,
UpdateConversationMetaRoute,
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/debounce.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import axios, { AxiosResponse } from "axios";
import axios, { type AxiosResponse } from "axios";
import {
DEBOUNCE_API_KEY,
DO_NOT_CHECK_EMAIL_DELIVERABILITY,
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/github-passkey-authenticator-aaguids.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/redis.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/api.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/interaction.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/main.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/organization.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/totp.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/2fa-sign-in.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NextFunction, Request, Response } from "express";
import type { NextFunction, Request, Response } from "express";
import {
getUserFromAuthenticatedSession,
isPasskeyAuthenticatedSession,
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/delete.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NextFunction, Request, Response } from "express";
import type { NextFunction, Request, Response } from "express";
import {
destroyAuthenticatedSession,
getUserFromAuthenticatedSession,
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/issue-session-or-redirect.ts
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/magic-link.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/select-organization.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NextFunction, Request, Response } from "express";
import type { NextFunction, Request, Response } from "express";
import { z } from "zod";
import {
getOrganizationsByUserId,
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/signin-signup.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/update-password.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/update-personal-informations.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NextFunction, Request, Response } from "express";
import type { NextFunction, Request, Response } from "express";
import { z, ZodError } from "zod";
import {
getUserFromAuthenticatedSession,
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/verify-email.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NextFunction, Request, Response } from "express";
import type { NextFunction, Request, Response } from "express";
import { z, ZodError } from "zod";
import {
InvalidTokenError,
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/welcome.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NextFunction, Request, Response } from "express";
import type { NextFunction, Request, Response } from "express";
import {
getUserFromAuthenticatedSession,
updateUserInAuthenticatedSession,
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/webauthn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/managers/browser-authentication.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/rate-limiter.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/user.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
4 changes: 2 additions & 2 deletions src/repositories/authenticator.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { QueryResult } from "pg";
import type { QueryResult } from "pg";
import { getDatabaseConnection } from "../connectors/postgres";
import { decodeBase64URL, encodeBase64URL } from "../services/base64";
import {
import type {
Authenticator,
BaseAuthenticator,
SerializedAuthenticator,
Expand Down
2 changes: 1 addition & 1 deletion src/repositories/email-domain.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryResult } from "pg";
import type { QueryResult } from "pg";
import { getDatabaseConnection } from "../connectors/postgres";
import { hashToPostgresParams } from "../services/hash-to-postgres-params";

Expand Down
2 changes: 1 addition & 1 deletion src/repositories/moderation.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryResult } from "pg";
import type { QueryResult } from "pg";
import { getDatabaseConnection } from "../connectors/postgres";

export const createModeration = async ({
Expand Down
2 changes: 1 addition & 1 deletion src/repositories/oidc-client.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryResult } from "pg";
import type { QueryResult } from "pg";
import { getDatabaseConnection } from "../connectors/postgres";

export const getClients = async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/repositories/organization/getters.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryResult } from "pg";
import type { QueryResult } from "pg";
import { getDatabaseConnection } from "../../connectors/postgres";

export const findById = async (id: number) => {
Expand Down
2 changes: 1 addition & 1 deletion src/repositories/organization/setters.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryResult } from "pg";
import type { QueryResult } from "pg";
import { getDatabaseConnection } from "../../connectors/postgres";
import { hashToPostgresParams } from "../../services/hash-to-postgres-params";

Expand Down
2 changes: 1 addition & 1 deletion src/repositories/user.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryResult } from "pg";
import type { QueryResult } from "pg";
import { getDatabaseConnection } from "../connectors/postgres";
import { hashToPostgresParams } from "../services/hash-to-postgres-params";

Expand Down
3 changes: 2 additions & 1 deletion src/routers/api.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NextFunction, Request, Response, Router, urlencoded } from "express";
import type { NextFunction, Request, Response } from "express";
import { Router, urlencoded } from "express";
import expressBasicAuth from "express-basic-auth";
import { HttpError } from "http-errors";
import nocache from "nocache";
Expand Down
2 changes: 1 addition & 1 deletion src/routers/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Express, Router, urlencoded } from "express";
import { type Express, Router, urlencoded } from "express";
import nocache from "nocache";
import {
getConnectionAndAccountController,
Expand Down
2 changes: 1 addition & 1 deletion src/services/get-notifications-from-request.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Request } from "express";
import type { Request } from "express";
import { z, ZodError } from "zod";
import notificationMessages from "../config/notification-messages";
import { notificationLabelSchema } from "./custom-zod-schemas";
Expand Down
2 changes: 1 addition & 1 deletion src/services/log.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import log, { LogLevelNames } from "console-log-level";
import log, { type LogLevelNames } from "console-log-level";
import moment from "moment";
import { LOG_LEVEL } from "../config/env";

Expand Down
2 changes: 1 addition & 1 deletion src/services/oidc-account-adapter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as Sentry from "@sentry/node";
import { isEmpty } from "lodash-es";
import { FindAccount } from "oidc-provider";
import type { FindAccount } from "oidc-provider";
import { findByUserId as getUsersOrganizations } from "../repositories/organization/getters";
import { getSelectedOrganizationId } from "../repositories/redis/selected-organization";
import { findById as findUserById } from "../repositories/user";
Expand Down
2 changes: 1 addition & 1 deletion src/services/renderer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ejs from "ejs";
import { Application, NextFunction, Request, Response } from "express";
import type { Application, NextFunction, Request, Response } from "express";
import fs from "fs";
import path from "path";
import { NODE_ENV } from "../config/env";
Expand Down
2 changes: 1 addition & 1 deletion src/services/security.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { customAlphabet, nanoid } from "nanoid/async";
import { parse_host } from "tld-extract";
import { MONCOMPTEPRO_HOST } from "../config/env";
import notificationMessages from "../config/notification-messages";
import { AmrValue } from "../types/express-session";
import type { AmrValue } from "../types/express-session";
import { owaspPasswordStrengthTest } from "./owasp-password-strength-tester";
import dicewareWordlistFrAlt from "./security/diceware-wordlist-fr-alt";

Expand Down
2 changes: 1 addition & 1 deletion src/services/should-trigger-2fa.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { get, isArray } from "lodash-es";
import { UnknownObject } from "oidc-provider";
import type { UnknownObject } from "oidc-provider";

interface EssentialAcrPromptDetail {
name: "login" | "consent" | string;
Expand Down
2 changes: 1 addition & 1 deletion src/services/uses-auth-headers.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Request } from "express";
import type { Request } from "express";
import { isEmpty } from "lodash-es";

export const usesAuthHeaders = (req: Request) => {
Expand Down

0 comments on commit 37ef34e

Please sign in to comment.