From 011c7df7985ade7fe96ef0b994d2673a1ae3c4db Mon Sep 17 00:00:00 2001 From: Gaurav Keshre Date: Fri, 10 Feb 2023 20:09:01 +0530 Subject: [PATCH] vorlon dashboard appearing --- Server/Scripts/vorlon.dashboard.ts | 2 +- Server/Scripts/vorlon.webServer.ts | 2 +- Server/config.json | 16 ---- package-lock.json | 130 +++++++++++++++++++++++------ package.json | 1 + 5 files changed, 108 insertions(+), 43 deletions(-) diff --git a/Server/Scripts/vorlon.dashboard.ts b/Server/Scripts/vorlon.dashboard.ts index cb9a8e79..0cdb4b8a 100644 --- a/Server/Scripts/vorlon.dashboard.ts +++ b/Server/Scripts/vorlon.dashboard.ts @@ -65,7 +65,7 @@ export module VORLON { authent = catalog.activateAuth; } - this._log.debug("authenticated " + authent); + //this._log.debug("authenticated " + authent); res.render('dashboard', { baseURL: this.baseURLConfig.baseURL, title: 'Dashboard', sessionid: req.params.sessionid, clientid: "", authenticated: authent, version: packageJson.version }); } } diff --git a/Server/Scripts/vorlon.webServer.ts b/Server/Scripts/vorlon.webServer.ts index 3d355ed8..3cc36c87 100644 --- a/Server/Scripts/vorlon.webServer.ts +++ b/Server/Scripts/vorlon.webServer.ts @@ -122,7 +122,7 @@ export module VORLON { app.use(this._bodyParser.urlencoded({ extended: false })); app.use(this._bodyParser.json()); app.use(this._cookieParser()); - app.use(this._multer()); + app.set(this._multer()); app.use(this._methodOverride()); app.use(this._session({ secret: '1th3is4is3as2e5cr6ec7t7keyf23or1or5lon5', diff --git a/Server/config.json b/Server/config.json index 98fec74a..0176a9cf 100644 --- a/Server/config.json +++ b/Server/config.json @@ -85,15 +85,6 @@ "nodeCompliant": true, "nodeOnly": true }, - { - "id": "BOTFRAMEWORKINSPECTOR", - "name": "Bot Framework Inspector", - "panel": "top", - "foldername": "botFrameworkInspector", - "enabled": true, - "nodeCompliant": true, - "nodeOnly": true - }, { "id": "EXPRESS", "name": "Express", @@ -103,13 +94,6 @@ "nodeCompliant": true, "nodeOnly": true }, - { - "id": "BABYLONINSPECTOR", - "name": "Babylon Inspector", - "panel": "top", - "foldername": "babylonInspector", - "enabled": false - }, { "id": "CONSOLE", "name": "Interactive Console", diff --git a/package-lock.json b/package-lock.json index dfce20dd..4c112241 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "minimist": "^1.2.7", "mkdirp": "^2.1.3", "mocha": "^10.2.0", + "multer": "^1.4.5-lts.1", "passport": "^0.6.0", "passport-local": "~1.0.0", "passport-twitter": "~1.0.4", @@ -368,6 +369,12 @@ "node": ">=0.10.0" } }, + "node_modules/append-field": { + "version": "1.0.0", + "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/append-field/-/append-field-1.0.0.tgz", + "integrity": "sha1-HjRA6RXwsSA9I3SOeO3XubW0PlY=", + "license": "MIT" + }, "node_modules/archy": { "version": "1.0.0", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/archy/-/archy-1.0.0.tgz", @@ -861,9 +868,19 @@ "version": "1.1.2", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U=", - "dev": true, "license": "MIT" }, + "node_modules/busboy": { + "version": "1.6.0", + "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha1-lm6japUC5DzbkUaWJSO5L1MfaJM=", + "dependencies": { + "streamsearch": "^1.1.0" + }, + "engines": { + "node": ">=10.16.0" + } + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/bytes/-/bytes-3.1.2.tgz", @@ -1325,7 +1342,6 @@ "version": "1.6.2", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=", - "dev": true, "engines": [ "node >= 0.8" ], @@ -1529,7 +1545,6 @@ "version": "1.0.3", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha1-pgQtNjTCsn6TKPg3uWX6yDgI24U=", - "dev": true, "license": "MIT" }, "node_modules/cors": { @@ -6412,6 +6427,36 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "license": "MIT" }, + "node_modules/multer": { + "version": "1.4.5-lts.1", + "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/multer/-/multer-1.4.5-lts.1.tgz", + "integrity": "sha1-gD4krRmE9Y7f+8efVuMFrsXP0aw=", + "license": "MIT", + "dependencies": { + "append-field": "^1.0.0", + "busboy": "^1.0.0", + "concat-stream": "^1.5.2", + "mkdirp": "^0.5.4", + "object-assign": "^4.1.1", + "type-is": "^1.6.4", + "xtend": "^4.0.0" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/multer/node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha1-fe8D0kMtyuS6HWEURcSDlgYiVfY=", + "license": "MIT", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, "node_modules/multimatch": { "version": "5.0.0", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/multimatch/-/multimatch-5.0.0.tgz", @@ -7448,7 +7493,6 @@ "version": "2.0.1", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=", - "dev": true, "license": "MIT" }, "node_modules/promise": { @@ -7631,7 +7675,6 @@ "version": "2.3.7", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/readable-stream/-/readable-stream-2.3.7.tgz", "integrity": "sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c=", - "dev": true, "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", @@ -7647,14 +7690,12 @@ "version": "1.0.0", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true, "license": "MIT" }, "node_modules/readable-stream/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=", - "dev": true, "license": "MIT" }, "node_modules/readdirp": { @@ -8777,6 +8818,14 @@ "node": ">= 6" } }, + "node_modules/streamsearch": { + "version": "1.1.0", + "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha1-QE3R4iR8qUr1VOhBqO8OqiONp2Q=", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/string_decoder/-/string_decoder-1.1.1.tgz", @@ -9411,7 +9460,6 @@ "version": "0.0.6", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true, "license": "MIT" }, "node_modules/typescript": { @@ -10092,7 +10140,6 @@ "version": "4.0.2", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/xtend/-/xtend-4.0.2.tgz", "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=", - "dev": true, "license": "MIT", "engines": { "node": ">=0.4" @@ -10457,6 +10504,11 @@ "buffer-equal": "^1.0.0" } }, + "append-field": { + "version": "1.0.0", + "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/append-field/-/append-field-1.0.0.tgz", + "integrity": "sha1-HjRA6RXwsSA9I3SOeO3XubW0PlY=" + }, "archy": { "version": "1.0.0", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/archy/-/archy-1.0.0.tgz", @@ -10803,8 +10855,15 @@ "buffer-from": { "version": "1.1.2", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U=", - "dev": true + "integrity": "sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U=" + }, + "busboy": { + "version": "1.6.0", + "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha1-lm6japUC5DzbkUaWJSO5L1MfaJM=", + "requires": { + "streamsearch": "^1.1.0" + } }, "bytes": { "version": "3.1.2", @@ -11154,7 +11213,6 @@ "version": "1.6.2", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=", - "dev": true, "requires": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -11302,8 +11360,7 @@ "core-util-is": { "version": "1.0.3", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha1-pgQtNjTCsn6TKPg3uWX6yDgI24U=", - "dev": true + "integrity": "sha1-pgQtNjTCsn6TKPg3uWX6yDgI24U=" }, "cors": { "version": "2.8.5", @@ -14860,6 +14917,30 @@ "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "multer": { + "version": "1.4.5-lts.1", + "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/multer/-/multer-1.4.5-lts.1.tgz", + "integrity": "sha1-gD4krRmE9Y7f+8efVuMFrsXP0aw=", + "requires": { + "append-field": "^1.0.0", + "busboy": "^1.0.0", + "concat-stream": "^1.5.2", + "mkdirp": "^0.5.4", + "object-assign": "^4.1.1", + "type-is": "^1.6.4", + "xtend": "^4.0.0" + }, + "dependencies": { + "mkdirp": { + "version": "0.5.6", + "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha1-fe8D0kMtyuS6HWEURcSDlgYiVfY=", + "requires": { + "minimist": "^1.2.6" + } + } + } + }, "multimatch": { "version": "5.0.0", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/multimatch/-/multimatch-5.0.0.tgz", @@ -15579,8 +15660,7 @@ "process-nextick-args": { "version": "2.0.1", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=", - "dev": true + "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=" }, "promise": { "version": "6.1.0", @@ -15716,7 +15796,6 @@ "version": "2.3.7", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/readable-stream/-/readable-stream-2.3.7.tgz", "integrity": "sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c=", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -15730,14 +15809,12 @@ "isarray": { "version": "1.0.0", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "safe-buffer": { "version": "5.1.2", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=", - "dev": true + "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" } } }, @@ -16571,6 +16648,11 @@ } } }, + "streamsearch": { + "version": "1.1.0", + "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha1-QE3R4iR8qUr1VOhBqO8OqiONp2Q=" + }, "string_decoder": { "version": "1.1.1", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/string_decoder/-/string_decoder-1.1.1.tgz", @@ -17039,8 +17121,7 @@ "typedarray": { "version": "0.0.6", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "typescript": { "version": "4.9.5", @@ -17529,8 +17610,7 @@ "xtend": { "version": "4.0.2", "resolved": "https://domoreexp.pkgs.visualstudio.com/_packaging/npm-mirror/npm/registry/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=", - "dev": true + "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=" }, "xtraverse": { "version": "0.1.0", diff --git a/package.json b/package.json index 20101530..8b02a8e1 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "minimist": "^1.2.7", "mkdirp": "^2.1.3", "mocha": "^10.2.0", + "multer": "^1.4.5-lts.1", "passport": "^0.6.0", "passport-local": "~1.0.0", "passport-twitter": "~1.0.4",