refactor(nms): Move fbc_js_core middleware into server

Signed-off-by: Thomas Schmitt <thomas.schmitt@tngtech.com>
magma · May 12, 2022 · 6f555ef · 6f555ef
1 parent e0f97b7
commit 6f555ef
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 9 deletions.
diff --git a/nms/.eslintrc.js b/nms/.eslintrc.js
@@ -258,7 +258,6 @@ module.exports = {
         'babelRegister.js',
         'jest.config.js',
         'jest.*.config.js',
-        'fbc_js_core/express_middleware/**/*.js',
         'fbc_js_core/platform_server/**/*.js',
         'fbc_js_core/sequelize_models/**/*.js',
         'fbc_js_core/util/yarn.js',

diff --git a/nms/server/app.js b/nms/server/app.js
@@ -44,7 +44,7 @@ import {
   organizationMiddleware,
   sessionMiddleware,
   webpackSmartMiddleware,
-} from '../fbc_js_core/express_middleware';
+} from './middleware';
 import {distPath} from '../config/paths';
 import {sequelize} from '../fbc_js_core/sequelize_models';
 import {unprotectedUserRoutes} from '../server/auth/express';

diff --git a/nms/server/auth/oidc/client.js b/nms/server/auth/oidc/client.js
@@ -14,7 +14,7 @@
  * @format
  */
 
-import type {OrganizationMiddlewareRequest} from '../../../fbc_js_core/express_middleware/organizationMiddleware';
+import type {OrganizationMiddlewareRequest} from '../../../server/middleware/organizationMiddleware';
 
 import {Issuer} from 'openid-client';
 

diff --git a/nms/server/auth/organization.js b/nms/server/auth/organization.js
@@ -14,7 +14,7 @@
  * @format
  */
 
-import type {FBCNMSMiddleWareRequest} from '../../fbc_js_core/express_middleware';
+import type {FBCNMSMiddleWareRequest} from '../../server/middleware';
 
 export async function injectOrganizationParams<T: {[string]: any}>(
   req: FBCNMSMiddleWareRequest,

diff --git a/nms/server/auth/passport.js b/nms/server/auth/passport.js
@@ -17,7 +17,7 @@
 import passport from 'passport';
 import {User} from '../../fbc_js_core/sequelize_models';
 
-import type {FBCNMSMiddleWareRequest} from '../../fbc_js_core/express_middleware';
+import type {FBCNMSMiddleWareRequest} from '../../server/middleware';
 import type {UserType} from '../../fbc_js_core/sequelize_models/models/user';
 
 type OutputRequest<T> = {

diff --git a/nms/server/auth/strategies/BearerStrategy.js b/nms/server/auth/strategies/BearerStrategy.js
@@ -14,7 +14,7 @@
  * @format
  */
 
-import type {FBCNMSMiddleWareRequest} from '../../../fbc_js_core/express_middleware';
+import type {FBCNMSMiddleWareRequest} from '../../../server/middleware';
 
 import {Strategy} from 'passport-http-bearer';
 import {clientFromRequest} from '../oidc/client';

diff --git a/nms/server/auth/strategies/DynamicStrategy.js b/nms/server/auth/strategies/DynamicStrategy.js
@@ -14,7 +14,7 @@
  * @format
  */
 
-import type {FBCNMSMiddleWareRequest} from '../../../fbc_js_core/express_middleware';
+import type {FBCNMSMiddleWareRequest} from '../../../server/middleware';
 
 import {Strategy} from 'passport-strategy';
 

diff --git a/nms/server/auth/strategies/OrganizationLocalStrategy.js b/nms/server/auth/strategies/OrganizationLocalStrategy.js
@@ -14,7 +14,7 @@
  * @format
  */
 
-import type {FBCNMSMiddleWareRequest} from '../../../fbc_js_core/express_middleware';
+import type {FBCNMSMiddleWareRequest} from '../../../server/middleware';
 import type {UserType} from '../../../fbc_js_core/sequelize_models/models/user.js';
 
 import bcrypt from 'bcryptjs';

diff --git a/nms/server/auth/util.js b/nms/server/auth/util.js
@@ -14,7 +14,7 @@
  * @format
  */
 
-import type {FBCNMSMiddleWareRequest} from '../../fbc_js_core/express_middleware';
+import type {FBCNMSMiddleWareRequest} from '../../server/middleware';
 import type {UserRawType} from '../../fbc_js_core/sequelize_models/models/user';
 import type {UserType} from '../../fbc_js_core/sequelize_models/models/user.js';
 

diff --git a/..._core/express_middleware/appMiddleware.js → nms/server/middleware/appMiddleware.js b/..._core/express_middleware/appMiddleware.js → nms/server/middleware/appMiddleware.js
diff --git a/...core/express_middleware/csrfMiddleware.js → nms/server/middleware/csrfMiddleware.js b/...core/express_middleware/csrfMiddleware.js → nms/server/middleware/csrfMiddleware.js
diff --git a/nms/fbc_js_core/express_middleware/index.js → nms/server/middleware/index.js b/nms/fbc_js_core/express_middleware/index.js → nms/server/middleware/index.js
diff --git a/...ress_middleware/organizationMiddleware.js → ...rver/middleware/organizationMiddleware.js b/...ress_middleware/organizationMiddleware.js → ...rver/middleware/organizationMiddleware.js
diff --git a/...e/express_middleware/sessionMiddleware.js → nms/server/middleware/sessionMiddleware.js b/...e/express_middleware/sessionMiddleware.js → nms/server/middleware/sessionMiddleware.js
diff --git a/...ress_middleware/webpackSmartMiddleware.js → ...rver/middleware/webpackSmartMiddleware.js b/...ress_middleware/webpackSmartMiddleware.js → ...rver/middleware/webpackSmartMiddleware.js