Skip to content

Commit

Permalink
version routes before auth check (#6212)
Browse files Browse the repository at this point in the history
  • Loading branch information
daneryl authored Oct 19, 2023
1 parent e9fff27 commit 5b40a72
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
1 change: 0 additions & 1 deletion app/api/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,4 @@ export default (app, server) => {
require('./preserve/routes').PreserveRoutes(app);
require('./relationships.v2/routes/routes').default(app);
require('./stats/routes').default(app);
require('./version/routes').versionRoutes(app);
};
17 changes: 9 additions & 8 deletions app/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@ import path from 'path';
import * as Sentry from '@sentry/node';
import * as Tracing from '@sentry/tracing';

import { appContextMiddleware } from 'api/utils/appContextMiddleware';
import { requestIdMiddleware } from 'api/utils/requestIdMiddleware';
import { registerEventListeners } from 'api/eventListeners';
import { applicationEventsBus } from 'api/eventsbus';
import { appContextMiddleware } from 'api/utils/appContextMiddleware';
import { requestIdMiddleware } from 'api/utils/requestIdMiddleware';
import uwaziMessage from '../message';
import apiRoutes from './api/api';
import privateInstanceMiddleware from './api/auth/privateInstanceMiddleware';
import authRoutes from './api/auth/routes';
import { config } from './api/config';

import { versionRoutes } from './api/version/routes';
import { migrator } from './api/migrations/migrator';
import errorHandlingMiddleware from './api/utils/error_handling_middleware';
import { handleError } from './api/utils/handleError.js';
import { serverSideRender } from './react/server';
import { DB } from './api/odm';
import { permissionsContext } from './api/permissions/permissionsContext';
import { closeSockets } from './api/socketio/setupSockets';
import { tenants } from './api/tenants/tenantContext';
import errorHandlingMiddleware from './api/utils/error_handling_middleware';
import { handleError } from './api/utils/handleError.js';
import { multitenantMiddleware } from './api/utils/multitenantMiddleware';
import { routesErrorHandler } from './api/utils/routesErrorHandler';
import { closeSockets } from './api/socketio/setupSockets';
import { permissionsContext } from './api/permissions/permissionsContext';

import { serverSideRender } from './react/server';
import { startLegacyServicesNoMultiTenant } from './startLegacyServicesNoMultiTenant';

mongoose.Promise = Promise;
Expand Down Expand Up @@ -114,6 +114,7 @@ console.info('==> Connecting to', config.DBHOST);
DB.connect(config.DBHOST, dbAuth).then(async () => {
await tenants.setupTenants();
authRoutes(app);
versionRoutes(app);
app.use(privateInstanceMiddleware);
app.use('/flag-images', express.static(path.resolve(__dirname, '../dist/flags')));

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "uwazi",
"version": "1.138.4",
"version": "1.138.5",
"description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.",
"keywords": [
"react"
Expand Down

0 comments on commit 5b40a72

Please sign in to comment.