refactor: ZipPasswordExtracted also extracts unencrypted content

Author: MSE1188

src/Yaapii.Zip/ZipPasswordExtracted.cs

@@ -28,18 +28,7 @@ public ZipPasswordExtracted(IInput zip, string virtualPath, string password)
 
         public Stream Stream()
         {
-            new FailWhen(
-                () => !new IsZipArchive(this.zip).Value(),
-                new ArgumentException(
-                    "Can not extract zip because no zip was provided."
-                )
-            ).Go();
-            new FailWhen(
-                () => !new HasPassword(this.zip, this.virtualPath).Value(),
-                new InvalidOperationException(
-                    "Can not extract zip because the file is not protected with a password."
-                )
-            ).Go();
+            Validate();
             zip.Stream().Seek(0, SeekOrigin.Begin);
             IInput result;
             using (var stream = new MemoryStream())
@@ -57,5 +46,21 @@ public Stream Stream()
             }
             return result.Stream();
         }
+
+        private void Validate()
+        {
+            new FailWhen(
+                () => !new IsZipArchive(this.zip).Value(),
+                new ArgumentException(
+                    "Can not extract zip because no zip was provided."
+                )
+            ).Go();
+            // ZipFile.ContainsEntry() by Ionic does not work with backslashes,
+            // even if the path is normalized. Misterious
+            new FailWhen(
+                () => !new ZipContains(this.zip, this.virtualPath).Value(),
+                new ArgumentException($"Cannot check for password because file '{this.virtualPath} doesn't exists in zip.")
+            ).Go();
+        }
     }
 }

tests/Test.Yaapii.Zip/ZipPasswordExtractedTests.cs

@@ -62,14 +62,15 @@ public void ExtractsFromDifferentZips(string path)
         }
 
         [Fact]
-        public void FailsOnNoPassword()
+        public void ExtractsUnencryptedZip()
         {
-            Assert.Throws<InvalidOperationException>(() =>
+            Assert.Equal(
+                "unsafe",
                 new TextOf(
                     new ZipPasswordExtracted(
                         new Zipped(
                             "text.txt",
-                            new InputOf("safe")
+                            new InputOf("unsafe")
                         ),
                         "text.txt",
                         "password"