Fixed the MOVE method

Author: AdrienCastex

lib/server/v2/commands/Move.js

@@ -8,7 +8,6 @@ function execute(ctx, methodName, privilegeName, callback) {
     ctx.noBodyExpected(function () {
         ctx.getResource(function (e, r) {
             ctx.checkIfHeader(r, function () {
-                //ctx.requirePrivilege([ privilegeName ], r, () => {
                 var overwrite = ctx.headers.find('overwrite') === 'T';
                 var destination = ctx.headers.find('destination');
                 if (!destination) {
@@ -52,10 +51,9 @@ function execute(ctx, methodName, privilegeName, callback) {
                             StandardMethods_1.StandardMethods.standardCopy(ctx, r.path, r.fs, destSubPath, destFs, overwrite, cb);
                     }
                     else {
-                        r[methodName](destination, overwrite, cb);
+                        r[methodName](destSubPath, overwrite, cb);
                     }
                 });
-                //})
             });
         });
     });

src/server/v2/commands/Move.ts

@@ -9,67 +9,65 @@ export function execute(ctx : HTTPRequestContext, methodName : string, privilege
     ctx.noBodyExpected(() => {
         ctx.getResource((e, r) => {
             ctx.checkIfHeader(r, () => {
-                //ctx.requirePrivilege([ privilegeName ], r, () => {
-                    const overwrite = ctx.headers.find('overwrite') === 'T';
+                const overwrite = ctx.headers.find('overwrite') === 'T';
 
-                    let destination : any = ctx.headers.find('destination');
-                    if(!destination)
-                    {
-                        ctx.setCode(HTTPCodes.BadRequest);
-                        return callback();
-                    }
-                    
-                    const startIndex = destination.indexOf('://');
-                    if(startIndex !== -1)
-                    {
-                        destination = destination.substring(startIndex + '://'.length)
-                        destination = destination.substring(destination.indexOf('/')) // Remove the hostname + port
-                    }
-                    destination = new Path(destination);
+                let destination : any = ctx.headers.find('destination');
+                if(!destination)
+                {
+                    ctx.setCode(HTTPCodes.BadRequest);
+                    return callback();
+                }
+                
+                const startIndex = destination.indexOf('://');
+                if(startIndex !== -1)
+                {
+                    destination = destination.substring(startIndex + '://'.length)
+                    destination = destination.substring(destination.indexOf('/')) // Remove the hostname + port
+                }
+                destination = new Path(destination);
 
-                    const sDest = destination.toString(true);
-                    const sSource = ctx.requested.path.toString(true);
-                    if(sDest === sSource)
-                    {
-                        ctx.setCode(HTTPCodes.Forbidden);
-                        return callback();
-                    }
-                    if(sDest.indexOf(sSource) === 0)
-                    {
-                        ctx.setCode(HTTPCodes.BadGateway);
-                        return callback();
-                    }
+                const sDest = destination.toString(true);
+                const sSource = ctx.requested.path.toString(true);
+                if(sDest === sSource)
+                {
+                    ctx.setCode(HTTPCodes.Forbidden);
+                    return callback();
+                }
+                if(sDest.indexOf(sSource) === 0)
+                {
+                    ctx.setCode(HTTPCodes.BadGateway);
+                    return callback();
+                }
 
-                    const cb = (e ?: Error, overwritten ?: boolean) =>
+                const cb = (e ?: Error, overwritten ?: boolean) =>
+                {
+                    if(e)
                     {
-                        if(e)
-                        {
-                            if(e === Errors.ResourceAlreadyExists)
-                                ctx.setCode(HTTPCodes.PreconditionFailed);
-                            else if(!ctx.setCodeFromError(e))
-                                ctx.setCode(HTTPCodes.InternalServerError)
-                        }
-                        else if(overwritten)
-                            ctx.setCode(HTTPCodes.NoContent);
-                        else
-                            ctx.setCode(HTTPCodes.Created);
-                        callback();
-                    };
+                        if(e === Errors.ResourceAlreadyExists)
+                            ctx.setCode(HTTPCodes.PreconditionFailed);
+                        else if(!ctx.setCodeFromError(e))
+                            ctx.setCode(HTTPCodes.InternalServerError)
+                    }
+                    else if(overwritten)
+                        ctx.setCode(HTTPCodes.NoContent);
+                    else
+                        ctx.setCode(HTTPCodes.Created);
+                    callback();
+                };
 
-                    ctx.server.getFileSystem(destination, (destFs, destRootPath, destSubPath) => {
-                        if(destFs !== r.fs)
-                        { // Standard method
-                            if(methodName === 'move')
-                                StandardMethods.standardMove(ctx, r.path, r.fs, destSubPath, destFs, overwrite, cb);
-                            else
-                                StandardMethods.standardCopy(ctx, r.path, r.fs, destSubPath, destFs, overwrite, cb);
-                        }
+                ctx.server.getFileSystem(destination, (destFs, destRootPath, destSubPath) => {
+                    if(destFs !== r.fs)
+                    { // Standard method
+                        if(methodName === 'move')
+                            StandardMethods.standardMove(ctx, r.path, r.fs, destSubPath, destFs, overwrite, cb);
                         else
-                        { // Delegate the operation to the file system
-                            r[methodName](destination, overwrite, cb);
-                        }
-                    })
-                //})
+                            StandardMethods.standardCopy(ctx, r.path, r.fs, destSubPath, destFs, overwrite, cb);
+                    }
+                    else
+                    { // Delegate the operation to the file system
+                        r[methodName](destSubPath, overwrite, cb);
+                    }
+                })
             })
         })
     })