From c3f1eb5a4f23d2591d4ce9d98b3775f5152b3400 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Mon, 16 Nov 2020 11:06:44 +0300 Subject: [PATCH] refactor --- src/client/stores/CommonStore.ts | 5 ----- src/client/stores/index.js | 2 -- src/client/tools/user.ts | 3 ++- src/core/constants/domain.js | 2 ++ src/server/index.ts | 5 +++-- 5 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 src/client/stores/CommonStore.ts create mode 100644 src/core/constants/domain.js diff --git a/src/client/stores/CommonStore.ts b/src/client/stores/CommonStore.ts deleted file mode 100644 index a42b08f..0000000 --- a/src/client/stores/CommonStore.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { observable } from 'mobx'; - -const CommonStore = observable({}); - -export default CommonStore; diff --git a/src/client/stores/index.js b/src/client/stores/index.js index 608f894..1667473 100644 --- a/src/client/stores/index.js +++ b/src/client/stores/index.js @@ -1,10 +1,8 @@ import CalculationStore from './CalculationStore'; -import CommonStore from './CommonStore'; class RootStore { constructor() { this.calculationStore = CalculationStore; - this.commonStore = CommonStore; } } diff --git a/src/client/tools/user.ts b/src/client/tools/user.ts index 4f0f7ca..889c2b6 100644 --- a/src/client/tools/user.ts +++ b/src/client/tools/user.ts @@ -1,5 +1,6 @@ import CalculationService from 'client/services/CalculationService'; import { User } from 'core/types/user'; +import { domainName } from 'core/constants/domain'; export const getUser = async (): Promise => { function getFullName(user: User) { @@ -14,7 +15,7 @@ export const getUser = async (): Promise => { } } var username = prompt('Enter username'); - const user: User = { UserName: username || '', DomainName: 'EVOLEASING' }; + const user: User = { UserName: username || '', DomainName: domainName }; localStorage.setItem('user', JSON.stringify(user)); return { ...user, FullName: getFullName(user) }; } diff --git a/src/core/constants/domain.js b/src/core/constants/domain.js new file mode 100644 index 0000000..34fa00f --- /dev/null +++ b/src/core/constants/domain.js @@ -0,0 +1,2 @@ +export const domainName = 'EVOLEASING'; +export const LDAP_URL = 'ldap://evoleasing.ru'; diff --git a/src/server/index.ts b/src/server/index.ts index 78cb871..73fbf5f 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -8,6 +8,7 @@ import morgan from 'morgan'; import path from 'path'; import 'reflect-metadata'; import { SERVER_PORT } from './../core/constants/urls'; +import { domainName, LDAP_URL } from './../core/constants/domain'; import routes from './routes'; const isDevelopmentMode = process.env.NODE_ENV === 'development'; @@ -18,8 +19,8 @@ const app = express(); if (!isDevelopmentMode) app.use( ntlm({ - domain: 'EVOLEASING', - domaincontroller: 'ldap://evoleasing.ru', + domain: domainName, + domaincontroller: LDAP_URL, }), ); /** AUTHENTICATION */