Skip to content

Fix storage controller #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marchosiax merged 2 commits into from
Oct 20, 2021
Merged

Fix storage controller #118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7de42b2
Fix storage controller
ebrahimmfadae Oct 20, 2021
8b14891
Make file extension case insensitive
ebrahimmfadae Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Storage/storage-app/src/main/kotlin/co/nilin/opex/storage/app/controller/FileController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import java.nio.file.Paths

@RestController
class FileController(private val storageService: StorageService) {
data class FileUploadResponse(val path: String)

@PostMapping("/{uid}")
suspend fun fileUpload(
@PathVariable("uid") uid: String,
Expand All @@ -24,14 +26,13 @@ class FileController(private val storageService: StorageService) {
): Any {
if (securityContext.authentication.name != uid) throw OpexException(OpexError.UnAuthorized)
file.awaitFirstOrNull().apply {
data class Response(val uri: String)
if (this == null) throw OpexException(OpexError.BadRequest, "File Not Provided")
val ext = this.filename().replace(Regex(".+(?=\\..+)"), "")
if (ext !in listOf(".jpg", ".jpeg", ".png", ".mp4", ".mov"))
if (ext.toLowerCase() !in listOf(".jpg", ".jpeg", ".png", ".mp4", ".mov", ".pdf", ".svg"))
throw OpexException(OpexError.BadRequest, "Invalid File Format")
val path = Paths.get("").resolve("/opex-storage/$uid/${this.filename()}").toString()
storageService.store(path, this)
return Response(path)
return FileUploadResponse("/$uid/${this.filename()}\"")
}
}

Expand Down