refactor: datasource refactor

aceHubert · Oct 11, 2024 · 05195d7 · 05195d7
1 parent 505e8e2
commit 05195d7
Show file tree

Hide file tree

Showing 124 changed files with 1,879 additions and 1,968 deletions.
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.2.0",
     "sanitize-html": "^2.11.0",
-    "sequelize": "^6.19.0",
+    "sequelize": "^6.30.0",
     "statuses": "^2.0.1",
     "tedious": "^15.1.0",
     "wildcard": "^2.0.1"

diff --git a/servers/identity-server/src/app.module.ts b/servers/identity-server/src/app.module.ts
@@ -217,9 +217,10 @@ const logger = new Logger('AppModule', { timestamp: true });
       isGlobal: true,
       useFactory: async (config: ConfigService, storageOptions: StorageOptions) => ({
         debug: config.get('debug', false),
-        issuer: `${config.getOrThrow('server.origin')}${normalizeRoutePath(
-          config.get<string>('server.globalPrefixUri', ''),
-        )}`,
+        issuer: 'http://fakeissuer.com',
+        //  `${config.getOrThrow('server.origin')}${normalizeRoutePath(
+        //   config.get<string>('server.globalPrefixUri', ''),
+        // )}`,
         path: normalizeRoutePath(config.get('OIDC_PATH', '/oidc')),
         jwks: await getJWKS(config.get('PRIVATE_KEY')),
         storage: storageOptions.use,

diff --git a/servers/identity-server/src/datasource/constants.ts b/servers/identity-server/src/datasource/constants.ts
@@ -1 +1 @@
-export const IDENTITY_OPTIONS = 'IDENTITY_OPTIONS';
+export const IDENTITY_DATASOURCE_OPTIONS = 'IDENTITY_DATASOURCE_OPTIONS';
diff --git a/servers/identity-server/src/datasource/datasource.module.ts b/servers/identity-server/src/datasource/datasource.module.ts
@@ -4,9 +4,11 @@ import {
   IdentityDatasourceAsyncOptions,
   IdentityDatasourceOptionsFactory,
 } from './interfaces/identity-datasource-options.interface';
-import { dataSources } from './sequelize';
+import * as DataSources from './sequelize/datasources';
 import { IdentityDatasourceService } from './datasource.service';
-import { IDENTITY_OPTIONS } from './constants';
+import { IDENTITY_DATASOURCE_OPTIONS } from './constants';
+
+const dataSources = Object.values(DataSources);
 
 @Module({})
 export class IdentityDatasourceModule {
@@ -22,13 +24,13 @@ export class IdentityDatasourceModule {
       global: isGlobal,
       providers: [
         {
-          provide: IDENTITY_OPTIONS,
+          provide: IDENTITY_DATASOURCE_OPTIONS,
           useValue: restOptions,
         },
-        ...dataSources,
         IdentityDatasourceService,
+        ...dataSources,
       ],
-      exports: [IDENTITY_OPTIONS, ...dataSources, IdentityDatasourceService],
+      exports: [IDENTITY_DATASOURCE_OPTIONS, IdentityDatasourceService, ...dataSources],
     };
   }
 
@@ -37,8 +39,8 @@ export class IdentityDatasourceModule {
       module: IdentityDatasourceModule,
       global: options.isGlobal,
       imports: options.imports,
-      providers: [...this.createAsyncProviders(options), ...dataSources, IdentityDatasourceService],
-      exports: [IDENTITY_OPTIONS, ...dataSources, IdentityDatasourceService],
+      providers: [...this.createAsyncProviders(options), IdentityDatasourceService, ...dataSources],
+      exports: [IDENTITY_DATASOURCE_OPTIONS, IdentityDatasourceService, ...dataSources],
     };
   }
 
@@ -58,7 +60,7 @@ export class IdentityDatasourceModule {
   private static createAsyncOptionsProvider(options: IdentityDatasourceAsyncOptions): Provider {
     if (options.useFactory) {
       return {
-        provide: IDENTITY_OPTIONS,
+        provide: IDENTITY_DATASOURCE_OPTIONS,
         useFactory: async (...args: any[]) => {
           const moduleOptions = await options.useFactory!(...args);
           // check connection config
@@ -69,7 +71,7 @@ export class IdentityDatasourceModule {
       };
     }
     return {
-      provide: IDENTITY_OPTIONS,
+      provide: IDENTITY_DATASOURCE_OPTIONS,
       useFactory: async (optionsFactory: IdentityDatasourceOptionsFactory) => {
         const moduleOptions = await optionsFactory.createSequlizeOptions();
         // check connection config
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const IDENTITY_OPTIONS = 'IDENTITY_OPTIONS';
		export const IDENTITY_DATASOURCE_OPTIONS = 'IDENTITY_DATASOURCE_OPTIONS';