Merge pull request #13 from Ferlab-Ste-Justine/feat/441-sub-folders-g…

…et-file

feat: CLIN-441 - allow sub-folders GET file

app/controllers/HomeController.scala

@@ -32,14 +32,13 @@ class HomeController @Inject()(val controllerComponents: ControllerComponents,pe
   }
 
   private val bucket = config.get[String]("aws.bucket")
-  private val prefix = config.get[String]("aws.prefix")
 
   def get(file: String): Action[AnyContent] = authAction { implicit request: UserRequest[AnyContent] =>
     val (_, unauthorized) = perms.checkPermissions(request, Set(file))
     if (unauthorized.nonEmpty) {
       Forbidden(file)
     } else {
-      val url = s3.presignedUrl(bucket, prefix, file)
+      val url = s3.presignedUrl(bucket, file)
       request.getQueryString("format") match {
         case Some("json") =>
           Ok(Json.toJson(Map("url" -> url.toString)))
@@ -56,7 +55,7 @@ class HomeController @Inject()(val controllerComponents: ControllerComponents,pe
     if (unauthorized.nonEmpty) {
       Forbidden(unauthorized.mkString("\n"))
     } else {
-      val urls = authorized.map(file => (file, s3.presignedUrl(bucket, prefix, file).toString)).toMap
+      val urls = authorized.map(file => (file, s3.presignedUrl(bucket, file).toString)).toMap
       Ok(toJson(urls))
     }
   }

app/services/aws/S3Service.scala

@@ -32,14 +32,12 @@ class S3Service @Inject()(config: Configuration) {
     .build()
 
 
-  def presignedUrl(bucket: String, prefix: String, file: String, expiration: Duration = Duration.ofHours(1)): URL = {
-
-    val key = if (prefix.isEmpty) file else s"$prefix/$file"
+  def presignedUrl(bucket: String, file: String, expiration: Duration = Duration.ofHours(1)): URL = {
 
     val getObjectRequest =
       GetObjectRequest.builder()
         .bucket(bucket)
-        .key(key)
+        .key(file)
         .build()
 
     val getObjectPresignRequest = GetObjectPresignRequest.builder

conf/application.conf

@@ -26,8 +26,6 @@ aws{
     path_style_access=${?AWS_PATH_ACCESS_STYLE}
     bucket="clin-repository"
     bucket=${?AWS_BUCKET}
-    prefix="files"
-    prefix=${?AWS_PREFIX}
 }
 auth {
     url="https://auth.qa.cqdg.ferlab.bio/auth"

conf/routes

@@ -14,4 +14,4 @@ GET        /config                          controllers.ConfigController.configu
 POST       /downloadLinks                   controllers.HomeController.downloadLinks()
 POST       /createPermissions/:userName     controllers.HomeController.createPermissions(userName:String)
 # always at the end of routing otherwise will be always true
-GET        /:file                           controllers.HomeController.get(file: String)
+GET        /*file                           controllers.HomeController.get(file: String)