Merge pull request #72 from nodes-vapor/feature/add-access-control-flag

Allow to provide an ACL flag
ml-archive · Oct 8, 2020 · 9f3b323 · 9f3b323
2 parents 936c671 + 3303ac0
commit 9f3b323
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/Sources/Storage/NetworkDriver.swift b/Sources/Storage/NetworkDriver.swift
@@ -5,11 +5,20 @@ import Foundation
 public protocol NetworkDriver: Service {
     var pathBuilder: PathBuilder { get set }
 
-    func upload(entity: inout FileEntity, on container: Container) throws -> Future<String>
+    func upload(entity: inout FileEntity, access: AccessControlList?, on container: Container) throws -> Future<String>
     func get(path: String, on container: Container) throws -> Future<Response>
     func delete(path: String, on container: Container) throws -> Future<Response>
 }
 
+extension NetworkDriver {
+    func upload(
+        entity: inout FileEntity,
+        on container: Container
+    ) throws -> Future<String> {
+        try upload(entity: &entity, access: nil, on: container)
+    }
+}
+
 public final class S3Driver: NetworkDriver {
     public enum Error: Swift.Error {
         case nilFileUpload
@@ -43,7 +52,7 @@ public final class S3Driver: NetworkDriver {
         fileExtension: String? = nil,
         mime: String? = nil,
         folder: String? = nil,
-        access: AccessControlList,
+        access: AccessControlList = .publicRead,
         on container: Container
     ) throws -> Future<String> {
         var entity = FileEntity(
@@ -59,14 +68,7 @@ public final class S3Driver: NetworkDriver {
 
     public func upload(
         entity: inout FileEntity,
-        on container: Container
-    ) throws -> Future<String> {
-        return try self.upload(entity: &entity, access: .publicRead, on: container)
-    }
-
-    public func upload(
-        entity: inout FileEntity,
-        access: AccessControlList,
+        access: AccessControlList?,
         on container: Container
     ) throws -> Future<String> {
         guard let bytes = entity.bytes else {
@@ -99,7 +101,7 @@ public final class S3Driver: NetworkDriver {
             bytes: Data(bytes),
             path: path,
             contentType: mime,
-            access: access,
+            access: access ?? .publicRead,
             on: container
         ).transform(to: path)
     }

diff --git a/Sources/Storage/Storage.swift b/Sources/Storage/Storage.swift
@@ -25,10 +25,11 @@ public class Storage {
     @discardableResult
     public static func upload(
         entity: inout FileEntity,
+        access: AccessControlList? = nil,
         on container: Container
     ) throws -> Future<String> {
         let networkDriver = try container.make(NetworkDriver.self)
-        return try networkDriver.upload(entity: &entity, on: container)
+        return try networkDriver.upload(entity: &entity, access: access, on: container)
     }
 
     /**
@@ -50,6 +51,7 @@ public class Storage {
         fileExtension: String? = nil,
         mime: String? = nil,
         folder: String? = nil,
+        access: AccessControlList? = nil,
         on container: Container
     ) throws -> Future<String> {
         var entity = FileEntity(
@@ -80,6 +82,7 @@ public class Storage {
         fileName: String? = nil,
         fileExtension: String? = nil,
         folder: String? = nil,
+        access: AccessControlList? = nil,
         on container: Container
     ) throws -> Future<String> {
         let (bytes, type) = try dataURI.dataURIDecoded()