Merge pull request #1634 from pele-ai/feature/mysql-ssl

mysql-ssl

packages/server/src/DataSource.ts

@@ -40,7 +40,8 @@ export const init = async (): Promise<void> => {
                 synchronize: false,
                 migrationsRun: false,
                 entities: Object.values(entities),
-                migrations: mysqlMigrations
+                migrations: mysqlMigrations,
+                ssl: getDatabaseSSLFromEnv()
             })
             break
         case 'postgres':
@@ -51,18 +52,7 @@ export const init = async (): Promise<void> => {
                 username: process.env.DATABASE_USER,
                 password: process.env.DATABASE_PASSWORD,
                 database: process.env.DATABASE_NAME,
-                ...(process.env.DATABASE_SSL_KEY_BASE64
+                ssl: getDatabaseSSLFromEnv(),
-                    ? {
-                          ssl: {
-                              rejectUnauthorized: false,
-                              cert: Buffer.from(process.env.DATABASE_SSL_KEY_BASE64, 'base64')
-                          }
-                      }
-                    : process.env.DATABASE_SSL === 'true'
-                    ? {
-                          ssl: true
-                      }
-                    : {}),
                 synchronize: false,
                 migrationsRun: false,
                 entities: Object.values(entities),
@@ -89,3 +79,15 @@ export function getDataSource(): DataSource {
     }
     return appDataSource
 }
+
+const getDatabaseSSLFromEnv = () => {
+    if (process.env.DATABASE_SSL_KEY_BASE64) {
+        return {
+            rejectUnauthorized: false,
+            ca: Buffer.from(process.env.DATABASE_SSL_KEY_BASE64, 'base64')
+        }
+    } else if (process.env.DATABASE_SSL === 'true') {
+        return true
+    }
+    return undefined
+}