Move Auth to a Component

2021-01-15 23:23:33 +01:00
parent 42440c0041
commit ce90884758
29 changed files with 195 additions and 124 deletions
--- a/src/test/kotlin/steps/ArticleSteps.kt
+++ b/src/test/kotlin/steps/ArticleSteps.kt
@@ -16,7 +16,7 @@ import org.joda.time.DateTime
 import org.koin.test.KoinTest
 import org.koin.test.get
 import java.util.*
-import fr.dcproject.entity.User as UserEntity
+import fr.dcproject.component.auth.User as UserEntity

 class ArticleSteps : En, KoinTest {
    init {
--- a/src/test/kotlin/steps/CitizenSteps.kt
+++ b/src/test/kotlin/steps/CitizenSteps.kt
@@ -3,7 +3,7 @@ package steps
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRepository
-import fr.dcproject.entity.User
+import fr.dcproject.component.auth.User
 import io.cucumber.datatable.DataTable
 import io.cucumber.java8.En
 import org.joda.time.DateTime
--- a/src/test/kotlin/steps/ConstitutionSteps.kt
+++ b/src/test/kotlin/steps/ConstitutionSteps.kt
@@ -16,7 +16,7 @@ import org.joda.time.DateTime
 import org.koin.test.KoinTest
 import org.koin.test.get
 import java.util.*
-import fr.dcproject.entity.User as UserEntity
+import fr.dcproject.component.auth.User as UserEntity
 import fr.dcproject.repository.Constitution as ConstitutionRepository

 class ConstitutionSteps : En, KoinTest {
--- a/src/test/kotlin/steps/WorkgroupSteps.kt
+++ b/src/test/kotlin/steps/WorkgroupSteps.kt
@@ -1,5 +1,6 @@
 package steps

+import fr.dcproject.component.auth.User
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRef
--- a/src/test/kotlin/unit/voter/ArticleVoterTest.kt
+++ b/src/test/kotlin/unit/voter/ArticleVoterTest.kt
@@ -4,8 +4,8 @@ import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleVoter
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.entity.User
-import fr.dcproject.entity.UserI
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.voter.Vote.DENIED
 import fr.dcproject.voter.Vote.GRANTED
 import fr.postgresjson.connexion.Paginated
--- a/src/test/kotlin/unit/voter/CitizenVoterTest.kt
+++ b/src/test/kotlin/unit/voter/CitizenVoterTest.kt
@@ -3,8 +3,8 @@ package unit.voter
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenVoter
-import fr.dcproject.entity.User
-import fr.dcproject.entity.UserI
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.voter.Vote.DENIED
 import fr.dcproject.voter.Vote.GRANTED
 import io.mockk.mockkStatic
--- a/src/test/kotlin/unit/voter/CommentVoterTest.kt
+++ b/src/test/kotlin/unit/voter/CommentVoterTest.kt
@@ -8,8 +8,8 @@ import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.comment.generic.CommentForUpdate
 import fr.dcproject.component.comment.generic.CommentForView
 import fr.dcproject.component.comment.generic.CommentVoter
-import fr.dcproject.entity.User
-import fr.dcproject.entity.UserI
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.voter.Vote.DENIED
 import fr.dcproject.voter.Vote.GRANTED
 import fr.postgresjson.connexion.Paginated
--- a/src/test/kotlin/unit/voter/FollowVoterTest.kt
+++ b/src/test/kotlin/unit/voter/FollowVoterTest.kt
@@ -7,8 +7,8 @@ import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.entity.Follow
-import fr.dcproject.entity.User
-import fr.dcproject.entity.UserI
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.security.voter.FollowVoter
 import fr.dcproject.voter.NoSubjectDefinedException
 import fr.ktorVoter.ActionI
--- a/src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt
+++ b/src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt
@@ -5,8 +5,8 @@ import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.entity.OpinionChoice
-import fr.dcproject.entity.User
-import fr.dcproject.entity.UserI
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.security.voter.OpinionChoiceVoter
 import fr.dcproject.user
 import fr.ktorVoter.ActionI
--- a/src/test/kotlin/unit/voter/OpinionVoterTest.kt
+++ b/src/test/kotlin/unit/voter/OpinionVoterTest.kt
@@ -6,8 +6,8 @@ import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.entity.Opinion
 import fr.dcproject.entity.OpinionChoice
-import fr.dcproject.entity.User
-import fr.dcproject.entity.UserI
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.security.voter.OpinionVoter
 import fr.dcproject.user
 import fr.dcproject.voter.NoSubjectDefinedException
--- a/src/test/kotlin/unit/voter/VoteVoterTest.kt
+++ b/src/test/kotlin/unit/voter/VoteVoterTest.kt
@@ -7,8 +7,8 @@ import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.entity.User
-import fr.dcproject.entity.UserI
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.entity.VoteForUpdate
 import fr.dcproject.security.voter.VoteVoter
 import fr.dcproject.voter.NoSubjectDefinedException
--- a/src/test/kotlin/unit/voter/WorkgroupVoterTest.kt
+++ b/src/test/kotlin/unit/voter/WorkgroupVoterTest.kt
@@ -4,8 +4,8 @@ import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.entity.User
-import fr.dcproject.entity.UserI
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.entity.WorkgroupRef
 import fr.dcproject.entity.WorkgroupWithMembersI
 import fr.dcproject.security.voter.WorkgroupVoter