@formio/appserver 2.0.0-rc.31 → 2.0.0-rc.34

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.
Files changed (2) hide show
  1. package/lib/server.js +2 -13
  2. package/package.json +2 -4
package/lib/server.js CHANGED
@@ -19,19 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
19
19
  Object.defineProperty(exports, "__esModule", { value: true });
20
20
  exports.Server = void 0;
21
21
  // Load the license key.
22
- const fs_1 = __importDefault(require("fs"));
23
- const path_1 = __importDefault(require("path"));
24
22
  const lodash_1 = require("lodash");
25
- const process_1 = require("process");
26
- let licenseKey = (0, lodash_1.get)(process.env, 'APPSERVER_LICENSE', (0, lodash_1.get)(process.env, 'LICENSE_KEY', ''));
27
- if (!licenseKey) {
28
- try {
29
- licenseKey = fs_1.default.readFileSync(path_1.default.join((0, process_1.cwd)(), 'license.txt'), 'utf8');
30
- }
31
- catch (err) {
32
- console.log('No license key found. Please set the APPSERVER_LICENSE environment variable or create a license.txt file in the root of the project.');
33
- }
34
- }
35
23
  const appserver_core_1 = require("@formio/appserver-core");
36
24
  const modules_1 = require("./modules");
37
25
  const actions_1 = __importDefault(require("./actions"));
@@ -44,7 +32,7 @@ class Server extends appserver_core_1.Server {
44
32
  constructor(config) {
45
33
  super((0, defaultsDeep_1.default)(config || {}, {
46
34
  cors: (0, lodash_1.get)(process.env, 'CORS', true).toString(),
47
- license: licenseKey,
35
+ license: (0, lodash_1.get)(process.env, 'APPSERVER_LICENSE', (0, lodash_1.get)(process.env, 'LICENSE_KEY', '')),
48
36
  cache: ((0, lodash_1.get)(process.env, 'PROJECT_CACHE', true).toString() === 'true'),
49
37
  status: {
50
38
  version: '8.0.0',
@@ -57,6 +45,7 @@ class Server extends appserver_core_1.Server {
57
45
  projectKey: (0, lodash_1.get)(process.env, 'PROJECT_KEY', ''),
58
46
  secret: (0, lodash_1.get)(process.env, 'JWT_SECRET', ''),
59
47
  expire: parseInt((0, lodash_1.get)(process.env, 'JWT_EXPIRE_TIME', 3600).toString(), 10),
48
+ loginForm: (0, lodash_1.get)(process.env, 'LOGIN_FORM', ''),
60
49
  oidc: {
61
50
  issuer: (0, lodash_1.get)(process.env, 'OIDC_ISSUER', ''),
62
51
  clientId: (0, lodash_1.get)(process.env, 'OIDC_CLIENT_ID', ''),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@formio/appserver",
3
- "version": "2.0.0-rc.31",
3
+ "version": "2.0.0-rc.34",
4
4
  "description": "A highly performant and extensible Application Server for Form.io Multi-Tenant Deployments.",
5
5
  "main": "lib/server.js",
6
6
  "types": "lib/server.d.ts",
@@ -21,15 +21,13 @@
21
21
  },
22
22
  "files": [
23
23
  "lib",
24
- "formio-appserver-core-*.tgz",
25
- "formio-core-*.tgz",
26
24
  "server.js",
27
25
  "package.json",
28
26
  "README.md"
29
27
  ],
30
28
  "homepage": "https://github.com/formio/appserver#readme",
31
29
  "dependencies": {
32
- "@formio/appserver-core": "2.0.0-rc.31",
30
+ "@formio/appserver-core": "2.0.0-rc.34",
33
31
  "@formio/core": "2.5.1-dev.291.98f47af",
34
32
  "async": "^3.2.6",
35
33
  "bcryptjs": "^3.0.2",