implemented OPTIONS operation

Author: larryrider

src/webdav/handlers/OPTIONS.handler.ts

@@ -1,10 +1,39 @@
 import { WebDavMethodHandler } from '../../types/webdav.types';
 import { Request, Response } from 'express';
+import { WebDavUtils } from '../../utils/webdav.utils';
+import { webdavLogger } from '../../utils/logger.utils';
 
 export class OPTIONSRequestHandler implements WebDavMethodHandler {
-  handle = async (_: Request, res: Response) => {
-    res.header('Allow', 'OPTIONS, GET, HEAD, POST, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK');
-    res.header('DAV', '1, 2, ordered-collections');
-    res.status(200).send();
+  handle = async (req: Request, res: Response) => {
+    const resource = await WebDavUtils.getRequestedResource(req);
+
+    webdavLogger.info(`[OPTIONS] Request received for ${resource.type} at ${resource.url}`);
+
+    if (resource.url === '/' || resource.url === '') {
+      const allowedMethods = 'DELETE, GET, HEAD, MKCOL, MOVE, OPTIONS, PROPFIND, PUT';
+      webdavLogger.info(`[OPTIONS] Returning Allowed Options: ${allowedMethods}`);
+      res.header('Allow', 'DELETE, GET, HEAD, MKCOL, MOVE, OPTIONS, PROPFIND, PUT');
+      res.header('DAV', '1, 2, ordered-collections');
+      res.status(200).send();
+      return;
+    }
+
+    if (resource.type === 'folder') {
+      const allowedMethods = 'DELETE, HEAD, MKCOL, MOVE, OPTIONS, PROPFIND';
+      webdavLogger.info(`[OPTIONS] Returning Allowed Options: ${allowedMethods}`);
+      res.header('Allow', allowedMethods);
+      res.header('DAV', '1, 2, ordered-collections');
+      res.status(200).send();
+      return;
+    }
+
+    if (resource.type === 'file') {
+      const allowedMethods = 'DELETE, GET, HEAD, MOVE, OPTIONS, PROPFIND, PUT';
+      webdavLogger.info(`[OPTIONS] Returning Allowed Options: ${allowedMethods}`);
+      res.header('Allow', allowedMethods);
+      res.header('DAV', '1, 2, ordered-collections');
+      res.status(200).send();
+      return;
+    }
   };
 }

test/webdav/handlers/OPTIONS.handler.test.ts

@@ -8,12 +8,13 @@ describe('OPTIONS request handler', () => {
     vi.restoreAllMocks();
   });
 
-  it('When a WebDav client sends an OPTIONS request, it should return the allowed methods', async () => {
+  it('When the root folder is requested, it should return all of the server allowed methods', async () => {
     const requestHandler = new OPTIONSRequestHandler();
 
     const request = createWebDavRequestFixture({
       method: 'OPTIONS',
       user: UserSettingsFixture,
+      url: '/',
     });
     const response = createWebDavResponseFixture({
       header: vi.fn(),
@@ -23,10 +24,47 @@ describe('OPTIONS request handler', () => {
     await requestHandler.handle(request, response);
 
     expect(response.status).toHaveBeenCalledWith(200);
-    expect(response.header).toHaveBeenCalledWith(
-      'Allow',
-      'OPTIONS, GET, HEAD, POST, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK',
-    );
+    expect(response.header).toHaveBeenCalledWith('Allow', 'DELETE, GET, HEAD, MKCOL, MOVE, OPTIONS, PROPFIND, PUT');
+    expect(response.header).toHaveBeenCalledWith('DAV', '1, 2, ordered-collections');
+  });
+
+  it('When a folder is requested, it should return all of the folder allowed methods', async () => {
+    const requestHandler = new OPTIONSRequestHandler();
+
+    const request = createWebDavRequestFixture({
+      method: 'OPTIONS',
+      user: UserSettingsFixture,
+      url: '/folder/',
+    });
+    const response = createWebDavResponseFixture({
+      header: vi.fn(),
+      status: vi.fn().mockReturnValue({ send: vi.fn() }),
+    });
+
+    await requestHandler.handle(request, response);
+
+    expect(response.status).toHaveBeenCalledWith(200);
+    expect(response.header).toHaveBeenCalledWith('Allow', 'DELETE, HEAD, MKCOL, MOVE, OPTIONS, PROPFIND');
+    expect(response.header).toHaveBeenCalledWith('DAV', '1, 2, ordered-collections');
+  });
+
+  it('When a file is requested, it should return all of the file allowed methods', async () => {
+    const requestHandler = new OPTIONSRequestHandler();
+
+    const request = createWebDavRequestFixture({
+      method: 'OPTIONS',
+      user: UserSettingsFixture,
+      url: '/file',
+    });
+    const response = createWebDavResponseFixture({
+      header: vi.fn(),
+      status: vi.fn().mockReturnValue({ send: vi.fn() }),
+    });
+
+    await requestHandler.handle(request, response);
+
+    expect(response.status).toHaveBeenCalledWith(200);
+    expect(response.header).toHaveBeenCalledWith('Allow', 'DELETE, GET, HEAD, MOVE, OPTIONS, PROPFIND, PUT');
     expect(response.header).toHaveBeenCalledWith('DAV', '1, 2, ordered-collections');
   });
 });