fixed path join for windows

internxt · Mar 14, 2024 · e594cb1 · e594cb1
1 parent 3b57d96
commit e594cb1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/src/services/realms/drive-realm-manager.service.ts b/src/services/realms/drive-realm-manager.service.ts
@@ -1,7 +1,7 @@
-import path from 'path';
 import { DriveFileItem, DriveFolderItem } from '../../types/drive.types';
 import { DriveFileRealmSchema, DriveFilesRealm } from './drive-files.realm';
 import { DriveFolderRealmSchema, DriveFoldersRealm } from './drive-folders.realm';
+import { WebDavUtils } from '../../utils/webdav.utils';
 
 export class DriveRealmManager {
   constructor(
@@ -40,23 +40,23 @@ export class DriveRealmManager {
     const parentFolder = await this.driveFoldersRealm.findByParentId(parentId);
 
     if (!parentFolder) {
-      return path.join('/', fileName);
+      return WebDavUtils.joinPath('/', fileName);
     }
 
     const parentPath = await this.buildRelativePathForFile(parentFolder.name, parentFolder.parent_id ?? null);
 
-    return path.join(parentPath, fileName);
+    return WebDavUtils.joinPath(parentPath, fileName);
   }
 
   async buildRelativePathForFolder(folderName: string, parentId: number | null): Promise<string> {
     const parentFolder = await this.driveFoldersRealm.findByParentId(parentId);
 
     if (!parentFolder) {
-      return path.join('/', folderName, '/');
+      return WebDavUtils.joinPath('/', folderName, '/');
     }
 
     const parentPath = await this.buildRelativePathForFolder(parentFolder.name, parentFolder.parent_id ?? null);
 
-    return path.join(parentPath, folderName, '/');
+    return WebDavUtils.joinPath(parentPath, folderName, '/');
   }
 }
diff --git a/src/utils/webdav.utils.ts b/src/utils/webdav.utils.ts
@@ -1,10 +1,12 @@
 import { Request } from 'express';
 import path from 'path';
 import { WebDavRequestedResource } from '../types/webdav.types';
+
 export class WebDavUtils {
-  static getHref(...pathComponents: string[]): string {
+  static joinPath(...pathComponents: string[]): string {
     return path.posix.join(...pathComponents);
   }
+
   static getRequestedResource(req: Request): WebDavRequestedResource {
     const decodedUrl = decodeURI(req.url);
     const parsedPath = path.parse(decodedUrl);

diff --git a/src/webdav/handlers/PROPFIND.handler.ts b/src/webdav/handlers/PROPFIND.handler.ts
@@ -86,7 +86,7 @@ export class PROPFINDRequestHandler implements WebDavMethodHandler {
     const folderContent = await driveFolderService.getFolderContent(folderUuid);
 
     const foldersXML = folderContent.folders.map((folder) => {
-      const folderRelativePath = WebDavUtils.getHref(relativePath, folder.plainName, '/');
+      const folderRelativePath = WebDavUtils.joinPath(relativePath, folder.plainName, '/');
 
       return this.driveFolderItemToXMLNode(
         {
@@ -114,7 +114,7 @@ export class PROPFINDRequestHandler implements WebDavMethodHandler {
     );
 
     const filesXML = folderContent.files.map((file) => {
-      const fileRelativePath = WebDavUtils.getHref(
+      const fileRelativePath = WebDavUtils.joinPath(
         relativePath,
         file.type ? `${file.plainName}.${file.type}` : file.plainName,
       );

diff --git a/test/services/realms/drive-realm-manager.service.test.ts b/test/services/realms/drive-realm-manager.service.test.ts
@@ -90,7 +90,7 @@ describe('DriveRealmManager service', () => {
 
     const relativePath = await sut.buildRelativePathForFolder('folderD', 1);
 
-    expect(relativePath).to.be.equal(path.join('/', 'folderA', 'folderB', 'folderC', 'folderD', '/'));
+    expect(relativePath).to.be.equal(path.posix.join('/', 'folderA', 'folderB', 'folderC', 'folderD', '/'));
   });
 
   it('When a file is created, should build the correct relative path', async () => {
@@ -124,6 +124,6 @@ describe('DriveRealmManager service', () => {
 
     const relativePath = await sut.buildRelativePathForFile('file.png', 1);
 
-    expect(relativePath).to.be.equal(path.join('/', 'folderA', 'folderB', 'folderC', 'file.png'));
+    expect(relativePath).to.be.equal(path.posix.join('/', 'folderA', 'folderB', 'folderC', 'file.png'));
   });
 });
diff --git a/test/utils/webdav.utils.test.ts b/test/utils/webdav.utils.test.ts
@@ -4,12 +4,12 @@ import { createWebDavRequestFixture } from '../fixtures/webdav.fixture';
 
 describe('Webdav utils', () => {
   it('When a list of path components are given, should generate a correct href', () => {
-    const href = WebDavUtils.getHref('/path', 'to', 'file');
+    const href = WebDavUtils.joinPath('/path', 'to', 'file');
     expect(href).to.equal('/path/to/file');
   });
 
   it('When a list of path components are given, should generate a correct href and remove incorrect characters', () => {
-    const href = WebDavUtils.getHref('/path', 'to', 'folder/');
+    const href = WebDavUtils.joinPath('/path', 'to', 'folder/');
     expect(href).to.equal('/path/to/folder/');
   });