@memberjunction/server 0.9.60 → 0.9.62
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config.js +3 -1
- package/dist/config.js.map +1 -1
- package/dist/orm.js +13 -0
- package/dist/orm.js.map +1 -1
- package/package.json +7 -7
- package/src/config.ts +2 -0
- package/src/orm.ts +14 -1
package/dist/config.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.loadConfig = exports.configInfo = exports.configFile = exports.mj_core_schema = exports.auth0ClientSecret = exports.auth0WebClientID = exports.auth0Domain = exports.userEmailMap = exports.websiteRunFromPackage = exports.enableIntrospection = exports.tenantID = exports.webClientID = exports.graphqlRootPath = exports.graphqlPort = exports.dbDatabase = exports.dbPassword = exports.dbUsername = exports.dbPort = exports.dbHost = exports.nodeEnv = void 0;
|
|
6
|
+
exports.loadConfig = exports.configInfo = exports.configFile = exports.mj_core_schema = exports.auth0ClientSecret = exports.auth0WebClientID = exports.auth0Domain = exports.userEmailMap = exports.websiteRunFromPackage = exports.enableIntrospection = exports.tenantID = exports.webClientID = exports.graphqlRootPath = exports.graphqlPort = exports.dbTrustServerCertificate = exports.dbInstanceName = exports.dbDatabase = exports.dbPassword = exports.dbUsername = exports.dbPort = exports.dbHost = exports.nodeEnv = void 0;
|
|
7
7
|
const env_var_1 = __importDefault(require("env-var"));
|
|
8
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
@@ -14,6 +14,8 @@ exports.dbPort = env_var_1.default.get('DB_PORT').default('1433').asPortNumber()
|
|
|
14
14
|
exports.dbUsername = env_var_1.default.get('DB_USERNAME').required().asString();
|
|
15
15
|
exports.dbPassword = env_var_1.default.get('DB_PASSWORD').required().asString();
|
|
16
16
|
exports.dbDatabase = env_var_1.default.get('DB_DATABASE').required().asString();
|
|
17
|
+
exports.dbInstanceName = env_var_1.default.get('DB_INSTANCE_NAME').asString();
|
|
18
|
+
exports.dbTrustServerCertificate = env_var_1.default.get('DB_TRUST_SERVER_CERTIFICATE').asBool();
|
|
17
19
|
exports.graphqlPort = env_var_1.default.get('PORT').default('4000').asPortNumber();
|
|
18
20
|
exports.graphqlRootPath = env_var_1.default.get('ROOT_PATH').default('/').asString();
|
|
19
21
|
exports.webClientID = env_var_1.default.get('WEB_CLIENT_ID').asString();
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA0B;AAC1B,4CAAoB;AACpB,gDAAwB;AACxB,6BAAwB;AAEX,QAAA,OAAO,GAAG,iBAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEzC,QAAA,MAAM,GAAG,iBAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;AAClD,QAAA,MAAM,GAAG,iBAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,CAAC;AAC3D,QAAA,UAAU,GAAG,iBAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;AAC1D,QAAA,UAAU,GAAG,iBAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;AAC1D,QAAA,UAAU,GAAG,iBAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/orm.js
CHANGED
|
@@ -14,7 +14,20 @@ const orm = (entities) => {
|
|
|
14
14
|
synchronize: false,
|
|
15
15
|
requestTimeout: config_1.configInfo.databaseSettings.requestTimeout,
|
|
16
16
|
connectionTimeout: config_1.configInfo.databaseSettings.connectionTimeout,
|
|
17
|
+
options: {}
|
|
17
18
|
};
|
|
19
|
+
if (config_1.dbInstanceName !== null && config_1.dbInstanceName !== undefined && config_1.dbInstanceName.trim().length > 0) {
|
|
20
|
+
ormConfig.options = {
|
|
21
|
+
...ormConfig.options,
|
|
22
|
+
instanceName: config_1.dbInstanceName
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
if (config_1.dbTrustServerCertificate !== null && config_1.dbTrustServerCertificate !== undefined) {
|
|
26
|
+
ormConfig.options = {
|
|
27
|
+
...ormConfig.options,
|
|
28
|
+
trustServerCertificate: config_1.dbTrustServerCertificate
|
|
29
|
+
};
|
|
30
|
+
}
|
|
18
31
|
return ormConfig;
|
|
19
32
|
};
|
|
20
33
|
exports.default = orm;
|
package/dist/orm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":";;AACA,
|
|
1
|
+
{"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":";;AACA,qCAAoI;AAEpI,MAAM,GAAG,GAAG,CAAC,QAAuB,EAAqB,EAAE;IACzD,MAAM,SAAS,GAAG;QAChB,IAAI,EAAE,OAAgB;QACtB,QAAQ;QACR,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,eAAM;QACZ,IAAI,EAAE,eAAM;QACZ,QAAQ,EAAE,mBAAU;QACpB,QAAQ,EAAE,mBAAU;QACpB,QAAQ,EAAE,mBAAU;QACpB,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,mBAAU,CAAC,gBAAgB,CAAC,cAAc;QAC1D,iBAAiB,EAAE,mBAAU,CAAC,gBAAgB,CAAC,iBAAiB;QAChE,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,IAAI,uBAAc,KAAK,IAAI,IAAI,uBAAc,KAAK,SAAS,IAAI,uBAAc,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/F,SAAS,CAAC,OAAO,GAAG;YAClB,GAAG,SAAS,CAAC,OAAO;YACpB,YAAY,EAAE,uBAAc;SAC7B,CAAC;KACH;IACD,IAAI,iCAAwB,KAAK,IAAI,IAAI,iCAAwB,KAAK,SAAS,EAAE;QAC/E,SAAS,CAAC,OAAO,GAAG;YAClB,GAAG,SAAS,CAAC,OAAO;YACpB,sBAAsB,EAAE,iCAAwB;SACjD,CAAC;KACH;IAGD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,kBAAe,GAAG,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@memberjunction/server",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.62",
|
|
4
4
|
"description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "src/index.ts",
|
|
@@ -21,12 +21,12 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@apollo/server": "^4.9.1",
|
|
23
23
|
"@graphql-tools/utils": "^10.0.1",
|
|
24
|
-
"@memberjunction/ai": "^0.9.
|
|
25
|
-
"@memberjunction/core": "^0.9.
|
|
26
|
-
"@memberjunction/core-entities": "^0.9.
|
|
27
|
-
"@memberjunction/global": "^0.9.
|
|
28
|
-
"@memberjunction/queue": "^0.9.
|
|
29
|
-
"@memberjunction/sqlserver-dataprovider": "^0.9.
|
|
24
|
+
"@memberjunction/ai": "^0.9.68",
|
|
25
|
+
"@memberjunction/core": "^0.9.76",
|
|
26
|
+
"@memberjunction/core-entities": "^0.9.47",
|
|
27
|
+
"@memberjunction/global": "^0.9.79",
|
|
28
|
+
"@memberjunction/queue": "^0.9.69",
|
|
29
|
+
"@memberjunction/sqlserver-dataprovider": "^0.9.71",
|
|
30
30
|
"@types/axios": "^0.14.0",
|
|
31
31
|
"@types/cors": "^2.8.13",
|
|
32
32
|
"@types/jsonwebtoken": "^8.5.9",
|
package/src/config.ts
CHANGED
|
@@ -10,6 +10,8 @@ export const dbPort = env.get('DB_PORT').default('1433').asPortNumber();
|
|
|
10
10
|
export const dbUsername = env.get('DB_USERNAME').required().asString();
|
|
11
11
|
export const dbPassword = env.get('DB_PASSWORD').required().asString();
|
|
12
12
|
export const dbDatabase = env.get('DB_DATABASE').required().asString();
|
|
13
|
+
export const dbInstanceName = env.get('DB_INSTANCE_NAME').asString();
|
|
14
|
+
export const dbTrustServerCertificate = env.get('DB_TRUST_SERVER_CERTIFICATE').asBool();
|
|
13
15
|
|
|
14
16
|
export const graphqlPort = env.get('PORT').default('4000').asPortNumber();
|
|
15
17
|
export const graphqlRootPath = env.get('ROOT_PATH').default('/').asString();
|
package/src/orm.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DataSourceOptions } from 'typeorm';
|
|
2
|
-
import { configInfo, dbDatabase, dbHost, dbPassword, dbPort, dbUsername } from './config';
|
|
2
|
+
import { configInfo, dbDatabase, dbHost, dbPassword, dbPort, dbUsername, dbInstanceName, dbTrustServerCertificate } from './config';
|
|
3
3
|
|
|
4
4
|
const orm = (entities: Array<string>): DataSourceOptions => {
|
|
5
5
|
const ormConfig = {
|
|
@@ -14,7 +14,20 @@ const orm = (entities: Array<string>): DataSourceOptions => {
|
|
|
14
14
|
synchronize: false,
|
|
15
15
|
requestTimeout: configInfo.databaseSettings.requestTimeout,
|
|
16
16
|
connectionTimeout: configInfo.databaseSettings.connectionTimeout,
|
|
17
|
+
options: {}
|
|
17
18
|
};
|
|
19
|
+
if (dbInstanceName !== null && dbInstanceName !== undefined && dbInstanceName.trim().length > 0) {
|
|
20
|
+
ormConfig.options = {
|
|
21
|
+
...ormConfig.options,
|
|
22
|
+
instanceName: dbInstanceName
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
if (dbTrustServerCertificate !== null && dbTrustServerCertificate !== undefined) {
|
|
26
|
+
ormConfig.options = {
|
|
27
|
+
...ormConfig.options,
|
|
28
|
+
trustServerCertificate: dbTrustServerCertificate
|
|
29
|
+
};
|
|
30
|
+
}
|
|
18
31
|
|
|
19
32
|
//console.log({ ormConfig: { ...ormConfig, password: '***' } });
|
|
20
33
|
return ormConfig;
|