From bba48f455eb1a9c8a9b77a78c3d948997330c798 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 10 Jul 2025 11:00:31 +0200 Subject: [PATCH] use @connect-lastmile --- package-lock.json | 13 +++++++------ package.json | 2 +- setup/start/systemd/box.service | 2 +- src/boxerror.js | 2 +- src/dockerproxy.js | 2 +- src/middleware/index.js | 2 +- src/oidcserver.js | 2 +- src/proxyauth.js | 4 ++-- src/routes/accesscontrol.js | 2 +- src/routes/applinks.js | 4 ++-- src/routes/apppasswords.js | 4 ++-- src/routes/apps.js | 4 ++-- src/routes/appstore.js | 2 +- src/routes/archives.js | 4 ++-- src/routes/auth.js | 4 ++-- src/routes/backups.js | 4 ++-- src/routes/branding.js | 4 ++-- src/routes/cloudron.js | 4 ++-- src/routes/dashboard.js | 4 ++-- src/routes/directoryserver.js | 4 ++-- src/routes/dockerregistries.js | 4 ++-- src/routes/domains.js | 4 ++-- src/routes/eventlog.js | 4 ++-- src/routes/externalldap.js | 4 ++-- src/routes/filemanager.js | 2 +- src/routes/groups.js | 4 ++-- src/routes/mail.js | 4 ++-- src/routes/mailserver.js | 4 ++-- src/routes/network.js | 4 ++-- src/routes/notifications.js | 4 ++-- src/routes/oidcclients.js | 4 ++-- src/routes/profile.js | 4 ++-- src/routes/provision.js | 4 ++-- src/routes/reverseproxy.js | 4 ++-- src/routes/services.js | 4 ++-- src/routes/support.js | 4 ++-- src/routes/system.js | 4 ++-- src/routes/tasks.js | 4 ++-- src/routes/tokens.js | 4 ++-- src/routes/updater.js | 4 ++-- src/routes/user-directory.js | 4 ++-- src/routes/users.js | 4 ++-- src/routes/volumes.js | 4 ++-- src/routes/wellknown.js | 2 +- src/server.js | 2 +- 45 files changed, 84 insertions(+), 83 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0a73af2a6..cc4393804 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "@aws-sdk/client-route-53": "^3.825.0", "@aws-sdk/client-s3": "^3.825.0", "@aws-sdk/lib-storage": "^3.825.0", + "@cloudron/connect-lastmile": "^2.2.1", "@cloudron/superagent": "^1.0.0", "@google-cloud/dns": "^5.2.0", "@google-cloud/storage": "^7.16.0", @@ -20,7 +21,6 @@ "async": "^3.2.6", "cloudron-manifestformat": "^5.27.0", "connect": "^3.7.0", - "connect-lastmile": "^2.2.0", "connect-timeout": "^1.9.0", "cookie-parser": "^1.4.7", "cookie-session": "^2.1.0", @@ -1083,6 +1083,12 @@ "version": "1.0.2", "license": "Apache-2.0" }, + "node_modules/@cloudron/connect-lastmile": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@cloudron/connect-lastmile/-/connect-lastmile-2.2.1.tgz", + "integrity": "sha512-hi5AcFHQNu0HrJM32vCq3kyEv4qJfAUgU6XSCCOYQ/E+CLQzz9VTH6gqx0kmQpsVtwV5ji6nVGONHTj7MHu1Og==", + "license": "MIT" + }, "node_modules/@cloudron/superagent": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@cloudron/superagent/-/superagent-1.0.0.tgz", @@ -3450,11 +3456,6 @@ "node": ">= 0.10.0" } }, - "node_modules/connect-lastmile": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/connect-lastmile/-/connect-lastmile-2.2.0.tgz", - "integrity": "sha512-n7QTT2QTM02g0ZlAP3RjETikmltWdW9CD3xrVhvsC15wIFHBZgC1aMtUkRzxI/2d7l4TKXQ98LnOIMuhXhkHFw==" - }, "node_modules/connect-timeout": { "version": "1.9.0", "license": "MIT", diff --git a/package.json b/package.json index 8bcb0bd1f..4b69b92d9 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "@aws-sdk/client-route-53": "^3.825.0", "@aws-sdk/client-s3": "^3.825.0", "@aws-sdk/lib-storage": "^3.825.0", + "@cloudron/connect-lastmile": "^2.2.1", "@cloudron/superagent": "^1.0.0", "@google-cloud/dns": "^5.2.0", "@google-cloud/storage": "^7.16.0", @@ -24,7 +25,6 @@ "async": "^3.2.6", "cloudron-manifestformat": "^5.27.0", "connect": "^3.7.0", - "connect-lastmile": "^2.2.0", "connect-timeout": "^1.9.0", "cookie-parser": "^1.4.7", "cookie-session": "^2.1.0", diff --git a/setup/start/systemd/box.service b/setup/start/systemd/box.service index 140205228..91325d653 100644 --- a/setup/start/systemd/box.service +++ b/setup/start/systemd/box.service @@ -17,7 +17,7 @@ ExecStart=/home/yellowtent/box/box.js ExecReload=/bin/kill -HUP $MAINPID ; we run commands like df which will parse properly only with correct locale ; add "oidc-provider:*" to DEBUG for OpenID debugging -Environment="HOME=/home/yellowtent" "USER=yellowtent" "DEBUG=box:*,connect-lastmile,-box:ldap" "BOX_ENV=cloudron" "NODE_ENV=production" "LC_ALL=C" +Environment="HOME=/home/yellowtent" "USER=yellowtent" "DEBUG=box:*,@cloudron/connect-lastmile,-box:ldap" "BOX_ENV=cloudron" "NODE_ENV=production" "LC_ALL=C" ; this sends the main process SIGTERM and then if anything lingers to the control-group . this is also the case if the main process crashes. ; the box code handles SIGTERM and cleanups the tasks KillMode=mixed diff --git a/src/boxerror.js b/src/boxerror.js index c4994e47b..530c8cd06 100644 --- a/src/boxerror.js +++ b/src/boxerror.js @@ -3,7 +3,7 @@ 'use strict'; const assert = require('assert'), - HttpError = require('connect-lastmile').HttpError, + HttpError = require('@cloudron/connect-lastmile').HttpError, util = require('util'); exports = module.exports = BoxError; diff --git a/src/dockerproxy.js b/src/dockerproxy.js index b366759e4..f34716486 100644 --- a/src/dockerproxy.js +++ b/src/dockerproxy.js @@ -11,7 +11,7 @@ const apps = require('./apps.js'), express = require('express'), debug = require('debug')('box:dockerproxy'), http = require('http'), - HttpError = require('connect-lastmile').HttpError, + HttpError = require('@cloudron/connect-lastmile').HttpError, middleware = require('./middleware'), net = require('net'), path = require('path'), diff --git a/src/middleware/index.js b/src/middleware/index.js index 7abc815d9..1039252d8 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -4,7 +4,7 @@ exports = module.exports = { cookieParser: require('cookie-parser'), cors: require('./cors.js'), json: require('./json.js'), - lastMile: require('connect-lastmile'), + lastMile: require('@cloudron/connect-lastmile'), multipart: require('./multipart.js'), timeout: require('connect-timeout') }; diff --git a/src/oidcserver.js b/src/oidcserver.js index d463eae32..3208c3f00 100644 --- a/src/oidcserver.js +++ b/src/oidcserver.js @@ -29,7 +29,7 @@ const assert = require('assert'), path = require('path'), paths = require('./paths.js'), http = require('http'), - HttpError = require('connect-lastmile').HttpError, + HttpError = require('@cloudron/connect-lastmile').HttpError, jose = require('jose'), safe = require('safetydance'), settings = require('./settings.js'), diff --git a/src/proxyauth.js b/src/proxyauth.js index 299e17c31..d8dd643fb 100644 --- a/src/proxyauth.js +++ b/src/proxyauth.js @@ -16,8 +16,8 @@ const apps = require('./apps.js'), express = require('express'), hat = require('./hat.js'), http = require('http'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, jwt = require('jsonwebtoken'), middleware = require('./middleware'), oidcServer = require('./oidcserver.js'), diff --git a/src/routes/accesscontrol.js b/src/routes/accesscontrol.js index b76c81aaa..6fd30efbb 100644 --- a/src/routes/accesscontrol.js +++ b/src/routes/accesscontrol.js @@ -12,7 +12,7 @@ const apps = require('../apps.js'), tokens = require('../tokens.js'), assert = require('assert'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, + HttpError = require('@cloudron/connect-lastmile').HttpError, safe = require('safetydance'), users = require('../users.js'); diff --git a/src/routes/applinks.js b/src/routes/applinks.js index e60eed88f..566fe8aad 100644 --- a/src/routes/applinks.js +++ b/src/routes/applinks.js @@ -15,8 +15,8 @@ const assert = require('assert'), applinks = require('../applinks.js'), BoxError = require('../boxerror.js'), safe = require('safetydance'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess; + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess; async function load(req, res, next) { assert.strictEqual(typeof req.params.id, 'string'); diff --git a/src/routes/apppasswords.js b/src/routes/apppasswords.js index fb9c9afbe..6011c8b07 100644 --- a/src/routes/apppasswords.js +++ b/src/routes/apppasswords.js @@ -10,8 +10,8 @@ exports = module.exports = { const appPasswords = require('../apppasswords.js'), assert = require('assert'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function get(req, res, next) { diff --git a/src/routes/apps.js b/src/routes/apps.js index cbd16061a..002c4a3e7 100644 --- a/src/routes/apps.js +++ b/src/routes/apps.js @@ -78,8 +78,8 @@ const apps = require('../apps.js'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), debug = require('debug')('box:routes/apps'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, metrics = require('../metrics.js'), safe = require('safetydance'), updater = require('../updater.js'), diff --git a/src/routes/appstore.js b/src/routes/appstore.js index d96444256..591f1f372 100644 --- a/src/routes/appstore.js +++ b/src/routes/appstore.js @@ -14,7 +14,7 @@ const appstore = require('../appstore.js'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), dashboard = require('../dashboard.js'), - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'), users = require('../users.js'), _ = require('../underscore.js'); diff --git a/src/routes/archives.js b/src/routes/archives.js index 2a06f710d..800dabc52 100644 --- a/src/routes/archives.js +++ b/src/routes/archives.js @@ -15,8 +15,8 @@ const apps = require('../apps.js'), archives = require('../archives.js'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function load(req, res, next) { diff --git a/src/routes/auth.js b/src/routes/auth.js index 7b01cfade..5ab70c09e 100644 --- a/src/routes/auth.js +++ b/src/routes/auth.js @@ -17,8 +17,8 @@ const assert = require('assert'), constants = require('../constants.js'), debug = require('debug')('box:routes/cloudron'), eventlog = require('../eventlog.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, oidcClients = require('../oidcclients.js'), safe = require('safetydance'), speakeasy = require('speakeasy'), diff --git a/src/routes/backups.js b/src/routes/backups.js index 7b932d271..358a6e14a 100644 --- a/src/routes/backups.js +++ b/src/routes/backups.js @@ -20,8 +20,8 @@ const assert = require('assert'), AuditSource = require('../auditsource.js'), backups = require('../backups.js'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function list(req, res, next) { diff --git a/src/routes/branding.js b/src/routes/branding.js index 6db8e5a81..e638e7128 100644 --- a/src/routes/branding.js +++ b/src/routes/branding.js @@ -16,8 +16,8 @@ const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), branding = require('../branding.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function getFooter(req, res, next) { diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js index 89f50763a..298856ac7 100644 --- a/src/routes/cloudron.js +++ b/src/routes/cloudron.js @@ -14,8 +14,8 @@ exports = module.exports = { const assert = require('assert'), BoxError = require('../boxerror.js'), cloudron = require('../cloudron.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'), translations = require('../translations.js'); diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js index 66c607379..13c3238b5 100644 --- a/src/routes/dashboard.js +++ b/src/routes/dashboard.js @@ -11,8 +11,8 @@ const AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), constants = require('../constants.js'), dashboard = require('../dashboard.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function getConfig(req, res, next) { diff --git a/src/routes/directoryserver.js b/src/routes/directoryserver.js index d13a8ddf5..f092bddda 100644 --- a/src/routes/directoryserver.js +++ b/src/routes/directoryserver.js @@ -9,8 +9,8 @@ const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), directoryServer = require('../directoryserver.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function getConfig(req, res, next) { diff --git a/src/routes/dockerregistries.js b/src/routes/dockerregistries.js index 6ae41a0d4..698e6d834 100644 --- a/src/routes/dockerregistries.js +++ b/src/routes/dockerregistries.js @@ -13,8 +13,8 @@ const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), dockerRegistries = require('../dockerregistries.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function load(req, res, next) { diff --git a/src/routes/domains.js b/src/routes/domains.js index 920b0520d..56c7922e8 100644 --- a/src/routes/domains.js +++ b/src/routes/domains.js @@ -17,8 +17,8 @@ const assert = require('assert'), BoxError = require('../boxerror.js'), dns = require('../dns.js'), domains = require('../domains.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function add(req, res, next) { diff --git a/src/routes/eventlog.js b/src/routes/eventlog.js index 55e569092..f313d7757 100644 --- a/src/routes/eventlog.js +++ b/src/routes/eventlog.js @@ -7,8 +7,8 @@ exports = module.exports = { const BoxError = require('../boxerror.js'), eventlog = require('../eventlog.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function get(req, res, next) { diff --git a/src/routes/externalldap.js b/src/routes/externalldap.js index 399447484..a5658be87 100644 --- a/src/routes/externalldap.js +++ b/src/routes/externalldap.js @@ -10,8 +10,8 @@ const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), externalLdap = require('../externalldap.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function sync(req, res, next) { diff --git a/src/routes/filemanager.js b/src/routes/filemanager.js index 2babbeda9..7bb6b3054 100644 --- a/src/routes/filemanager.js +++ b/src/routes/filemanager.js @@ -7,7 +7,7 @@ exports = module.exports = { const assert = require('assert'), BoxError = require('../boxerror.js'), http = require('http'), - HttpError = require('connect-lastmile').HttpError, + HttpError = require('@cloudron/connect-lastmile').HttpError, safe = require('safetydance'), services = require('../services.js'); diff --git a/src/routes/groups.js b/src/routes/groups.js index 8e15b8748..78656f199 100644 --- a/src/routes/groups.js +++ b/src/routes/groups.js @@ -16,8 +16,8 @@ const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), groups = require('../groups.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function load(req, res, next) { diff --git a/src/routes/mail.js b/src/routes/mail.js index ff4c7c4f2..341d7067c 100644 --- a/src/routes/mail.js +++ b/src/routes/mail.js @@ -35,8 +35,8 @@ const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), mail = require('../mail.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function getDomain(req, res, next) { diff --git a/src/routes/mailserver.js b/src/routes/mailserver.js index 6602067d3..0c8c9f8c0 100644 --- a/src/routes/mailserver.js +++ b/src/routes/mailserver.js @@ -14,8 +14,8 @@ const assert = require('assert'), BoxError = require('../boxerror.js'), debug = require('debug')('box:routes/mailserver'), http = require('http'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, mailServer = require('../mailserver.js'), safe = require('safetydance'), services = require('../services.js'); diff --git a/src/routes/network.js b/src/routes/network.js index e1846cb9d..c47f05105 100644 --- a/src/routes/network.js +++ b/src/routes/network.js @@ -20,8 +20,8 @@ exports = module.exports = { const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, network = require('../network.js'), safe = require('safetydance'); diff --git a/src/routes/notifications.js b/src/routes/notifications.js index cbe4b485c..4643b0566 100644 --- a/src/routes/notifications.js +++ b/src/routes/notifications.js @@ -9,8 +9,8 @@ exports = module.exports = { const assert = require('assert'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, notifications = require('../notifications.js'), safe = require('safetydance'); diff --git a/src/routes/oidcclients.js b/src/routes/oidcclients.js index 17715f2e2..98590b656 100644 --- a/src/routes/oidcclients.js +++ b/src/routes/oidcclients.js @@ -12,8 +12,8 @@ exports = module.exports = { const assert = require('assert'), BoxError = require('../boxerror.js'), oidcClients = require('../oidcclients.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function add(req, res, next) { diff --git a/src/routes/profile.js b/src/routes/profile.js index bdfdce214..ba7df903f 100644 --- a/src/routes/profile.js +++ b/src/routes/profile.js @@ -23,8 +23,8 @@ exports = module.exports = { const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, oidcServer = require('../oidcserver.js'), safe = require('safetydance'), tokens = require('../tokens.js'), diff --git a/src/routes/provision.js b/src/routes/provision.js index 1a83791b9..faf272eb6 100644 --- a/src/routes/provision.js +++ b/src/routes/provision.js @@ -14,8 +14,8 @@ exports = module.exports = { const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, network = require('../network.js'), provision = require('../provision.js'), safe = require('safetydance'), diff --git a/src/routes/reverseproxy.js b/src/routes/reverseproxy.js index d2b9acfe1..5e423af38 100644 --- a/src/routes/reverseproxy.js +++ b/src/routes/reverseproxy.js @@ -10,8 +10,8 @@ exports = module.exports = { const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, reverseProxy = require('../reverseproxy.js'), safe = require('safetydance'); diff --git a/src/routes/services.js b/src/routes/services.js index b59a5edd7..3a7d634ad 100644 --- a/src/routes/services.js +++ b/src/routes/services.js @@ -15,8 +15,8 @@ exports = module.exports = { const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, metrics = require('../metrics.js'), platform = require('../platform.js'), safe = require('safetydance'), diff --git a/src/routes/support.js b/src/routes/support.js index ddb7f6a71..9c8604a64 100644 --- a/src/routes/support.js +++ b/src/routes/support.js @@ -7,8 +7,8 @@ exports = module.exports = { const assert = require('assert'), AuditSource = require('../auditsource.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'), support = require('../support.js'); diff --git a/src/routes/system.js b/src/routes/system.js index 0bb454d2d..02f763fd2 100644 --- a/src/routes/system.js +++ b/src/routes/system.js @@ -16,8 +16,8 @@ exports = module.exports = { const assert = require('assert'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, metrics = require('../metrics.js'), safe = require('safetydance'), system = require('../system.js'); diff --git a/src/routes/tasks.js b/src/routes/tasks.js index b34a10c54..131a889a7 100644 --- a/src/routes/tasks.js +++ b/src/routes/tasks.js @@ -13,8 +13,8 @@ exports = module.exports = { const assert = require('assert'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'), tasks = require('../tasks.js'); diff --git a/src/routes/tokens.js b/src/routes/tokens.js index e3fd998c8..fcaaf8d8b 100644 --- a/src/routes/tokens.js +++ b/src/routes/tokens.js @@ -10,8 +10,8 @@ exports = module.exports = { const assert = require('assert'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, oidcClients = require('../oidcclients.js'), safe = require('safetydance'), tokens = require('../tokens.js'); diff --git a/src/routes/updater.js b/src/routes/updater.js index 870fb8da2..dd49191e7 100644 --- a/src/routes/updater.js +++ b/src/routes/updater.js @@ -13,8 +13,8 @@ exports = module.exports = { const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'), updater = require('../updater.js'); diff --git a/src/routes/user-directory.js b/src/routes/user-directory.js index 99bbce41c..dc4563731 100644 --- a/src/routes/user-directory.js +++ b/src/routes/user-directory.js @@ -8,8 +8,8 @@ exports = module.exports = { const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'), userDirectory = require('../user-directory.js'); diff --git a/src/routes/users.js b/src/routes/users.js index d00c959c7..42b3df412 100644 --- a/src/routes/users.js +++ b/src/routes/users.js @@ -32,8 +32,8 @@ const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), groups = require('../groups.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'), users = require('../users.js'), _ = require('../underscore.js'); diff --git a/src/routes/volumes.js b/src/routes/volumes.js index 3f59bc00c..a7dbf4fe6 100644 --- a/src/routes/volumes.js +++ b/src/routes/volumes.js @@ -15,8 +15,8 @@ const assert = require('assert'), AuditSource = require('../auditsource.js'), BoxError = require('../boxerror.js'), volumes = require('../volumes.js'), - HttpError = require('connect-lastmile').HttpError, - HttpSuccess = require('connect-lastmile').HttpSuccess, + HttpError = require('@cloudron/connect-lastmile').HttpError, + HttpSuccess = require('@cloudron/connect-lastmile').HttpSuccess, safe = require('safetydance'); async function load(req, res, next) { diff --git a/src/routes/wellknown.js b/src/routes/wellknown.js index 94000ec2a..4af9fb4fa 100644 --- a/src/routes/wellknown.js +++ b/src/routes/wellknown.js @@ -4,7 +4,7 @@ exports = module.exports = { get }; -const HttpError = require('connect-lastmile').HttpError, +const HttpError = require('@cloudron/connect-lastmile').HttpError, safe = require('safetydance'), wellknown = require('../wellknown.js'); diff --git a/src/server.js b/src/server.js index 8da282131..c4e71d675 100644 --- a/src/server.js +++ b/src/server.js @@ -12,7 +12,7 @@ const assert = require('assert'), eventlog = require('./eventlog.js'), express = require('express'), http = require('http'), - HttpError = require('connect-lastmile').HttpError, + HttpError = require('@cloudron/connect-lastmile').HttpError, middleware = require('./middleware'), platform = require('./platform.js'), routes = require('./routes/index.js'),