fix: revert skip validation

src/file.ts

@@ -1365,7 +1365,7 @@ class File extends ServiceObject<File> {
 
     const throughStream = streamEvents(new PassThrough());
 
-    let isServedCompressed = true;
+    let isCompressed = true;
     let crc32c = true;
     let md5 = false;
 
@@ -1470,7 +1470,7 @@ class File extends ServiceObject<File> {
         rawResponseStream.on('error', onComplete);
 
         const headers = rawResponseStream.toJSON().headers;
-        isServedCompressed = headers['content-encoding'] === 'gzip';
+        isCompressed = headers['content-encoding'] === 'gzip';
         const throughStreams: Writable[] = [];
 
         if (shouldRunValidation) {
@@ -1496,7 +1496,7 @@ class File extends ServiceObject<File> {
           throughStreams.push(validateStream);
         }
 
-        if (isServedCompressed && options.decompress) {
+        if (isCompressed && options.decompress) {
           throughStreams.push(zlib.createGunzip());
         }
 
@@ -1536,31 +1536,16 @@ class File extends ServiceObject<File> {
           return;
         }
 
-        // TODO(https://github.com/googleapis/nodejs-storage/issues/709):
-        // Remove once the backend issue is fixed.
-        // If object is stored compressed (having
-        // metadata.contentEncoding === 'gzip') and was served decompressed,
-        // then skip checksum validation because the remote checksum is computed
-        // against the compressed version of the object.
-        if (!isServedCompressed) {
-          try {
-            await this.getMetadata({userProject: options.userProject});
-          } catch (e) {
-            throughStream.destroy(e as Error);
-            return;
-          }
-          if (this.metadata.contentEncoding === 'gzip') {
-            throughStream.end();
-            return;
-          }
-        }
+        // Did the server decompress object before serving it back to us?
+        const serverDecompressed =
+          headers['x-goog-stored-content-encoding'] === 'gzip' && !isCompressed;
 
         // If we're doing validation, assume the worst-- a data integrity
         // mismatch. If not, these tests won't be performed, and we can assume
         // the best.
         let failed = crc32c || md5;
 
-        if (validateStream) {
+        if (validateStream && !serverDecompressed) {
           if (crc32c && hashes.crc32c) {
             failed = !validateStream.test('crc32c', hashes.crc32c);
           }

test/file.ts

@@ -1443,41 +1443,6 @@ describe('File', () => {
           .resume();
       });
 
-      it('should pass the userProject to getMetadata', done => {
-        const fakeOptions = {
-          userProject: 'grapce-spaceship-123',
-        };
-
-        file.getMetadata = (options: GetFileMetadataOptions) => {
-          assert.strictEqual(options.userProject, fakeOptions.userProject);
-          setImmediate(done);
-          return Promise.resolve({
-            crc32c: CRC32C_HASH,
-          });
-        };
-
-        file.requestStream = getFakeSuccessfulRequest(DATA);
-
-        file.createReadStream(fakeOptions).on('error', done).resume();
-      });
-
-      it('should destroy stream from failed metadata fetch', done => {
-        const error = new Error('Error.');
-        file.getMetadata = () => {
-          return Promise.reject(error);
-        };
-
-        file.requestStream = getFakeSuccessfulRequest(DATA);
-
-        file
-          .createReadStream()
-          .on('error', (err: Error) => {
-            assert.strictEqual(err, error);
-            done();
-          })
-          .resume();
-      });
-
       it('should validate with crc32c', done => {
         file.requestStream = getFakeSuccessfulRequest(DATA);