fix: PG ssl (#306)

* fix: use full db config in app rather than only for migrations * fix: reenable require ssl on prod and redisable on dev * fix: fix CI * fix ci * fix ci * fix ci
SocialGouv · Nov 24, 2023 · ba372c0 · ba372c0
1 parent eaa7c47
commit ba372c0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/src/db/config/config.js b/src/db/config/config.js
@@ -3,21 +3,23 @@ dotenv.config();
 
 module.exports = {
   development: {
+    username: process.env.PGUSER || "monpsysante",
+    password: process.env.PGPASSWORD || "monpsysante",
+    database: process.env.PGDATABASE || "monpsysante",
+    port: process.env.PGPORT,
+    host: process.env.PGHOST,
     dialect: "postgres",
-    url: process.env.DATABASE_URL,
-    dialectOptions: {
-      ssl: {
-        require: false,
-        rejectUnauthorized: false,
-      },
-    },
   },
   production: {
+    username: process.env.PGUSER,
+    password: process.env.PGPASSWORD,
+    database: process.env.PGDATABASE,
+    port: process.env.PGPORT,
+    host: process.env.PGHOST,
     dialect: "postgres",
-    url: process.env.DATABASE_URL,
     dialectOptions: {
       ssl: {
-        require: false,
+        require: true,
         rejectUnauthorized: false,
       },
     },

diff --git a/src/db/models/index.ts b/src/db/models/index.ts
@@ -1,15 +1,24 @@
 import { Sequelize } from "sequelize";
 
 import config from "../../services/config";
+import dbConfig from "../config/config";
 import psychologist from "./psychologist";
 
-export const sequelize = new Sequelize(config.postgre.url, {
-  define: {
-    freezeTableName: true,
-  },
-  dialect: "postgres",
-  logging: config.postgre.logging ? console.log : false,
-});
+const env = process.env.NODE_ENV || "development";
+const currentDbConfig = dbConfig[env] || dbConfig["development"];
+
+export const sequelize = new Sequelize(
+  currentDbConfig.database,
+  currentDbConfig.username,
+  currentDbConfig.password,
+  {
+    ...currentDbConfig,
+    define: {
+      freezeTableName: true,
+    },
+    logging: config.postgre.logging ? console.log : false,
+  }
+);
 
 export const models = {
   Psychologist: psychologist(sequelize),

diff --git a/src/services/config.ts b/src/services/config.ts
@@ -43,7 +43,6 @@ export default {
   minScoreAddress: parseFloat(process.env.MIN_SCORE_ADDRESS || "0.30"),
   postgre: {
     logging: parseBoolean(process.env.DB_LOGGING_ENABLE),
-    url: process.env.DATABASE_URL || "postgres://localhost:5432/monpsysante",
   },
   supportMail: process.env.SUPPORT_MAIL,
   reportingMailRecipients: process.env.REPORTING_MAIL_RECIPIENTS,