(WiP): fixing multi tenancy

Author: juicycleff

LICENSE

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2010-2019 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -8,6 +8,9 @@ ULTIMATE BACKEND
     <p align="center">
 </p>
 
+<a href="https://img.shields.io/github/license/juicycleff/ultimate-backend?style=for-the-badge" target="_blank"><img src="https://img.shields.io/github/license/juicycleff/ultimate-backend?style=for-the-badge" alt="License"/></a>
+<a href="https://img.shields.io/snyk/vulnerabilities/github/juicycleff/ultimate-backend?style=for-the-badge" target="_blank"><img src="https://img.shields.io/snyk/vulnerabilities/github/juicycleff/ultimate-backend?style=for-the-badge" alt="Snyk"/></a>
+
 ## Description
 This should be the go to backend base for your next scalable project. It comes with Multi-Tenancy, following different multi-tenancy database strategy as well as different resolver patterns
 to identify your tenants. The goal is to give your next big project that extra leap to awesomeness.

apps/gateway-admin/src/app.module.ts

@@ -1,11 +1,12 @@
-import { Module } from '@nestjs/common';
+import { CacheModule, Module } from '@nestjs/common';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { GraphqlDistributedGatewayModule } from '@graphqlcqrs/graphql-gateway';
 import { HeadersDatasource } from './headers.datasource';
 
 @Module({
   imports: [
+    CacheModule.register(),
     GraphqlDistributedGatewayModule.forRoot({
       subscriptions: false,
       path: '/graphql',

apps/gateway-admin/src/headers.datasource.ts

@@ -5,7 +5,7 @@ export class HeadersDatasource extends RemoteGraphQLDataSource {
   willSendRequest({ request, context }) {
 
     if (context.req) {
-      if (context.req && context.req.headers) {
+      if (context.req.headers) {
         const ctxHeaders = context.req.headers;
 
         for (const key in ctxHeaders) {
@@ -14,10 +14,16 @@ export class HeadersDatasource extends RemoteGraphQLDataSource {
           }
         }
       }
-      if (context.req && context.req.cookies) {
+      if (context.req.cookies) {
         // tslint:disable-next-line:no-console
         console.log('cookies', context.req.cookies);
       }
+      if (context.req.tenantInfo) {
+        // tslint:disable-next-line:no-console
+        console.log('tenantInfo start', context.req.tenantInfo);
+        request.tenantInfo = context.req.tenantInfo;
+        request.http.headers.set('x-tenant-info', JSON.stringify(context.req.tenantInfo));
+      }
     }
   }
 

apps/gateway-admin/src/main.ts

@@ -21,7 +21,6 @@ async function bootstrap() {
   }));
   AppUtils.killAppWithGrace(app);
   app.use(cookieParser());
-
   await app.listen(parseInt(process.env.PORT, 10) || 4000);
 }
 bootstrap();

apps/service-auth/src/auth/auth.resolver.ts

@@ -2,6 +2,7 @@ import { Args, Context, Mutation, Resolver } from '@nestjs/graphql';
 import { UseGuards } from '@nestjs/common';
 import { GqlAuthGuard } from '@graphqlcqrs/common/guards';
 import { AuthService } from './auth.service';
+import { AuthEntity } from '@graphqlcqrs/repository/entities';
 
 @Resolver('AuthPayload')
 export class AuthResolver {
@@ -13,10 +14,15 @@ export class AuthResolver {
   async login(@Args('input') {identifier, password}: any, @Context() context: any) {
     console.log('************************');
     console.log(context.req.session);
-    const gt = await this.authService.create({
-      name: 'catty',
-      sound: 'meow',
-    });
+    let auth = new AuthEntity();
+    // @ts-ignore
+    auth = {
+      local: {
+        email: 'rex@gmail.com',
+        hashedPassword: 'blaaaaab',
+      },
+    };
+    const gt = await this.authService.create(auth);
     // console.log(gt);
     console.log('************************');
     const { user } = await context.authenticate('graphql-local', { email: identifier, password });

apps/service-auth/src/auth/auth.service.ts

@@ -1,18 +1,17 @@
 import { Injectable } from '@nestjs/common';
 import { AuthRepository } from '@graphqlcqrs/repository/repositories/auth.repository';
+import { AuthEntity } from '@graphqlcqrs/repository/entities';
 
 @Injectable()
 export class AuthService {
   constructor(private authRepository: AuthRepository) {}
 
-  async create(cat: any) {
-    // @ts-ignore
-    return await this.authRepository.create({
-      local: {
-        email: 'juicycleff@gmail.com',
-        hashedPassword: 'green',
-      },
-    }); // save(cat);
+  async create(auth: Partial<AuthEntity> | AuthEntity) {
+    try {
+      return await this.authRepository.create(auth);
+    } catch (e) {
+      console.log(e);
+    }
   }
 
   async validateUser(email: string, pass: string): Promise<any> {

libs/common/src/utils/cache.utils.ts

@@ -0,0 +1,31 @@
+import { Validator } from 'class-validator';
+import * as stringify from 'json-stable-stringify';
+import { hash } from './hash.utils';
+
+/**
+ * @description: Utility functions to support caching operations
+ * @notes:
+ *  - Uses json-stable-stringify (instead of JSON.Stringify) for determanistic string generation - regardless of parameter ordering
+ *  - Uses custom hash function as significantly faster than cryptogaphic hashes
+ */
+export class CachingUtils {
+  private static validator = new Validator();
+
+  public static makeCacheKeyFromId(entityId: string): string {
+    this.validator.isMongoId(entityId);
+    return this.makeCacheKeyFromProperty(entityId, 'id');
+  }
+
+  public static makeCacheKeyFromProperty(
+    propertyName: string,
+    propertyValue: string,
+  ): string {
+    this.validator.isNotEmpty(propertyValue);
+    this.validator.isNotEmpty(propertyName);
+    return `CacheKey-${propertyName}-${propertyValue}`;
+  }
+
+  public static makeCacheKeyFromObject(object: object): string {
+    return hash(stringify(object)).toString();
+  }
+}

libs/nest-multi-tenant/src/database/mongo/decorators/entity-repository.decorator.ts

@@ -1,4 +1,4 @@
-import { COLLECTION_KEY, CollectionProps } from '../interfaces';
+import { COLLECTION_KEY, CollectionProps, ENTITY_KEY, EntityProps } from '../interfaces';
 
 /**
  * Indicate the class represents a collection
@@ -10,3 +10,14 @@ import { COLLECTION_KEY, CollectionProps } from '../interfaces';
 export const EntityRepository = (props: CollectionProps) =>  (target: any) => {
   Reflect.defineMetadata(COLLECTION_KEY, props, target.prototype);
 };
+
+/**
+ * Indicate the class represents a collection
+ *
+ * @export
+ * @param {CollectionProps} props
+ * @returns
+ */
+export const Entity = (props?: EntityProps) =>  (target: any) => {
+  Reflect.defineMetadata(ENTITY_KEY, props, target.prototype);
+};

libs/nest-multi-tenant/src/database/mongo/decorators/hooks.decorator.ts

@@ -1,4 +1,5 @@
 import { POST_KEY, PRE_KEY } from '../interfaces';
+import { DataEvents } from '@juicycleff/nest-multi-tenant/enums';
 
 /**
  * Run this function before an event occurs
@@ -17,7 +18,7 @@ import { POST_KEY, PRE_KEY } from '../interfaces';
  * @param {...string[]} events a list of events
  * @returns
  */
-export const Before = (...events: string[]) => (target: any, name: string, descriptor: TypedPropertyDescriptor<any>) => {
+export const Before = (...events: DataEvents[]) => (target: any, name: string, descriptor: TypedPropertyDescriptor<any>) => {
   for (const event of events) {
     const fns = Reflect.getMetadata(`${PRE_KEY}_${event}`, target) || [];
     // you must create new array so you don't push fn into siblings
@@ -44,7 +45,7 @@ export const Before = (...events: string[]) => (target: any, name: string, descr
  * @param {...string[]} events a list of events
  * @returns
  */
-export const After = (...events: string[]) =>  (target: any, name: string, descriptor: TypedPropertyDescriptor<any>) => {
+export const After = (...events: DataEvents[]) =>  (target: any, name: string, descriptor: TypedPropertyDescriptor<any>) => {
   for (const event of events) {
     const fns = Reflect.getMetadata(`${POST_KEY}_${event}`, target) || [];
     // you must create new array so you don't push fn into siblings