@internxt/cli 1.6.2 → 1.6.4

package/dist/webdav/webdav-server.js

@@ -15,13 +15,9 @@ const auth_middleware_1 = require("./middewares/auth.middleware");
 const request_logger_middleware_1 = require("./middewares/request-logger.middleware");
 const GET_handler_1 = require("./handlers/GET.handler");
 const HEAD_handler_1 = require("./handlers/HEAD.handler");
-const download_service_1 = require("../services/network/download.service");
-const auth_service_1 = require("../services/auth.service");
-const crypto_service_1 = require("../services/crypto.service");
 const errors_middleware_1 = require("./middewares/errors.middleware");
 const express_async_handler_1 = __importDefault(require("express-async-handler"));
 const sdk_manager_service_1 = require("../services/sdk-manager.service");
-const network_facade_service_1 = require("../services/network/network-facade.service");
 const network_utils_1 = require("../utils/network.utils");
 const PUT_handler_1 = require("./handlers/PUT.handler");
 const MKCOL_handler_1 = require("./handlers/MKCOL.handler");
@@ -29,48 +25,16 @@ const DELETE_handler_1 = require("./handlers/DELETE.handler");
 const PROPPATCH_handler_1 = require("./handlers/PROPPATCH.handler");
 const MOVE_handler_1 = require("./handlers/MOVE.handler");
 const COPY_handler_1 = require("./handlers/COPY.handler");
-const inxt_js_1 = require("@internxt/inxt-js");
 const mkcol_middleware_1 = require("./middewares/mkcol.middleware");
-const webdav_folder_service_1 = require("./services/webdav-folder.service");
+const webdav_auth_middleware_1 = require("./middewares/webdav-auth.middleware");
 class WebDavServer {
     app;
-    configService;
-    driveFileService;
-    driveFolderService;
-    downloadService;
-    authService;
-    cryptoService;
-    trashService;
-    constructor(app, configService, driveFileService, driveFolderService, downloadService, authService, cryptoService, trashService) {
+    constructor(app) {
         this.app = app;
-        this.configService = configService;
-        this.driveFileService = driveFileService;
-        this.driveFolderService = driveFolderService;
-        this.downloadService = downloadService;
-        this.authService = authService;
-        this.cryptoService = cryptoService;
-        this.trashService = trashService;
     }
-    getNetworkFacade = async () => {
-        const credentials = await this.configService.readUser();
-        if (!credentials)
-            throw new Error('Credentials not found in Config service, do login first');
-        const networkModule = sdk_manager_service_1.SdkManager.instance.getNetwork({
-            user: credentials.user.bridgeUser,
-            pass: credentials.user.userId,
-        });
-        const environment = new inxt_js_1.Environment({
-            bridgeUser: credentials.user.bridgeUser,
-            bridgePass: credentials.user.userId,
-            bridgeUrl: config_service_1.ConfigService.instance.get('NETWORK_URL'),
-            encryptionKey: credentials.user.mnemonic,
-            appDetails: sdk_manager_service_1.SdkManager.getAppDetails(),
-        });
-        const networkFacade = new network_facade_service_1.NetworkFacade(networkModule, environment, download_service_1.DownloadService.instance, crypto_service_1.CryptoService.instance);
-        return networkFacade;
-    };
-    registerStartMiddlewares = () => {
-        this.app.use((0, auth_middleware_1.AuthMiddleware)(auth_service_1.AuthService.instance));
+    registerStartMiddlewares = (configs) => {
+        this.app.use((0, webdav_auth_middleware_1.WebDAVAuthMiddleware)(configs));
+        this.app.use((0, auth_middleware_1.AuthMiddleware)());
         this.app.use((0, request_logger_middleware_1.RequestLoggerMiddleware)({
             enable: true,
         }));
@@ -80,58 +44,35 @@ class WebDavServer {
     registerEndMiddleWares = () => {
         this.app.use(errors_middleware_1.ErrorHandlingMiddleware);
     };
-    registerHandlers = async () => {
+    registerHandlers = () => {
         const serverListenPath = /(.*)/;
-        const networkFacade = await this.getNetworkFacade();
-        const webDavFolderService = new webdav_folder_service_1.WebDavFolderService({
-            driveFolderService: this.driveFolderService,
-            configService: this.configService,
-        });
-        this.app.head(serverListenPath, (0, express_async_handler_1.default)(new HEAD_handler_1.HEADRequestHandler({
-            driveFileService: this.driveFileService,
-        }).handle));
-        this.app.get(serverListenPath, (0, express_async_handler_1.default)(new GET_handler_1.GETRequestHandler({
-            driveFileService: this.driveFileService,
-            downloadService: this.downloadService,
-            cryptoService: this.cryptoService,
-            authService: this.authService,
-            networkFacade: networkFacade,
-        }).handle));
+        this.app.head(serverListenPath, (0, express_async_handler_1.default)(new HEAD_handler_1.HEADRequestHandler().handle));
+        this.app.get(serverListenPath, (0, express_async_handler_1.default)(new GET_handler_1.GETRequestHandler().handle));
         this.app.options(serverListenPath, (0, express_async_handler_1.default)(new OPTIONS_handler_1.OPTIONSRequestHandler().handle));
-        this.app.propfind(serverListenPath, (0, express_async_handler_1.default)(new PROPFIND_handler_1.PROPFINDRequestHandler({
-            driveFileService: this.driveFileService,
-            driveFolderService: this.driveFolderService,
-        }).handle));
-        this.app.put(serverListenPath, (0, express_async_handler_1.default)(new PUT_handler_1.PUTRequestHandler({
-            driveFileService: this.driveFileService,
-            driveFolderService: this.driveFolderService,
-            webDavFolderService: webDavFolderService,
-            authService: this.authService,
-            trashService: this.trashService,
-            networkFacade: networkFacade,
-        }).handle));
-        this.app.mkcol(serverListenPath, (0, express_async_handler_1.default)(new MKCOL_handler_1.MKCOLRequestHandler({
-            driveFolderService: this.driveFolderService,
-            webDavFolderService: webDavFolderService,
-        }).handle));
-        this.app.delete(serverListenPath, (0, express_async_handler_1.default)(new DELETE_handler_1.DELETERequestHandler({
-            trashService: this.trashService,
-            driveFileService: this.driveFileService,
-            driveFolderService: this.driveFolderService,
-        }).handle));
+        this.app.propfind(serverListenPath, (0, express_async_handler_1.default)(new PROPFIND_handler_1.PROPFINDRequestHandler().handle));
+        this.app.put(serverListenPath, (0, express_async_handler_1.default)(new PUT_handler_1.PUTRequestHandler().handle));
+        this.app.mkcol(serverListenPath, (0, express_async_handler_1.default)(new MKCOL_handler_1.MKCOLRequestHandler().handle));
+        this.app.delete(serverListenPath, (0, express_async_handler_1.default)(new DELETE_handler_1.DELETERequestHandler().handle));
         this.app.proppatch(serverListenPath, (0, express_async_handler_1.default)(new PROPPATCH_handler_1.PROPPATCHRequestHandler().handle));
-        this.app.move(serverListenPath, (0, express_async_handler_1.default)(new MOVE_handler_1.MOVERequestHandler({
-            driveFolderService: this.driveFolderService,
-            driveFileService: this.driveFileService,
-            webDavFolderService,
-        }).handle));
+        this.app.move(serverListenPath, (0, express_async_handler_1.default)(new MOVE_handler_1.MOVERequestHandler().handle));
         this.app.copy(serverListenPath, (0, express_async_handler_1.default)(new COPY_handler_1.COPYRequestHandler().handle));
     };
+    static checkwebDAVCredentials = (configs) => {
+        if (configs.customAuth) {
+            if (!configs.username?.trim()) {
+                throw new Error('WebDAV CustomAuth is enabled but no username was provided.');
+            }
+            if (!configs.password?.trim()) {
+                throw new Error('WebDAV CustomAuth is enabled but no password was provided.');
+            }
+        }
+    };
     start = async () => {
-        const configs = await this.configService.readWebdavConfig();
+        const configs = await config_service_1.ConfigService.instance.readWebdavConfig();
+        WebDavServer.checkwebDAVCredentials(configs);
         this.app.disable('x-powered-by');
-        this.registerStartMiddlewares();
-        await this.registerHandlers();
+        this.registerStartMiddlewares(configs);
+        this.registerHandlers();
         this.registerEndMiddleWares();
         const plainHttp = configs.protocol === 'http';
         let server;
@@ -145,7 +86,8 @@ class WebDavServer {
         server.requestTimeout = configs.timeoutMinutes * 60 * 1000;
         server.listen(Number(configs.port), configs.host, undefined, () => {
             logger_utils_1.webdavLogger.info(`Internxt ${sdk_manager_service_1.SdkManager.getAppDetails().clientVersion} WebDav server ` +
-                `listening at ${configs.protocol}://${configs.host}:${configs.port}`);
+                `listening at ${configs.protocol}://${configs.host}:${configs.port}` +
+                `${configs.customAuth ? ' (with custom authentication)' : ''}`);
         });
     };
 }