DC/dc-project
1
1
Fork 0
Code Issues 25 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Add route put/delete

Browse Source
This commit is contained in:
Fabrice Lecomte
2020-03-25 00:23:40 +01:00
parent 8c25f7633e
commit 07315a5624
7 changed files with 122 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/fr/dcproject/Application.kt
View File

@@ -338,7 +338,7 @@ fun Application.module(env: Env = PROD) {
}
}
exception<NotFoundException> { e ->
call.respond(HttpStatusCode.BadRequest, e.message!!)
call.respond(HttpStatusCode.NotFound, e.message!!)
}
exception<ForbiddenException> {
call.respond(HttpStatusCode.Forbidden)

2
src/main/kotlin/fr/dcproject/entity/Workgroup.kt
View File

@@ -58,4 +58,6 @@ interface WorkgroupWithMembersI<Z : CitizenI> : WorkgroupI {
var members: List<Z>
}
fun List<CitizenI>.asCitizen(citizen: CitizenI): Boolean = this.map { it.id }.contains(citizen.id)
interface WorkgroupI : UuidEntityI

62
src/main/kotlin/fr/dcproject/routes/Workgroup.kt
View File

@@ -9,6 +9,9 @@ import fr.dcproject.repository.Workgroup.Filter
import fr.dcproject.security.voter.WorkgroupVoter.Action.VIEW
import fr.dcproject.security.voter.WorkgroupVoter.Action.CREATE
import fr.dcproject.security.voter.WorkgroupVoter.Action.UPDATE
import fr.dcproject.security.voter.WorkgroupVoter.ActionMembers.ADD as ADD_MEMBERS
import fr.dcproject.security.voter.WorkgroupVoter.ActionMembers.UPDATE as UPDATE_MEMBERS
import fr.dcproject.security.voter.WorkgroupVoter.ActionMembers.REMOVE as REMOVE_MEMBERS
import fr.dcproject.security.voter.assertCan
import fr.dcproject.utils.toUUID
import fr.postgresjson.repository.RepositoryI
@@ -48,14 +51,14 @@ object WorkgroupsPaths {
class WorkgroupRequest(val workgroup: WorkgroupEntity)
@Location("/workgroups")
class PostWorkgroupRequest : RequestBuilder<WorkgroupSimple<CitizenRef>> {
open class PostWorkgroupRequest : RequestBuilder<WorkgroupSimple<CitizenRef>> {
class Content(
val id: UUID?,
val name: String,
val description: String,
val logo: String?,
val anonymous: Boolean?,
val owner: CitizenRef?
val owner: UUID?
) : KoinComponent {
fun create(creator: CitizenRef): WorkgroupSimple<CitizenRef> {
return WorkgroupSimple(
@@ -64,7 +67,7 @@ object WorkgroupsPaths {
description,
logo,
anonymous ?: true,
owner ?: creator,
owner?.let { CitizenRef(it) } ?: creator,
creator
)
}
@@ -74,11 +77,38 @@ object WorkgroupsPaths {
return call.receive<Content>().create(call.citizen)
}
}
@Location("/workgroups/{workgroup}")
class PutWorkgroupRequest(val workgroup: WorkgroupEntity) : RequestBuilder<WorkgroupEntity> {
class Content(
val name: String?,
val description: String?,
val logo: String?,
val anonymous: Boolean?,
val owner: UUID?
) : KoinComponent {
fun update(workgroup: WorkgroupEntity): WorkgroupEntity {
name?.let { workgroup.name = it }
description?.let { workgroup.description = it }
logo?.let { workgroup.logo = it }
anonymous?.let { workgroup.anonymous = it }
return workgroup
}
}
override suspend fun getContent(call: ApplicationCall): WorkgroupEntity {
return call.receive<Content>().update(workgroup)
}
}
@Location("/workgroups/{workgroup}")
class DeleteWorkgroupRequest(val workgroup: WorkgroupEntity)
}
@KtorExperimentalLocationsAPI
object WorkgroupsMembersPaths {
@Location("/workgroups/members/{workgroup}")
@Location("/workgroups/{workgroup}/members")
class WorkgroupsMembersRequest(val workgroup: WorkgroupEntity) : RequestBuilder<List<CitizenRef>> {
class Content : MutableList<Content.Item> by mutableListOf() {
class Item(val id: String)
@@ -117,14 +147,30 @@ fun Route.workgroup(repo: WorkgroupRepository) {
}
}
put<WorkgroupsPaths.PutWorkgroupRequest> {
call.getContent(it)
.let { workgroup ->
assertCan(UPDATE, workgroup)
repo.upsert(workgroup as WorkgroupSimple<CitizenRef>)
}.let {
call.respond(HttpStatusCode.OK, it)
}
}
delete<WorkgroupsPaths.DeleteWorkgroupRequest> {
assertCan(UPDATE, it.workgroup)
repo.delete(it.workgroup)
call.respond(HttpStatusCode.NoContent, it)
}
/* Add members to workgroup */
post<WorkgroupsMembersPaths.WorkgroupsMembersRequest> {
call.getContent(it)
.let { members ->
assertCan(UPDATE, it.workgroup)
assertCan(ADD_MEMBERS, it.workgroup)
repo.addMembers(it.workgroup, members)
}.let {
call.respond(HttpStatusCode.OK, it)
call.respond(HttpStatusCode.Created, it)
}
}
@@ -132,7 +178,7 @@ fun Route.workgroup(repo: WorkgroupRepository) {
delete<WorkgroupsMembersPaths.WorkgroupsMembersRequest> {
call.getContent(it)
.let { members ->
assertCan(UPDATE, it.workgroup)
assertCan(REMOVE_MEMBERS, it.workgroup)
repo.removeMembers(it.workgroup, members)
}.let {
call.respond(HttpStatusCode.OK, it)
@@ -143,7 +189,7 @@ fun Route.workgroup(repo: WorkgroupRepository) {
put<WorkgroupsMembersPaths.WorkgroupsMembersRequest> {
call.getContent(it)
.let { members ->
assertCan(UPDATE, it.workgroup)
assertCan(UPDATE_MEMBERS, it.workgroup)
repo.updateMembers(it.workgroup, members)
}.let {
call.respond(HttpStatusCode.OK, it)

8
src/main/kotlin/fr/dcproject/security/voter/Voter.kt
View File

@@ -33,7 +33,13 @@ fun List<Voter>.can(action: ActionI, call: ApplicationCall, subject: Any? = null
enum class Vote {
GRANTED,
ABSTAIN,
DENIED
DENIED;
companion object {
fun isGranted(lambda: () -> Boolean): Vote {
return if (lambda()) GRANTED else DENIED
}
}
}
private val votersAttributeKey = AttributeKey<List<Voter>>("voters")

46
src/main/kotlin/fr/dcproject/security/voter/WorkgroupVoter.kt
View File

@@ -1,8 +1,7 @@
package fr.dcproject.security.voter
import fr.dcproject.entity.UserI
import fr.dcproject.entity.WorkgroupI
import fr.dcproject.entity.WorkgroupWithAuthI
import fr.dcproject.citizenOrNull
import fr.dcproject.entity.*
import io.ktor.application.ApplicationCall
class WorkgroupVoter : Voter {
@@ -10,11 +9,18 @@ class WorkgroupVoter : Voter {
CREATE,
UPDATE,
VIEW,
DELETE
DELETE,
}
enum class ActionMembers : ActionI {
ADD,
UPDATE,
VIEW,
REMOVE,
}
override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
return (action is Action)
return (action is Action || action is ActionMembers)
.and(subject is WorkgroupI?)
}
@@ -49,6 +55,36 @@ class WorkgroupVoter : Voter {
VoterException("Unable to define if your are granted, the subject must implement 'WorkgroupWithAuthI'") {}
}
if (action == ActionMembers.ADD) {
val citizen = call.citizenOrNull
// TODO create ROLES
return Vote.isGranted {
citizen != null &&
subject is WorkgroupWithMembersI<*> &&
subject.members.asCitizen(citizen)
}
}
if (action == ActionMembers.UPDATE) {
val citizen = call.citizenOrNull
// TODO create ROLES
return Vote.isGranted {
citizen != null &&
subject is WorkgroupWithMembersI<*> &&
subject.members.asCitizen(citizen)
}
}
if (action == ActionMembers.REMOVE) {
val citizen = call.citizenOrNull
// TODO create ROLES
return Vote.isGranted {
citizen != null &&
subject is WorkgroupWithMembersI<*> &&
subject.members.asCitizen(citizen)
}
}
return Vote.ABSTAIN
}
}