@formio/appserver 1.1.6 → 1.1.8

package/lib/modules/auth/auth.d.ts

@@ -0,0 +1,5 @@
+import { AuthModule, AuthToken } from '@formio/appserver-types';
+export declare class Auth implements AuthModule {
+    token(user: AuthToken, secret: string, expire?: number): Promise<string>;
+    user(token: string, secret: string): Promise<AuthToken | null>;
+}

package/lib/modules/auth/auth.js

@@ -0,0 +1,70 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Auth = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const debug = require('debug')('formio:auth');
+const error = require('debug')('formio:error');
+class Auth {
+    token(user, secret, expire = 240) {
+        return __awaiter(this, void 0, void 0, function* () {
+            user = Object.assign({}, user);
+            delete user.iat;
+            delete user.exp;
+            return new Promise((resolve, reject) => {
+                if (!secret) {
+                    return reject(new Error('You cannot generate a token without a secret!'));
+                }
+                debug('auth.token()', user);
+                jsonwebtoken_1.default.sign(user, secret, {
+                    expiresIn: expire * 60,
+                }, (err, signed) => {
+                    if (err) {
+                        error(err);
+                        return reject(err);
+                    }
+                    resolve(signed || '');
+                });
+            });
+        });
+    }
+    user(token, secret) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!token) {
+                return Promise.resolve(null);
+            }
+            return new Promise((resolve, reject) => {
+                if (!secret) {
+                    return reject('You cannot authenticate without a JWT Secret!');
+                }
+                debug('auth.verify()', token);
+                jsonwebtoken_1.default.verify(token, secret, (err, payload) => {
+                    if (err) {
+                        error(err);
+                        if (err.name === 'JsonWebTokenError') {
+                            return reject({ message: 'Bad Token' });
+                        }
+                        if (err.name === 'TokenExpiredError') {
+                            return reject({ message: 'Token Expired' });
+                        }
+                        return reject(err);
+                    }
+                    debug('auth.user()', payload);
+                    resolve(payload);
+                });
+            });
+        });
+    }
+}
+exports.Auth = Auth;

package/lib/modules/index.d.ts

@@ -0,0 +1,3 @@
+import { Database } from '@formio/appserver-db-mongodb';
+import { Auth } from '@formio/appserver-auth-jwt';
+export { Database, Auth };

package/lib/modules/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Auth = exports.Database = void 0;
+const appserver_db_mongodb_1 = require("@formio/appserver-db-mongodb");
+Object.defineProperty(exports, "Database", { enumerable: true, get: function () { return appserver_db_mongodb_1.Database; } });
+const appserver_auth_jwt_1 = require("@formio/appserver-auth-jwt");
+Object.defineProperty(exports, "Auth", { enumerable: true, get: function () { return appserver_auth_jwt_1.Auth; } });

package/lib/server.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="express" />
 import { Server as CoreServer } from '@formio/appserver-core';
-import { Auth } from "./auth";
-import { Database } from "./db";
+import { Database, Auth } from "./modules";
 import Actions from "./actions";
 import { Processor } from "./process";
 import { Prepper } from './prepare';

package/lib/server.js

@@ -14,14 +14,12 @@ if (!licenseKey) {
     }
     catch (err) {
         console.log('No license key found. Please set the LICENSE_KEY environment variable or create a license.txt file in the root of the project.');
-        process.exit();
     }
 }
 const appserver_core_1 = require("@formio/appserver-core");
-const auth_1 = require("./auth");
-Object.defineProperty(exports, "Auth", { enumerable: true, get: function () { return auth_1.Auth; } });
-const db_1 = require("./db");
-Object.defineProperty(exports, "Database", { enumerable: true, get: function () { return db_1.Database; } });
+const modules_1 = require("./modules");
+Object.defineProperty(exports, "Database", { enumerable: true, get: function () { return modules_1.Database; } });
+Object.defineProperty(exports, "Auth", { enumerable: true, get: function () { return modules_1.Auth; } });
 const actions_1 = __importDefault(require("./actions"));
 exports.Actions = actions_1.default;
 const process_1 = require("./process");
@@ -35,8 +33,8 @@ const packageJson = require('../package.json');
 const appCorePackage = require('@formio/appserver-core/package.json');
 const corePackage = require('@formio/core');
 exports.Modules = {
-    db: db_1.Database,
-    auth: auth_1.Auth,
+    db: modules_1.Database,
+    auth: modules_1.Auth,
     processor: process_1.Processor,
     prepper: prepare_1.Prepper,
     actions: actions_1.default
@@ -54,7 +52,7 @@ class Server extends appserver_core_1.Server {
         }
         super({
             db: config.db || new exports.Modules.db({
-                url: (0, get_1.default)(process.env, 'MONGO', "mongodb://localhost:27017/subserver"),
+                url: (0, get_1.default)(process.env, 'MONGO', "mongodb://localhost:27017/appserver"),
                 config: (0, get_1.default)(process.env, 'MONGO_CONFIG', "{}")
             }),
             processor: exports.Modules.processor,

package/lib/types/server.d.ts

@@ -1,5 +1,6 @@
 import { FormScope } from "./form";
 import { PrepScope, ProcessScope } from "./submission";
+import { OfflineLicenseStruct } from '@formio/license';
 export interface ProjectConfig {
     url: string;
     key: string;
@@ -37,6 +38,8 @@ export interface ServerConfig {
 }
 export interface DBConfig {
     url: string;
+    ttl?: number;
+    dropOnConnect?: boolean;
     config: any;
 }
 export interface ServerDB {
@@ -60,12 +63,6 @@ export interface AuthModule {
     token: (user: AuthToken, secret: string, expire: number) => Promise<string>;
     user: (token: string, secret: string) => Promise<AuthToken | null>;
 }
-export interface LicenseTerms {
-    serverless: string[];
-}
-export interface LicenseKey {
-    terms: LicenseTerms;
-}
 export interface Processor {
     processors: Array<(scope: ProcessScope) => Promise<any[]>>;
     process: (scope: ProcessScope) => Promise<any>;
@@ -91,7 +88,7 @@ export interface ServerScope {
     utils?: any;
     util?: any;
     hook?: (name: string, ...args: any[]) => void;
-    licenseKey?: LicenseKey;
+    licenseKey?: OfflineLicenseStruct;
 }
 export interface AppServerScope {
     config?: ServerConfig;

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@formio/appserver",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "A highly performant and extensible Application Server for Form.io Multi-Tenant Deployments.",
   "main": "server.js",
   "scripts": {
-    "build": "cd src/types && npm run build && cd ../.. && tsc",
+    "build:types": "cd src/types && npm run build && cd ../..",
+    "build:db": "cd src/modules/db && npm run build && cd ../../..",
+    "build:auth": "cd src/modules/auth && npm run build && cd ../../..",
+    "build:modules": "npm run build:db && npm run build:auth",
+    "build": "npm run build:types && npm run build:modules && tsc",
     "test": "mocha -r ts-node/register 'src/**/*.spec.ts'",
     "prepack": "npm run build"
   },
@@ -25,16 +29,17 @@
   ],
   "homepage": "https://github.com/formio/appserver#readme",
   "dependencies": {
-    "@formio/appserver-core": "^1.3.5",
-    "@formio/appserver-types": "^1.2.3",
+    "@formio/appserver-auth-jwt": "^1.0.1",
+    "@formio/appserver-core": "^1.3.7",
+    "@formio/appserver-db-mongodb": "^1.0.4",
+    "@formio/appserver-types": "^1.2.5",
     "async": "^3.2.4",
     "bcryptjs": "^2.4.3",
     "debug": "^4.3.4",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "jsonwebtoken": "^9.0.0",
-    "lodash": "^4.17.21",
-    "mongodb": "^5.4.0"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@types/async": "^3.2.20",