chore: Add SSL config to ormconfigs + further unified approach to orm…

…configs
energywebfoundation · Oct 11, 2021 · 95739f4 · 95739f4
1 parent 4e3c420
commit 95739f4
Show file tree

Hide file tree

Showing 31 changed files with 3,405 additions and 1,355 deletions.
diff --git a/.env.example b/.env.example
@@ -7,6 +7,7 @@ DB_PASSWORD=postgres
 DB_HOST=localhost
 DB_PORT=5432
 DB_DATABASE=origin
+DB_SSL_OFF=false
 
 # --- SMART METER READINGS --- #
 INFLUXDB_URL=http://localhost:8086

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/apps/origin-backend-app/package.json b/packages/apps/origin-backend-app/package.json
@@ -40,7 +40,7 @@
         "@energyweb/issuer-api": "0.3.0",
         "@energyweb/origin-backend": "11.0.0",
         "@energyweb/origin-backend-core": "8.0.2",
-        "@energyweb/origin-backend-utils": "1.6.0",
+        "@energyweb/origin-backend-utils": "1.6.1",
         "@energyweb/origin-device-registry-api": "0.2.0",
         "@energyweb/origin-device-registry-irec-form-api": "2.0.1",
         "@energyweb/origin-organization-irec-api": "1.5.0",

diff --git a/packages/apps/origin-backend-app/src/origin-app.module.ts b/packages/apps/origin-backend-app/src/origin-app.module.ts
@@ -28,6 +28,7 @@ import { DynamicModule, Module } from '@nestjs/common';
 import { APP_INTERCEPTOR } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
+import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 import {
     CertificateRequestApprovedHandler,
@@ -54,26 +55,11 @@ const OriginAppTypeOrmModule = () => {
         ...IRECFormDeviceEntities
     ];
 
-    return process.env.DATABASE_URL
-        ? TypeOrmModule.forRoot({
-              type: 'postgres',
-              url: process.env.DATABASE_URL,
-              ssl: {
-                  rejectUnauthorized: false
-              },
-              entities,
-              logging: ['info']
-          })
-        : TypeOrmModule.forRoot({
-              type: 'postgres',
-              host: process.env.DB_HOST ?? 'localhost',
-              port: Number(process.env.DB_PORT) ?? 5432,
-              username: process.env.DB_USERNAME ?? 'postgres',
-              password: process.env.DB_PASSWORD ?? 'postgres',
-              database: process.env.DB_DATABASE ?? 'origin',
-              entities,
-              logging: ['info']
-          });
+    return TypeOrmModule.forRoot({
+        ...getDBConnectionOptions(),
+        entities,
+        logging: ['info']
+    });
 };
 
 @Module({})

diff --git a/packages/apps/origin-backend-irec-app/src/origin-app.module.ts b/packages/apps/origin-backend-irec-app/src/origin-app.module.ts
@@ -32,6 +32,7 @@ import { APP_INTERCEPTOR } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { ScheduleModule } from '@nestjs/schedule';
 import { TypeOrmModule } from '@nestjs/typeorm';
+import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 import {
     CertificateRequestApprovedHandler,
@@ -61,26 +62,11 @@ const OriginAppTypeOrmModule = () => {
         ...ExchangeIRECEntities
     ];
 
-    return process.env.DATABASE_URL
-        ? TypeOrmModule.forRoot({
-              type: 'postgres',
-              url: process.env.DATABASE_URL,
-              ssl: {
-                  rejectUnauthorized: false
-              },
-              entities,
-              logging: ['info']
-          })
-        : TypeOrmModule.forRoot({
-              type: 'postgres',
-              host: process.env.DB_HOST ?? 'localhost',
-              port: Number(process.env.DB_PORT ?? 5432),
-              username: process.env.DB_USERNAME ?? 'postgres',
-              password: process.env.DB_PASSWORD ?? 'postgres',
-              database: process.env.DB_DATABASE ?? 'origin',
-              entities,
-              logging: ['info']
-          });
+    return TypeOrmModule.forRoot({
+        ...getDBConnectionOptions(),
+        entities,
+        logging: ['info']
+    });
 };
 
 @Module({

diff --git a/packages/devices/origin-device-registry-api/ormconfig-dev.ts b/packages/devices/origin-device-registry-api/ormconfig-dev.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     entities: ['src/**/*.entity.ts'],
     synchronize: false,
     migrationsRun: true,

diff --git a/packages/devices/origin-device-registry-api/ormconfig.ts b/packages/devices/origin-device-registry-api/ormconfig.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     synchronize: false,
     migrationsRun: true,
     migrations: [`${__dirname}/migrations/*.js`],

diff --git a/packages/devices/origin-device-registry-irec-form-api/ormconfig-dev.ts b/packages/devices/origin-device-registry-irec-form-api/ormconfig-dev.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     entities: ['src/**/*.entity.ts'],
     synchronize: false,
     migrationsRun: true,

diff --git a/packages/devices/origin-device-registry-irec-form-api/ormconfig.ts b/packages/devices/origin-device-registry-irec-form-api/ormconfig.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     synchronize: false,
     migrationsRun: true,
     migrations: [`${__dirname}/migrations/*.js`],

diff --git a/packages/devices/origin-device-registry-irec-form-api/package.json b/packages/devices/origin-device-registry-irec-form-api/package.json
@@ -32,7 +32,7 @@
     "dependencies": {
         "@energyweb/origin-backend": "11.0.0",
         "@energyweb/origin-backend-core": "8.0.2",
-        "@energyweb/origin-backend-utils": "1.6.0",
+        "@energyweb/origin-backend-utils": "1.6.1",
         "@nestjs/common": "7.6.18",
         "@nestjs/config": "1.0.2",
         "@nestjs/core": "7.6.18",

diff --git a/packages/devices/origin-device-registry-irec-local-api/ormconfig-dev.ts b/packages/devices/origin-device-registry-irec-local-api/ormconfig-dev.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     entities: ['src/**/*.entity.ts'],
     synchronize: false,
     migrationsRun: true,

diff --git a/packages/devices/origin-device-registry-irec-local-api/ormconfig.ts b/packages/devices/origin-device-registry-irec-local-api/ormconfig.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     synchronize: false,
     migrationsRun: true,
     migrations: [`${__dirname}/migrations/*.js`],

diff --git a/packages/organizations/origin-organization-irec-api/ormconfig-dev.ts b/packages/organizations/origin-organization-irec-api/ormconfig-dev.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     entities: ['src/**/*.entity.ts'],
     synchronize: false,
     migrationsRun: true,

diff --git a/packages/organizations/origin-organization-irec-api/ormconfig.ts b/packages/organizations/origin-organization-irec-api/ormconfig.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     synchronize: false,
     migrationsRun: true,
     migrations: [`${__dirname}/migrations/*.js`],

diff --git a/packages/origin-backend/ormconfig-dev.ts b/packages/origin-backend/ormconfig-dev.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     entities: ['src/**/*.entity.ts'],
     synchronize: false,
     migrationsRun: true,

diff --git a/packages/origin-backend/ormconfig.ts b/packages/origin-backend/ormconfig.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     synchronize: false,
     migrationsRun: true,
     migrations: [`${__dirname}/migrations/*.js`],

diff --git a/packages/tools/migrations-irec/package.json b/packages/tools/migrations-irec/package.json
@@ -35,6 +35,7 @@
         "@energyweb/issuer": "4.1.0",
         "@energyweb/origin-backend-core": "8.0.3",
         "@energyweb/origin-backend-irec-app": "1.3.0",
+        "@energyweb/origin-backend-utils": "1.6.1",
         "@energyweb/utils-general": "11.0.4",
         "@types/pg": "8.6.1",
         "commander": "6.2.1",

diff --git a/packages/tools/migrations-irec/src/main.ts b/packages/tools/migrations-irec/src/main.ts
@@ -6,6 +6,8 @@ import { Client, ClientConfig } from 'pg';
 import { getProviderWithFallback } from '@energyweb/utils-general';
 import { ExternalDeviceIdType } from '@energyweb/origin-backend-core';
 import { IContractsLookup } from '@energyweb/issuer';
+import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
+
 import { deployContracts } from './deployContracts';
 import { logger } from './Logger';
 
@@ -22,18 +24,7 @@ program.option(
 program.parse(process.argv);
 
 async function connectToDB() {
-    const postgresConfig: ClientConfig = process.env.DATABASE_URL
-        ? {
-              connectionString: process.env.DATABASE_URL,
-              ssl: { rejectUnauthorized: false }
-          }
-        : {
-              host: process.env.DB_HOST ?? 'localhost',
-              port: Number(process.env.DB_PORT) || 5432,
-              user: process.env.DB_USERNAME ?? 'postgres',
-              password: process.env.DB_PASSWORD ?? 'postgres',
-              database: process.env.DB_DATABASE ?? 'origin'
-          };
+    const postgresConfig = getDBConnectionOptions() as ClientConfig;
     const client = new Client(postgresConfig);
 
     await client.connect();
@@ -45,27 +36,19 @@ async function connectToDB() {
 
 async function importConfiguration(client: Client, configPath: string) {
     const parsedConfig = JSON.parse(fs.readFileSync(configPath, 'utf8').toString());
-    const {
-        currencies,
-        countryName,
-        regions,
-        complianceStandard,
-        deviceTypes,
-        gridOperators
-    } = parsedConfig;
-
-    const {
-        externalDeviceIdTypes
-    }: { externalDeviceIdTypes: ExternalDeviceIdType[] } = parsedConfig;
+    const { currencies, countryName, regions, complianceStandard, deviceTypes, gridOperators } =
+        parsedConfig;
+
+    const { externalDeviceIdTypes }: { externalDeviceIdTypes: ExternalDeviceIdType[] } =
+        parsedConfig;
 
     if (currencies.length < 1) {
         throw new Error('At least one currency has to be specified: e.g. [ "USD" ]');
     }
 
     logger.info(`Saving configuration...`);
     const newConfigurationQuery = {
-        text:
-            'INSERT INTO public.configuration (id, "countryName", currencies, regions, "externalDeviceIdTypes", "complianceStandard", "deviceTypes", "gridOperators") VALUES ($1, $2, $3, $4, $5, $6, $7, $8)',
+        text: 'INSERT INTO public.configuration (id, "countryName", currencies, regions, "externalDeviceIdTypes", "complianceStandard", "deviceTypes", "gridOperators") VALUES ($1, $2, $3, $4, $5, $6, $7, $8)',
         values: [
             '1',
             countryName,
@@ -89,8 +72,7 @@ async function importContracts(
 
     logger.info(`Saving contracts...`);
     const newContractsQuery = {
-        text:
-            'INSERT INTO public.issuer_blockchain_properties ("netId", "registry", "issuer", "rpcNode", "rpcNodeFallback", "platformOperatorPrivateKey") VALUES ($1, $2, $3, $4, $5, $6)',
+        text: 'INSERT INTO public.issuer_blockchain_properties ("netId", "registry", "issuer", "rpcNode", "rpcNodeFallback", "platformOperatorPrivateKey") VALUES ($1, $2, $3, $4, $5, $6)',
         values: [
             provider.network.chainId,
             contractsLookup.registry,

diff --git a/packages/tools/migrations/package.json b/packages/tools/migrations/package.json
@@ -31,6 +31,7 @@
         "@energyweb/issuer": "4.0.0",
         "@energyweb/origin-backend-app": "1.5.4",
         "@energyweb/origin-backend-core": "8.0.2",
+        "@energyweb/origin-backend-utils": "1.6.1",
         "@energyweb/utils-general": "11.0.3",
         "@types/pg": "8.6.1",
         "commander": "6.2.1",

diff --git a/packages/tools/migrations/src/main.ts b/packages/tools/migrations/src/main.ts
@@ -6,6 +6,8 @@ import { Client, ClientConfig } from 'pg';
 import { getProviderWithFallback } from '@energyweb/utils-general';
 import { ExternalDeviceIdType } from '@energyweb/origin-backend-core';
 import { IContractsLookup } from '@energyweb/issuer';
+import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
+
 import { deployContracts } from './deployContracts';
 import { logger } from './Logger';
 
@@ -22,18 +24,7 @@ program.option(
 program.parse(process.argv);
 
 async function connectToDB() {
-    const postgresConfig: ClientConfig = process.env.DATABASE_URL
-        ? {
-              connectionString: process.env.DATABASE_URL,
-              ssl: { rejectUnauthorized: false }
-          }
-        : {
-              host: process.env.DB_HOST ?? 'localhost',
-              port: Number(process.env.DB_PORT) || 5432,
-              user: process.env.DB_USERNAME ?? 'postgres',
-              password: process.env.DB_PASSWORD ?? 'postgres',
-              database: process.env.DB_DATABASE ?? 'origin'
-          };
+    const postgresConfig = getDBConnectionOptions() as ClientConfig;
     const client = new Client(postgresConfig);
 
     await client.connect();
@@ -45,27 +36,19 @@ async function connectToDB() {
 
 async function importConfiguration(client: Client, configPath: string) {
     const parsedConfig = JSON.parse(fs.readFileSync(configPath, 'utf8').toString());
-    const {
-        currencies,
-        countryName,
-        regions,
-        complianceStandard,
-        deviceTypes,
-        gridOperators
-    } = parsedConfig;
-
-    const {
-        externalDeviceIdTypes
-    }: { externalDeviceIdTypes: ExternalDeviceIdType[] } = parsedConfig;
+    const { currencies, countryName, regions, complianceStandard, deviceTypes, gridOperators } =
+        parsedConfig;
+
+    const { externalDeviceIdTypes }: { externalDeviceIdTypes: ExternalDeviceIdType[] } =
+        parsedConfig;
 
     if (currencies.length < 1) {
         throw new Error('At least one currency has to be specified: e.g. [ "USD" ]');
     }
 
     logger.info(`Saving configuration...`);
     const newConfigurationQuery = {
-        text:
-            'INSERT INTO public.configuration (id, "countryName", currencies, regions, "externalDeviceIdTypes", "complianceStandard", "deviceTypes", "gridOperators") VALUES ($1, $2, $3, $4, $5, $6, $7, $8)',
+        text: 'INSERT INTO public.configuration (id, "countryName", currencies, regions, "externalDeviceIdTypes", "complianceStandard", "deviceTypes", "gridOperators") VALUES ($1, $2, $3, $4, $5, $6, $7, $8)',
         values: [
             '1',
             countryName,
@@ -89,8 +72,7 @@ async function importContracts(
 
     logger.info(`Saving contracts...`);
     const newContractsQuery = {
-        text:
-            'INSERT INTO public.issuer_blockchain_properties ("netId", "registry", "issuer", "rpcNode", "rpcNodeFallback", "platformOperatorPrivateKey") VALUES ($1, $2, $3, $4, $5, $6)',
+        text: 'INSERT INTO public.issuer_blockchain_properties ("netId", "registry", "issuer", "rpcNode", "rpcNodeFallback", "platformOperatorPrivateKey") VALUES ($1, $2, $3, $4, $5, $6)',
         values: [
             provider.network.chainId,
             contractsLookup.registry,

diff --git a/packages/traceability/issuer-api/ormconfig-dev.ts b/packages/traceability/issuer-api/ormconfig-dev.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     entities: ['src/**/*.entity.ts'],
     synchronize: false,
     migrationsRun: true,

diff --git a/packages/traceability/issuer-api/ormconfig.ts b/packages/traceability/issuer-api/ormconfig.ts
@@ -2,7 +2,7 @@ import { ConnectionOptions } from 'typeorm';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     synchronize: false,
     migrationsRun: true,
     migrations: [`${__dirname}/migrations/*.js`],

diff --git a/packages/traceability/issuer-irec-api/ormconfig-dev.ts b/packages/traceability/issuer-irec-api/ormconfig-dev.ts
@@ -3,7 +3,7 @@ import { entities } from './src';
 import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     entities,
     synchronize: false,
     migrationsRun: true,

diff --git a/packages/traceability/issuer-irec-api/ormconfig.ts b/packages/traceability/issuer-irec-api/ormconfig.ts
@@ -3,7 +3,7 @@ import { getDBConnectionOptions } from '@energyweb/origin-backend-utils';
 import { entities } from './src';
 
 const config: ConnectionOptions = {
-    ...getDBConnectionOptions(),
+    ...(getDBConnectionOptions() as ConnectionOptions),
     entities,
     synchronize: false,
     migrationsRun: true,