Fixes to make files always private.

perfectsense · Aug 10, 2020 · c4fc14f · c4fc14f
1 parent 8e88cdc
commit c4fc14f
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/src/main/java/gyro/google/GoogleStorageFileBackend.java b/src/main/java/gyro/google/GoogleStorageFileBackend.java
@@ -29,7 +29,6 @@
 import com.google.cloud.storage.StorageOptions;
 import com.psddev.dari.util.ObjectUtils;
 import gyro.core.FileBackend;
-import gyro.core.FileBackendAccess;
 import gyro.core.GyroCore;
 import gyro.core.GyroException;
 import gyro.core.Type;
@@ -88,10 +87,10 @@ public InputStream openInput(String file) throws Exception {
     }
 
     @Override
-    public OutputStream openOutput(String file, FileBackendAccess acl) throws Exception {
+    public OutputStream openOutput(String file) throws Exception {
         return Channels.newOutputStream(service().writer(
             BlobInfo.newBuilder(getBucket(), prefixed(file)).build(),
-            Storage.BlobWriteOption.predefinedAcl(predefinedAcl(acl))));
+            Storage.BlobWriteOption.predefinedAcl(Storage.PredefinedAcl.PRIVATE)));
     }
 
     @Override
@@ -105,13 +104,14 @@ public boolean exists(String file) throws Exception {
     }
 
     @Override
-    public void copy(String source, String destination, FileBackendAccess acl) throws Exception {
+    public void copy(String source, String destination) throws Exception {
         String bucket = getBucket();
         service().copy(Storage.CopyRequest.newBuilder()
             .setSource(bucket, prefixed(source))
             .setTarget(
                 BlobInfo.newBuilder(bucket, prefixed(destination)).build(),
-                Storage.BlobTargetOption.predefinedAcl(predefinedAcl(acl)))
+
+                Storage.BlobTargetOption.predefinedAcl(Storage.PredefinedAcl.PRIVATE))
             .build()).getResult();
     }
 
@@ -140,13 +140,4 @@ private String removePrefix(String file) {
 
         return file;
     }
-
-    private Storage.PredefinedAcl predefinedAcl(FileBackendAccess acl) {
-        Storage.PredefinedAcl predefinedAcl = Storage.PredefinedAcl.PRIVATE;
-
-        if (acl == FileBackendAccess.PUBLIC) {
-            predefinedAcl = Storage.PredefinedAcl.PUBLIC_READ;
-        }
-        return predefinedAcl;
-    }
 }