fix: update file rewrite request URI and routing to use bucket request instead of file request

Author: thiyaguk09

handwritten/storage/src/file.ts

@@ -1429,18 +1429,12 @@ class File extends ServiceObject<File, FileMetadata> {
       delete options.preconditionOpts;
     }
 
-    const originalGetRequestInterceptors = this.getRequestInterceptors;
-    this.getRequestInterceptors = () => {
-      return originalGetRequestInterceptors.call(this).filter(
-        interceptorFn =>
-          interceptorFn !== this.encryptionKeyInterceptor?.request
-      );
-    };
-
-    this.request(
+    this.bucket.request(
       {
         method: 'POST',
-        uri: `/rewriteTo/b/${destBucket.name}/o/${encodeURIComponent(
+        uri: `/o/${encodeURIComponent(
+          this.name,
+        )}/rewriteTo/b/${destBucket.name}/o/${encodeURIComponent(
           newFile.name,
         )}`,
         qs: query,
@@ -1474,8 +1468,6 @@ class File extends ServiceObject<File, FileMetadata> {
         callback!(null, newFile, resp);
       },
     );
-
-    this.getRequestInterceptors = originalGetRequestInterceptors;
   }
 
   /**

handwritten/storage/test/file.ts

@@ -189,6 +189,10 @@ describe('File', () => {
   let File: any;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let file: any;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let activeFile: any = null;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let originalCopy: any;
 
   const FILE_NAME = 'file-name.png';
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -228,6 +232,18 @@ describe('File', () => {
       './signer': fakeSigner,
       zlib: fakeZlib,
     }).File;
+
+    originalCopy = File.prototype.copy;
+    File.prototype.copy = function (dest: any, options: any, callback: any) {
+      activeFile = this;
+      return originalCopy.call(this, dest, options, callback);
+    };
+  });
+
+  after(() => {
+    if (originalCopy) {
+      File.prototype.copy = originalCopy;
+    }
   });
 
   beforeEach(() => {
@@ -274,6 +290,19 @@ describe('File', () => {
     specialCharsFile = new File(BUCKET, "special/azAZ!*'()*%/file.jpg");
     specialCharsFile.request = util.noop;
 
+    activeFile = null;
+    BUCKET.request = function (reqOpts: any, callback: any) {
+      if (activeFile && typeof activeFile.request === 'function' && (activeFile.request as any) !== util.noop) {
+        const prefix = `/o/${encodeURIComponent(activeFile.name)}`;
+        const modifiedReqOpts = { ...reqOpts };
+        if (modifiedReqOpts.uri.startsWith(prefix)) {
+          modifiedReqOpts.uri = modifiedReqOpts.uri.substring(prefix.length);
+        }
+        return activeFile.request(modifiedReqOpts, callback);
+      }
+      return Bucket.prototype.request.call(this, reqOpts, callback);
+    };
+
     createGunzipOverride = null;
     handleRespOverride = null;
     makeWritableStreamOverride = null;
@@ -507,6 +536,7 @@ describe('File', () => {
   });
 
   describe('copy', () => {
+
     it('should throw if no destination is provided', () => {
       assert.throws(() => {
         file.copy();