Cms db merge (#53)

* refactor(database): merge CMS functionality in DB module
add(database): owner migration to move CMS schemas to database
add(database): query types to better specify query requirements
add(database): conditional query parsing

* refactor(database): remove stringify from older queries

* fix(database)!: Database/CMS merge updates
refactor(database,grpc-sdk): use ManagedModule
fix(database): deleteSchemas system schema deletion check failing

BREAKING CHANGE:
- All /admin/cms/* routes are now available under /database/cms
- [GET] /admin/database/schemas/extensions return definition change
  'declaredSchemaExtensions' -> 'schemaExtensions'

* fix(database): unparsed ints in getCustomEndpoints due to route definition missing skip,limit query params

* feat(database): getSchemasWithCustomEndpoints admin route

* chore(cms,grpc-sdk): delete CMS module

Co-authored-by: Konstantinos Feretos <konferetos@tutanota.com>

libraries/grpc-sdk/src/classes/ManagedModule.ts

@@ -25,6 +25,8 @@ export abstract class ManagedModule extends ConduitServiceModule {
     this.grpcSdk = grpcSdk;
   }
 
+  async preServerStart() {}
+
   async onServerStart() {}
 
   async preRegister() {}

libraries/grpc-sdk/src/classes/ModuleManager.ts

@@ -46,6 +46,7 @@ export class ModuleManager {
   }
 
   private async preRegisterLifecycle(): Promise<void> {
+    await this.module.preServerStart();
     await this.module.startGrpcServer(this.servicePort);
     await this.module.onServerStart()
     await this.module.preRegister();

libraries/grpc-sdk/src/index.ts

@@ -1,7 +1,6 @@
 import {
   Admin,
   Chat,
-  CMS,
   Config,
   DatabaseProvider,
   Email,
@@ -29,7 +28,6 @@ export default class ConduitGrpcSdk {
     email: Email,
     pushNotifications: PushNotifications,
     authentication: Authentication,
-    cms: CMS,
     sms: SMS,
     chat: Chat,
     forms: Forms,
@@ -84,7 +82,7 @@ export default class ConduitGrpcSdk {
     return this._router;
   }
 
-  get databaseProvider(): DatabaseProvider | null {
+  get database(): DatabaseProvider | null {
     if (this._modules['database']) {
       return this._modules['database'];
     } else {
@@ -93,6 +91,10 @@ export default class ConduitGrpcSdk {
     }
   }
 
+  get databaseProvider(): DatabaseProvider | null {
+    return this.database;
+  }
+
   get storage(): Storage | null {
     if (this._modules['storage']) {
       return this._modules['storage'];
@@ -138,15 +140,6 @@ export default class ConduitGrpcSdk {
     }
   }
 
-  get cms(): CMS | null {
-    if (this._modules['cms']) {
-      return this._modules['cms'];
-    } else {
-      console.warn('Cms module not up yet!');
-      return null;
-    }
-  }
-
   get sms(): SMS | null {
     if (this._modules['sms']) {
       return this._modules['sms'];

libraries/grpc-sdk/src/interfaces/ConduitService.ts

@@ -3,5 +3,5 @@ import { GrpcRequest, GrpcResponse } from '..';
 export interface ConduitService {
   readonly protoPath: string;
   readonly protoDescription: string;
-  functions: { [p: string]: (call: GrpcRequest<any>, callback: GrpcResponse<any>) => {} };
+  functions: { [p: string]: (call: GrpcRequest<any>, callback: GrpcResponse<any>) => void | Promise<void> };
 }

libraries/grpc-sdk/src/modules/databaseProvider/index.ts → libraries/grpc-sdk/src/modules/database/index.ts

@@ -1,6 +1,6 @@
 import { ConduitModule } from '../../classes/ConduitModule';
 import { ConduitSchema, ConduitSchemaExtension } from '../../classes';
-import { DatabaseProviderDefinition, DropCollectionResponse } from '../../protoUtils/database-provider';
+import { DatabaseProviderDefinition, DropCollectionResponse } from '../../protoUtils/database';
 
 export class DatabaseProvider extends ConduitModule<typeof DatabaseProviderDefinition> {
   constructor(moduleName: string, url: string) {

libraries/grpc-sdk/src/modules/index.ts

@@ -1,11 +1,10 @@
 export * from './storage';
 export * from './router';
 export * from './email';
-export * from './databaseProvider';
+export * from './database';
 export * from './config';
 export * from './admin';
 export * from './pushNotifications';
-export * from './cms';
 export * from './sms';
 export * from './chat';
 export * from './forms';