From 02ef195af0ed4c7a58b4cea3791e050ae923ee2f Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Wed, 8 Sep 2021 15:53:09 +0200
Subject: [PATCH] feat: users api without organization id.

---
 server/src/api/controllers/Users.ts | 7 +++++++
 server/src/api/index.ts             | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/src/api/controllers/Users.ts b/server/src/api/controllers/Users.ts
index 8fa57a51d..ebecedcdd 100644
--- a/server/src/api/controllers/Users.ts
+++ b/server/src/api/controllers/Users.ts
@@ -5,9 +5,12 @@ import {
   query,
   param,
 } from 'express-validator';
+import JWTAuth from 'api/middleware/jwtAuth';
 import asyncMiddleware from 'api/middleware/asyncMiddleware';
 import BaseController from 'api/controllers/BaseController';
 import UsersService from 'services/Users/UsersService';
+import TenancyMiddleware from 'api/middleware/TenancyMiddleware';
+import AttachCurrentTenantUser from 'api/middleware/AttachCurrentTenantUser';
 import { ServiceError, ServiceErrors } from 'exceptions';
 import { ISystemUserDTO } from 'interfaces';
 
@@ -22,6 +25,10 @@ export default class UsersController extends BaseController{
   router() {
     const router = Router();
 
+    router.use(JWTAuth);
+    router.use(AttachCurrentTenantUser);
+    router.use(TenancyMiddleware);
+
     router.put('/:id/inactivate', [
         ...this.specificUserSchema,
       ],
diff --git a/server/src/api/index.ts b/server/src/api/index.ts
index 71dd5de54..a3b4cea7c 100644
--- a/server/src/api/index.ts
+++ b/server/src/api/index.ts
@@ -60,6 +60,7 @@ export default () => {
   app.use('/organization', Container.get(Organization).router());
   app.use('/ping', Container.get(Ping).router());
   app.use('/jobs', Container.get(Jobs).router());
+  app.use('/users', Container.get(Users).router());
  
   // - Dashboard routes.
   // ---------------------------
@@ -74,7 +75,6 @@ export default () => {
   dashboard.use(I18nAuthenticatedMiddlware);
   dashboard.use(EnsureTenantIsSeeded);
 
-  dashboard.use('/users', Container.get(Users).router());
   dashboard.use('/invite', Container.get(InviteUsers).authRouter());
   dashboard.use('/currencies', Container.get(Currencies).router());
   dashboard.use('/settings', Container.get(Settings).router());