QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-20 14:50:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: users api without organization id.

Browse Source
This commit is contained in:
a.bouhuolia
2021-09-08 15:53:09 +02:00
parent 6401692903
commit 02ef195af0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/api/controllers/Users.ts
View File

@@ -5,9 +5,12 @@ import {
query, query,
param, param,
} from 'express-validator'; } from 'express-validator';
import JWTAuth from 'api/middleware/jwtAuth';
import asyncMiddleware from 'api/middleware/asyncMiddleware'; import asyncMiddleware from 'api/middleware/asyncMiddleware';
import BaseController from 'api/controllers/BaseController'; import BaseController from 'api/controllers/BaseController';
import UsersService from 'services/Users/UsersService'; import UsersService from 'services/Users/UsersService';
import TenancyMiddleware from 'api/middleware/TenancyMiddleware';
import AttachCurrentTenantUser from 'api/middleware/AttachCurrentTenantUser';
import { ServiceError, ServiceErrors } from 'exceptions'; import { ServiceError, ServiceErrors } from 'exceptions';
import { ISystemUserDTO } from 'interfaces'; import { ISystemUserDTO } from 'interfaces';
@@ -22,6 +25,10 @@ export default class UsersController extends BaseController{
router() { router() {
const router = Router(); const router = Router();
router.use(JWTAuth);
router.use(AttachCurrentTenantUser);
router.use(TenancyMiddleware);
router.put('/:id/inactivate', [ router.put('/:id/inactivate', [
...this.specificUserSchema, ...this.specificUserSchema,
], ],

2
server/src/api/index.ts
View File

@@ -60,6 +60,7 @@ export default () => {
app.use('/organization', Container.get(Organization).router()); app.use('/organization', Container.get(Organization).router());
app.use('/ping', Container.get(Ping).router()); app.use('/ping', Container.get(Ping).router());
app.use('/jobs', Container.get(Jobs).router()); app.use('/jobs', Container.get(Jobs).router());
app.use('/users', Container.get(Users).router());
// - Dashboard routes. // - Dashboard routes.
// --------------------------- // ---------------------------
@@ -74,7 +75,6 @@ export default () => {
dashboard.use(I18nAuthenticatedMiddlware); dashboard.use(I18nAuthenticatedMiddlware);
dashboard.use(EnsureTenantIsSeeded); dashboard.use(EnsureTenantIsSeeded);
dashboard.use('/users', Container.get(Users).router());
dashboard.use('/invite', Container.get(InviteUsers).authRouter()); dashboard.use('/invite', Container.get(InviteUsers).authRouter());
dashboard.use('/currencies', Container.get(Currencies).router()); dashboard.use('/currencies', Container.get(Currencies).router());
dashboard.use('/settings', Container.get(Settings).router()); dashboard.use('/settings', Container.get(Settings).router());