diff --git a/src/main/kotlin/fr/dcproject/security/voter/VoteVoter.kt b/src/main/kotlin/fr/dcproject/security/voter/VoteVoter.kt index 7f9bcf9..fd14584 100644 --- a/src/main/kotlin/fr/dcproject/security/voter/VoteVoter.kt +++ b/src/main/kotlin/fr/dcproject/security/voter/VoteVoter.kt @@ -10,10 +10,7 @@ class VoteVoter : Voter { } override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean { - return action is Action && ( - subject is VoteEntity<*>? || - subject is List<*> - ) + return action is Action && subject is VoteEntity<*>? } override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote { @@ -30,16 +27,6 @@ class VoteVoter : Voter { Vote.GRANTED } } - - if (subject is List<*>) { - subject.forEach { - if (it !is VoteEntity<*> || it.createdBy.user.id != user.id) { - return Vote.DENIED - } - } - return Vote.GRANTED - } - return Vote.DENIED } diff --git a/src/test/kotlin/fr/dcproject/security/voter/VoteVoterTest.kt b/src/test/kotlin/fr/dcproject/security/voter/VoteVoterTest.kt new file mode 100644 index 0000000..cd5f942 --- /dev/null +++ b/src/test/kotlin/fr/dcproject/security/voter/VoteVoterTest.kt @@ -0,0 +1,124 @@ +package fr.dcproject.security.voter + +import fr.dcproject.entity.* +import fr.dcproject.entity.Vote as VoteEntity +import io.ktor.application.ApplicationCall +import io.ktor.locations.KtorExperimentalLocationsAPI +import io.mockk.every +import io.mockk.mockk +import io.mockk.mockkStatic +import org.amshove.kluent.`should be` +import org.joda.time.DateTime +import org.junit.jupiter.api.Tag +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.TestInstance + +@KtorExperimentalLocationsAPI +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +@Tag("voter") +internal class VoteVoterTest { + private val tesla = CitizenBasic( + user = User( + username = "nicolas-tesla", + roles = listOf(UserI.Roles.ROLE_USER) + ), + birthday = DateTime.now(), + email = "tesla@best.com", + name = CitizenI.Name("Nicolas", "Tesla"), + followAnonymous = false + ) + + private val einstein = CitizenBasic( + user = User( + username = "albert-einstein", + roles = listOf(UserI.Roles.ROLE_USER) + ), + birthday = DateTime.now(), + email = "einstein@best.com", + name = CitizenI.Name("Albert", "Einstein"), + followAnonymous = true + ) + + private val article1 = Article( + content = "Hi", + createdBy = einstein, + description = "blablabla", + title = "Super article" + ) + + private val vote1 = VoteEntity( + createdBy = tesla, + target = article1, + note = 1 + ) + + init { + mockkStatic("fr.dcproject.security.voter.VoterKt") + } + + @Test + fun `support vote`() = VoteVoter().run { + val p = object : ActionI {} + mockk { + every { user } returns tesla.user + }.let { + supports(VoteVoter.Action.VIEW, it, vote1) `should be` true + supports(VoteVoter.Action.VIEW, it, article1) `should be` false + supports(p, it, vote1) `should be` false + } + } + + @Test + fun `can be view your the vote`() = listOf(VoteVoter()).run { + mockk { + every { user } returns tesla.user + }.let { + can(VoteVoter.Action.VIEW, it, vote1) `should be` true + } + } + + @Test + fun `can not be view vote of other`() = listOf(VoteVoter()).run { + mockk { + every { user } returns einstein.user + }.let { + can(VoteVoter.Action.VIEW, it, vote1) `should be` false + } + } + + @Test + fun `can be not view the vote if is null`() = listOf(VoteVoter()).run { + mockk { + every { user } returns tesla.user + }.let { + can(VoteVoter.Action.VIEW, it, null) `should be` false + } + } + + @Test + fun `can be view your votes list`() = listOf(VoteVoter()).run { + mockk { + every { user } returns tesla.user + }.let { + can(VoteVoter.Action.VIEW, it, listOf(vote1)) `should be` true + } + } + + @Test + fun `can be vote an article`() = listOf(VoteVoter()).run { + mockk { + every { user } returns tesla.user + }.let { + can(VoteVoter.Action.CREATE, it, vote1) `should be` true + } + } + + @Test + fun `can not be vote if not connected`() = listOf(VoteVoter()).run { + mockk { + every { user } returns null + }.let { + can(VoteVoter.Action.CREATE, it, vote1) `should be` false + } + } +} \ No newline at end of file