Removed global variables

src/domain/constants/types.ts

@@ -5,5 +5,6 @@ export const TYPES = {
 
     EventDispatcher: Symbol("EventDispatcher"),
     Agenda: Symbol("Agenda"),
-    TenantId: Symbol("TenantId")
+    TenantId: Symbol("TenantId"),
+    DecodedJwt: Symbol("DecodedJwt")
 };

src/domain/model/base.ts

@@ -4,19 +4,23 @@ import { Query } from "mongoose";
 
 import { Writable } from "../utils/writable";
 import { User } from "./user";
+import { iocContainer } from "../../infrastructure/config/ioc";
+import { TYPES } from "../constants/types";
+import { DecodedJwt } from "../../ui/services/auth_service";
 
 // eslint-disable-next-line
 @pre<BaseEntity>("findOneAndUpdate", function(this: Query<BaseEntity>, next) {
     try {
         const entity = this.getUpdate();
-        const user = (global.currentUser && global.currentUser.user) as User;
-        if (user) {
-            entity.updatedBy = user.id;
+        if (iocContainer.isBound(TYPES.DecodedJwt)) {
+            const currentUser = iocContainer.get<DecodedJwt>(TYPES.DecodedJwt);
+            entity.updatedBy = currentUser.userId;
             if (entity.isDeleted) {
-                entity.deletedBy = user.id;
+                entity.deletedBy = currentUser.userId;
                 entity.deletionTime = new Date();
             }
         }
+
         next();
     } catch (error) {
         next(error);
@@ -25,16 +29,21 @@ import { User } from "./user";
 // eslint-disable-next-line
 @pre<BaseEntity>("save", function(next) {
     try {
-        const user = global.currentUser && global.currentUser.user;
-        const creator = user || this.type === "User" ? this : undefined;
-        if (creator) this.setCreatedBy(creator);
+        if (iocContainer.isBound(TYPES.DecodedJwt)) {
+            const currentUser = iocContainer.get<DecodedJwt>(TYPES.DecodedJwt);
+            this.setCreatedBy(currentUser.userId);
+        } else if (this.type === "User") {
+            this.setCreatedBy(this);
+        }
         next();
     } catch (error) {
         next(error);
     }
 })
 export abstract class BaseEntity extends Typegoose {
     abstract type: string;
+    abstract update(entity: Partial<BaseEntity>): void;
+
     @Expose()
     id?: any;
 
@@ -84,7 +93,7 @@ export abstract class BaseEntity extends Typegoose {
     }
 
     @instanceMethod
-    private setCreatedBy(user: BaseEntity) {
-        (this as Writable<BaseEntity>).createdBy = user.id;
+    private setCreatedBy(user: any) {
+        (this as Writable<BaseEntity>).createdBy = user;
     }
 }

src/domain/model/interfaces/entity.ts

@@ -1,7 +1,3 @@
 export interface IMustHaveTenant {
     tenant: any;
 }
-export interface IActiveStatus {
-    isActive: boolean;
-    deactivate(): void;
-}

src/domain/model/tenant.ts

@@ -49,4 +49,10 @@ export class Tenant extends BaseEntity {
     setDescription(description: string) {
         (this as Writable<Tenant>).description = description;
     }
+
+    @instanceMethod
+    update(tenant: Partial<this>): void {
+        if (this.name) this.setName(tenant.name as string);
+        if (this.description) this.setDescription(tenant.description as string);
+    }
 }

src/domain/model/user.ts

@@ -1,11 +1,14 @@
 import { index, instanceMethod, prop, Ref } from "@hasezoey/typegoose";
-
+import { iocContainer } from "../../infrastructure/config/ioc";
+import { TYPES } from "../constants/types";
 import { Writable } from "../utils/writable";
 import { BaseEntity } from "./base";
 import { IMustHaveTenant } from "./interfaces/entity";
 import { Tenant } from "./tenant";
 
 export const MAX_NAME_LENGTH = 225;
+export const PASSWORD_SALT_ROUND = 12;
+
 export enum UserRole {
     USER = "user",
     ADMIN = "admin"
@@ -84,8 +87,7 @@ export class User extends BaseEntity implements IMustHaveTenant {
         password: string;
         tenantId?: string;
     }) => {
-        const id =
-            tenantId || (global.currentUser && global.currentUser.tenant.id);
+        const id = tenantId || iocContainer.get<any>(TYPES.TenantId);
 
         if (!id) throw new Error("Tenant Id is required");
 
@@ -119,11 +121,6 @@ export class User extends BaseEntity implements IMustHaveTenant {
         (this as Writable<User>).username = username;
     }
 
-    @instanceMethod
-    setTenant(tenant: Ref<Tenant>) {
-        (this as Writable<User>).tenant = tenant;
-    }
-
     @instanceMethod
     setFirstName(firstName: string) {
         (this as Writable<User>).firstName = firstName;
@@ -138,4 +135,13 @@ export class User extends BaseEntity implements IMustHaveTenant {
     setPassword(password: string) {
         (this as Writable<User>).password = password;
     }
+    @instanceMethod
+    update(user: Partial<this>): void {
+        if (this.firstName) this.setFirstName(user.firstName as string);
+        if (this.lastName) this.setLastName(user.lastName as string);
+        if (this.password) this.setPassword(user.password as string);
+        if (this.username) this.setUsername(user.username as string);
+        if (this.email) this.setEmail(user.email as string);
+        if (this.role) this.setRole(user.role as UserRole);
+    }
 }

src/infrastructure/config/swagger.config.ts

@@ -1,62 +1,61 @@
 import {
-	generateRoutes,
-	generateSwaggerSpec,
-	RoutesConfig,
-	SwaggerConfig
+    generateRoutes,
+    generateSwaggerSpec,
+    RoutesConfig,
+    SwaggerConfig
 } from "tsoa";
 import { config } from "./index";
 import {
-	X_TENANT_ID,
-	X_AUTH_TOKEN_KEY
+    X_TENANT_ID,
+    X_AUTH_TOKEN_KEY
 } from "../../ui/constants/header_constants";
 
 const basePath = config.api.prefix;
 const entryFile = "./src/index.ts";
 const controllers = "./src/ui/api/controllers/*.ts";
 const protocol =
-	process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test"
-		? "http"
-		: "https";
+    config.env === "development" || config.env === "test" ? "http" : "https";
 export const swaggerGen = async () => {
-	const swaggerOptions: SwaggerConfig = {
-		basePath,
-		entryFile,
-		securityDefinitions: {
-			[X_TENANT_ID]: {
-				type: "apiKey",
-				in: "header",
-				name: X_TENANT_ID,
-				description: "Tenant ID"
-			},
-			[X_AUTH_TOKEN_KEY]: {
-				type: "apiKey",
-				in: "header",
-				name: X_AUTH_TOKEN_KEY,
-				description: "JWT access token"
-			}
-		},
-		noImplicitAdditionalProperties: "throw-on-extras",
-		host: process.env.HOST,
-		description: "Enterprise NodeJs/Typescript API boilerplate",
-		version: "1.0.0",
-		name: "node-typescript-boilerplate",
-		specVersion: 3,
-		schemes: [protocol],
-		outputDirectory: "./",
-		controllerPathGlobs: [controllers]
-	};
+    const swaggerOptions: SwaggerConfig = {
+        basePath,
+        entryFile,
+        securityDefinitions: {
+            [X_TENANT_ID]: {
+                type: "apiKey",
+                in: "header",
+                name: X_TENANT_ID,
+                description: "Tenant ID"
+            },
+            [X_AUTH_TOKEN_KEY]: {
+                type: "apiKey",
+                in: "header",
+                name: X_AUTH_TOKEN_KEY,
+                description: "JWT access token"
+            }
+        },
+        noImplicitAdditionalProperties: "throw-on-extras",
+        host: process.env.HOST,
+        description: "Enterprise NodeJs/Typescript API boilerplate",
+        version: "1.0.0",
+        name: "node-typescript-boilerplate",
+        specVersion: 3,
+        schemes: [protocol],
+        outputDirectory: "./",
+        controllerPathGlobs: [controllers]
+    };
 
-	const routeOptions: RoutesConfig = {
-		basePath,
-		entryFile,
-		middleware: "express",
-		authenticationModule: "./src/ui/api/middleware/auth_middleware",
-		iocModule: "./src/infrastructure/config/ioc",
-		routesDir: "./src/ui/api",
-		controllerPathGlobs: [controllers]
-	};
+    const routeOptions: RoutesConfig = {
+        basePath,
+        entryFile,
+        middleware: "express",
+        authenticationModule: "./src/ui/api/middleware/auth_middleware",
+        iocModule: "./src/infrastructure/config/ioc",
+        routesDir: "./src/ui/api",
+        controllerPathGlobs: [controllers]
+    };
 
-	await generateSwaggerSpec(swaggerOptions, routeOptions);
+    if (config.env !== "test")
+        await generateSwaggerSpec(swaggerOptions, routeOptions);
 
-	await generateRoutes(routeOptions, swaggerOptions);
+    await generateRoutes(routeOptions, swaggerOptions);
 };

src/infrastructure/db/db_client.ts

@@ -36,8 +36,6 @@ export async function seedDefaultAdmin(tenantId: string) {
     });
     if (!defaultAdminUser) {
         userInstance.setRole(UserRole.ADMIN);
-        userInstance.setTenant(tenantId as any);
-
         await tenantModel.create(userInstance);
     }
 }

src/infrastructure/db/repositories/base_repository.ts

@@ -12,8 +12,7 @@ import { provideSingleton } from "../../config/ioc";
 export class BaseRepository<TEntity extends BaseEntity, TModel extends Document>
     implements IBaseRepository<TEntity> {
     protected Model: Model<TModel>;
-    protected CurrentTenantId?: string =
-        global.currentUser && global.currentUser.tenant.id;
+
     protected _constructor: () => TEntity;
     public constructor(
         @unmanaged() model: Model<TModel>,

src/infrastructure/db/repositories/tenant_repository.ts

@@ -3,7 +3,7 @@ import { Tenant } from "../../../domain/model/tenant";
 import { provideSingleton } from "../../config/ioc";
 import { BaseRepository } from "./base_repository";
 
-export interface TenantModel extends Tenant, Document {}
+export type TenantModel = Tenant & Document;
 
 @provideSingleton(TenantRepository)
 export class TenantRepository extends BaseRepository<Tenant, TenantModel> {

src/infrastructure/db/repositories/user_repository.ts

@@ -4,7 +4,7 @@ import { User } from "../../../domain/model/user";
 import { provideSingleton } from "../../config/ioc";
 import { BaseRepository } from "./base_repository";
 
-export interface UserModel extends User, Document {}
+export type UserModel = User & Document;
 
 @provideSingleton(UserRepository)
 export class UserRepository extends BaseRepository<User, UserModel>

src/ui/api/controllers/tenant_controller.ts

@@ -19,7 +19,8 @@ export class TenantController extends BaseController {
 
     @Get("{tenantName}")
     public async get(tenantName: string) {
-        return this._tenantService.get(tenantName);
+        const tenant = await this._tenantService.get(tenantName);
+        return tenant || this.setStatus(httpStatus.NOT_FOUND);
     }
     @Post()
     @Security("X-Auth-Token", ["admin"])

src/ui/api/controllers/user_controller.ts

@@ -0,0 +1,19 @@
+import { Body, Post, Route, Security, Tags } from "tsoa";
+import { inject, provideSingleton } from "../../../infrastructure/config/ioc";
+import { IUserService } from "../../interfaces/user_service";
+import { UserDto, UserSignUpInput } from "../../models/user_dto";
+import { UserService } from "../../services/user_service";
+import { BaseController } from "./base_controller";
+
+@Tags("Users")
+@Route("users")
+@provideSingleton(UserController)
+export class UserController extends BaseController {
+    @inject(UserService) private readonly _userService: IUserService;
+
+    @Post()
+    @Security("X-Auth-Token", ["admin"])
+    async create(@Body() input: UserSignUpInput): Promise<UserDto> {
+        return this._userService.create(input);
+    }
+}