Move files

Move Application and configurations file to the application package
Move JWT files to the auth.jwt package
Move ApplicationContext to auth package an rename to CitizenContext

src/main/kotlin/application/Application.kt

@@ -1,4 +1,4 @@
-package fr.dcproject
+package fr.dcproject.application
 
 import com.fasterxml.jackson.core.util.DefaultIndenter
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter
@@ -7,16 +7,19 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategy
 import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.datatype.joda.JodaModule
 import com.github.jasync.sql.db.postgresql.exceptions.GenericDatabaseException
-import fr.dcproject.Env.PROD
+import fr.dcproject.application.Env.PROD
 import fr.dcproject.component.article.routes.findArticleVersions
 import fr.dcproject.component.article.routes.findArticles
 import fr.dcproject.component.article.routes.getOneArticle
 import fr.dcproject.component.article.routes.upsertArticle
+import fr.dcproject.component.auth.ForbiddenException
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserRepository
+import fr.dcproject.component.auth.jwt.JwtConfig
 import fr.dcproject.component.auth.routes.authLogin
 import fr.dcproject.component.auth.routes.authRegister
 import fr.dcproject.component.auth.routes.authSso
+import fr.dcproject.component.auth.user
 import fr.dcproject.component.citizen.routes.changeMyPassword
 import fr.dcproject.component.citizen.routes.findCitizen
 import fr.dcproject.component.citizen.routes.getCurrentCitizen
@@ -48,7 +51,7 @@ import io.ktor.application.*
 import io.ktor.auth.*
 import io.ktor.auth.jwt.*
 import io.ktor.client.*
-import io.ktor.client.engine.jetty.*
+import io.ktor.client.engine.jetty.Jetty
 import io.ktor.features.*
 import io.ktor.http.*
 import io.ktor.http.auth.*
@@ -56,6 +59,7 @@ import io.ktor.jackson.*
 import io.ktor.locations.*
 import io.ktor.response.*
 import io.ktor.routing.*
+import io.ktor.server.jetty.*
 import io.ktor.util.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -68,7 +72,7 @@ import java.time.Duration
 import java.util.*
 import java.util.concurrent.CompletionException
 
-fun main(args: Array<String>): Unit = io.ktor.server.jetty.EngineMain.main(args)
+fun main(args: Array<String>): Unit = EngineMain.main(args)
 
 enum class Env { PROD, TEST, CUCUMBER }
 

src/main/kotlin/application/Configuration.kt

@@ -1,14 +1,9 @@
-package fr.dcproject
+package fr.dcproject.application
 
-import com.auth0.jwt.JWT
-import com.auth0.jwt.JWTVerifier
-import com.auth0.jwt.algorithms.Algorithm
 import com.typesafe.config.ConfigFactory
-import fr.dcproject.component.auth.UserI
 import java.net.URI
-import java.util.*
 
-object Config {
+object Configuration {
     private var config = ConfigFactory.load()
 
     object Sql {
@@ -31,33 +26,3 @@ object Config {
     val exchangeNotificationName = "notification"
     val sendGridKey: String = config.getString("mail.sendGrid.key")
 }
-
-object JwtConfig {
-    private const val secret = "zAP5MBA4B4Ijz0MZaS48"
-    const val issuer = "dc-project.fr"
-    private const val validityInMs = 3_600_000 * 10 // 10 hours
-
-    // TODO change to RSA512
-    val algorithm = Algorithm.HMAC512(secret)
-
-    val verifier: JWTVerifier = JWT
-        .require(algorithm)
-        .withIssuer(issuer)
-        .build()
-
-    /**
-     * Produce a token for this combination of User and Account
-     * TODO move token creator in other place
-     */
-    fun makeToken(user: UserI): String = JWT.create()
-        .withSubject("Authentication")
-        .withIssuer(issuer)
-        .withClaim("id", user.id.toString())
-        .withExpiresAt(getExpiration())
-        .sign(algorithm)
-
-    /**
-     * Calculate the expiration Date based on current time + the given validity
-     */
-    private fun getExpiration() = Date(System.currentTimeMillis() + validityInMs)
-}

src/main/kotlin/application/Converters.kt

@@ -1,4 +1,4 @@
-package fr.dcproject
+package fr.dcproject.application
 
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRef
@@ -6,12 +6,14 @@ import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenRef
+import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.comment.generic.CommentRef
+import fr.dcproject.component.workgroup.Workgroup
+import fr.dcproject.component.workgroup.WorkgroupRef
+import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.entity.Constitution
 import fr.dcproject.entity.ConstitutionRef
-import fr.dcproject.component.workgroup.WorkgroupRef
 import fr.dcproject.repository.OpinionChoice
-import fr.dcproject.component.workgroup.WorkgroupRepository
 import io.ktor.features.*
 import io.ktor.util.*
 import org.koin.core.context.GlobalContext
@@ -84,7 +86,7 @@ val converters: ConverterDeclaration = {
         decode { values, _ ->
             val id = values.singleOrNull()?.let { UUID.fromString(it) }
                 ?: throw InternalError("Cannot convert $values to UUID")
-            get<fr.dcproject.component.citizen.CitizenRepository>().findById(id) ?: throw NotFoundException("Citizen $values not found")
+            get<CitizenRepository>().findById(id) ?: throw NotFoundException("Citizen $values not found")
         }
     }
 
@@ -113,7 +115,7 @@ val converters: ConverterDeclaration = {
         }
     }
 
-    convert<fr.dcproject.component.workgroup.Workgroup<CitizenBasic>> {
+    convert<Workgroup<CitizenBasic>> {
         decode { values, _ ->
             val id = values.singleOrNull()?.let { UUID.fromString(it) }
                 ?: throw InternalError("Cannot convert $values to UUID")

src/main/kotlin/application/KoinModule.kt

@@ -1,4 +1,4 @@
-package fr.dcproject
+package fr.dcproject.application
 
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
@@ -48,30 +48,30 @@ import fr.dcproject.repository.VoteConstitution as VoteConstitutionRepository
 @KtorExperimentalAPI
 val KoinModule = module {
 
-    single { Config }
+    single { Configuration }
 
     // SQL connection
     single {
         Connection(
-            host = Config.host,
+            host = Configuration.host,
-            port = Config.port,
+            port = Configuration.port,
-            database = Config.database,
+            database = Configuration.database,
-            username = Config.username,
+            username = Configuration.username,
-            password = Config.password
+            password = Configuration.password
         )
     }
 
     // Launch Database migration
-    single { Migrations(get(), Config.Sql.migrationFiles, Config.Sql.functionFiles) }
+    single { Migrations(get(), Configuration.Sql.migrationFiles, Configuration.Sql.functionFiles) }
 
     // Redis client
     single<RedisAsyncCommands<String, String>> {
-        RedisClient.create(Config.redis).connect()?.async() ?: error("Unable to connect to redis")
+        RedisClient.create(Configuration.redis).connect()?.async() ?: error("Unable to connect to redis")
     }
 
     // RabbitMQ
     single<ConnectionFactory> {
-        ConnectionFactory().apply { setUri(Config.rabbitmq) }
+        ConnectionFactory().apply { setUri(Configuration.rabbitmq) }
     }
 
     // JsonSerializer
@@ -97,7 +97,7 @@ val KoinModule = module {
     single {
         Requester.RequesterFactory(
             connection = get(),
-            functionsDirectory = Config.Sql.functionFiles
+            functionsDirectory = Configuration.Sql.functionFiles
         ).createRequester()
     }
 
@@ -127,19 +127,19 @@ val KoinModule = module {
     // Elasticsearch Client
     single<RestClient> {
         RestClient.builder(
-            HttpHost.create(Config.elasticsearch)
+            HttpHost.create(Configuration.elasticsearch)
         ).build()
     }
 
     single { ArticleViewManager(get()) }
 
     // Mailer
-    single { Mailer(Config.sendGridKey) }
+    single { Mailer(Configuration.sendGridKey) }
 
     // SSO Manager for connection
-    single { SsoManager(get<Mailer>(), Config.domain, get()) }
+    single { SsoManager(get<Mailer>(), Configuration.domain, get()) }
 
     single { Publisher(get(), get()) }
 
-    single { NotificationEmailSender(get<Mailer>(), Config.domain, get(), get()) }
+    single { NotificationEmailSender(get<Mailer>(), Configuration.domain, get(), get()) }
 }

src/main/kotlin/component/article/routes/FindArticleVersions.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.article.routes
 
-import fr.dcproject.citizenOrNull
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.article.ArticleVoter
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.voter.assert
 import fr.postgresjson.repository.RepositoryI
 import io.ktor.application.*

src/main/kotlin/component/article/routes/FindArticles.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.article.routes
 
-import fr.dcproject.citizenOrNull
 import fr.dcproject.component.article.ArticleForListing
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.article.ArticleVoter
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.voter.assert
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.repository.RepositoryI

src/main/kotlin/component/article/routes/GetOneArticle.kt

@@ -1,11 +1,11 @@
 package fr.dcproject.component.article.routes
 
-import fr.dcproject.citizenOrNull
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.article.ArticleViewManager
 import fr.dcproject.component.article.ArticleVoter
 import fr.dcproject.component.article.routes.ArticleRequest.Output
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.dto.*
 import fr.dcproject.voter.assert
 import io.ktor.application.*

src/main/kotlin/component/article/routes/UpsertArticle.kt

@@ -1,16 +1,16 @@
 package fr.dcproject.component.article.routes
 
-import fr.dcproject.citizen
-import fr.dcproject.citizenOrNull
 import fr.dcproject.component.article.ArticleForUpdate
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.article.ArticleVoter
 import fr.dcproject.component.article.routes.PostArticleRequest.Input
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupRef
+import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.event.ArticleUpdate
 import fr.dcproject.event.raiseEvent
-import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.voter.assert
 import io.ktor.application.*
 import io.ktor.locations.*

src/main/kotlin/component/auth/CitizenContext.kt

@@ -1,7 +1,5 @@
-package fr.dcproject
+package fr.dcproject.component.auth
 
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.CitizenRepository
 import io.ktor.application.*
 import io.ktor.auth.*

src/main/kotlin/component/auth/SsoManager.kt

@@ -3,10 +3,10 @@ package fr.dcproject.component.auth
 import com.sendgrid.helpers.mail.Mail
 import com.sendgrid.helpers.mail.objects.Content
 import com.sendgrid.helpers.mail.objects.Email
-import fr.dcproject.JwtConfig
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.citizen.CitizenWithEmail
 import fr.dcproject.component.citizen.CitizenWithUserI
+import fr.dcproject.makeToken
 import fr.dcproject.messages.Mailer
 import io.ktor.http.*
 
@@ -25,7 +25,7 @@ class SsoManager(
 
     fun <C> sendEmail(citizen: C, url: String) where C : CitizenWithEmail, C : CitizenWithUserI {
         mailer.sendEmail {
-            val token = JwtConfig.makeToken(citizen.user)
+            val token = citizen.user.makeToken()
             Mail(
                 Email("sso@$domain"),
                 "Connection",

src/main/kotlin/component/auth/jwt/JWTMaker.kt

@@ -0,0 +1,15 @@
+package fr.dcproject
+
+import com.auth0.jwt.JWT
+import fr.dcproject.component.auth.UserI
+import fr.dcproject.component.auth.jwt.JwtConfig
+
+/**
+ * Produce a token for this combination of User and Account
+ */
+fun UserI.makeToken(): String = JWT.create()
+    .withSubject("Authentication")
+    .withIssuer(JwtConfig.issuer)
+    .withClaim("id", id.toString())
+    .withExpiresAt(JwtConfig.getExpiration())
+    .sign(JwtConfig.algorithm)

src/main/kotlin/component/auth/jwt/JwtConfig.kt

@@ -0,0 +1,25 @@
+package fr.dcproject.component.auth.jwt
+
+import com.auth0.jwt.JWT
+import com.auth0.jwt.JWTVerifier
+import com.auth0.jwt.algorithms.Algorithm
+import java.util.*
+
+object JwtConfig {
+    private const val secret = "zAP5MBA4B4Ijz0MZaS48"
+    const val issuer = "dc-project.fr"
+    private const val validityInMs = 3_600_000 * 10 // 10 hours
+
+    // TODO change to RSA512
+    val algorithm: Algorithm = Algorithm.HMAC512(secret)
+
+    val verifier: JWTVerifier = JWT
+        .require(algorithm)
+        .withIssuer(issuer)
+        .build()
+
+    /**
+     * Calculate the expiration Date based on current time + the given validity
+     */
+    fun getExpiration() = Date(System.currentTimeMillis() + validityInMs)
+}

src/main/kotlin/component/auth/routes/Login.kt

@@ -1,8 +1,8 @@
 package fr.dcproject.component.auth.routes
 
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
-import fr.dcproject.JwtConfig
 import fr.dcproject.component.auth.UserRepository
+import fr.dcproject.makeToken
 import io.ktor.application.*
 import io.ktor.auth.*
 import io.ktor.http.*
@@ -23,7 +23,7 @@ fun Route.authLogin(userRepo: UserRepository) {
         try {
             val credentials = call.receive<UserPasswordCredential>()
             userRepo.findByCredentials(credentials)?.let { user ->
-                call.respondText(JwtConfig.makeToken(user))
+                call.respondText(user.makeToken())
             } ?: call.respond(HttpStatusCode.BadRequest, "Username not exist or password is wrong")
         } catch (e: MismatchedInputException) {
             call.respond(HttpStatusCode.BadRequest, "You must be send name and password to the request")

src/main/kotlin/component/auth/routes/Register.kt

@@ -1,13 +1,13 @@
 package fr.dcproject.component.auth.routes
 
 import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
-import fr.dcproject.JwtConfig
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.auth.routes.RegisterRequest.Input
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRepository
+import fr.dcproject.makeToken
 import io.ktor.application.*
 import io.ktor.features.*
 import io.ktor.http.*
@@ -61,7 +61,7 @@ fun Route.authRegister(citizenRepo: CitizenRepository) {
         try {
             val citizen = call.receive<Input>().toCitizen()
             val createdCitizen = citizenRepo.insertWithUser(citizen)?.user ?: throw BadRequestException("Bad request")
-            call.respondText(JwtConfig.makeToken(createdCitizen))
+            call.respondText(createdCitizen.makeToken())
         } catch (e: MissingKotlinParameterException) {
             call.respond(HttpStatusCode.BadRequest)
         }

src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.citizen.routes
 
 import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
-import fr.dcproject.citizen
-import fr.dcproject.citizenOrNull
 import fr.dcproject.component.auth.UserRepository
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenVoter
 import fr.dcproject.voter.assert

src/main/kotlin/component/citizen/routes/FindCitizens.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.citizen.routes
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.citizen.CitizenVoter
 import fr.dcproject.voter.assert

src/main/kotlin/component/citizen/routes/GetCurrentCitizen.kt

@@ -1,7 +1,7 @@
 package fr.dcproject.component.citizen.routes
 
-import fr.dcproject.citizen
+import fr.dcproject.component.auth.citizen
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenVoter
 import fr.dcproject.voter.assert
 import io.ktor.application.*

src/main/kotlin/component/citizen/routes/GetOneCitizen.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.citizen.routes
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenVoter
 import fr.dcproject.voter.assert

src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt

@@ -1,8 +1,8 @@
 package fr.dcproject.component.comment.article.routes
 
-import fr.dcproject.citizen
-import fr.dcproject.citizenOrNull
 import fr.dcproject.component.article.ArticleForView
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.dcproject.component.comment.generic.CommentForUpdate
 import fr.dcproject.component.comment.generic.CommentVoter

src/main/kotlin/component/comment/article/routes/GetArticleComments.kt

@@ -1,7 +1,7 @@
 package fr.dcproject.component.comment.article.routes
 
-import fr.dcproject.citizenOrNull
 import fr.dcproject.component.article.ArticleRef
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.voter.assert

src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.comment.article.routes
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.dcproject.component.comment.generic.CommentVoter

src/main/kotlin/component/comment/generic/routes/CreateCommentChildrenRequest.kt

@@ -1,7 +1,7 @@
 package fr.dcproject.component.comment.generic.routes
 
-import fr.dcproject.citizen
+import fr.dcproject.component.auth.citizen
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.generic.CommentForUpdate
 import fr.dcproject.component.comment.generic.CommentRef
 import fr.dcproject.component.comment.generic.CommentRepository

src/main/kotlin/component/comment/generic/routes/EditComment.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.comment.generic.routes
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.generic.CommentRef
 import fr.dcproject.component.comment.generic.CommentRepository
 import fr.dcproject.component.comment.generic.CommentVoter

src/main/kotlin/component/comment/generic/routes/GetCommentChildrenRequest.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.comment.generic.routes
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.generic.CommentRepository
 import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.voter.assert

src/main/kotlin/component/comment/generic/routes/GetOneComment.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.comment.generic.routes
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.generic.CommentRef
 import fr.dcproject.component.comment.generic.CommentRepository
 import fr.dcproject.component.comment.generic.CommentVoter

src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt

@@ -1,11 +1,11 @@
 package fr.dcproject.component.workgroup.routes
 
-import fr.dcproject.citizen
+import fr.dcproject.component.auth.citizen
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupSimple
-import fr.dcproject.component.workgroup.routes.CreateWorkgroup.PostWorkgroupRequest.Input
 import fr.dcproject.component.workgroup.WorkgroupVoter
+import fr.dcproject.component.workgroup.routes.CreateWorkgroup.PostWorkgroupRequest.Input
 import fr.dcproject.voter.assert
 import io.ktor.application.*
 import io.ktor.http.*

src/main/kotlin/component/workgroup/routes/DeleteWorkgroup.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.workgroup.routes
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.voter.assert

src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.workgroup.routes
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupRepository
-import fr.dcproject.component.workgroup.routes.EditWorkgroup.PutWorkgroupRequest.Input
 import fr.dcproject.component.workgroup.WorkgroupVoter
+import fr.dcproject.component.workgroup.routes.EditWorkgroup.PutWorkgroupRequest.Input
 import fr.dcproject.voter.assert
 import io.ktor.application.*
 import io.ktor.http.*

src/main/kotlin/component/workgroup/routes/GetWorkgroup.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.workgroup.routes
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.voter.assert

src/main/kotlin/component/workgroup/routes/GetWorkgroups.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.workgroup.routes
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.utils.toUUID

src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.workgroup.routes.members
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.workgroup.WorkgroupRepository
-import fr.dcproject.component.workgroup.WorkgroupWithMembersI
 import fr.dcproject.component.workgroup.WorkgroupVoter
+import fr.dcproject.component.workgroup.WorkgroupWithMembersI
 import fr.dcproject.voter.assert
 import io.ktor.application.*
 import io.ktor.http.*

src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.workgroup.routes.members
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.workgroup.WorkgroupRepository
-import fr.dcproject.component.workgroup.WorkgroupWithMembersI
 import fr.dcproject.component.workgroup.WorkgroupVoter
+import fr.dcproject.component.workgroup.WorkgroupWithMembersI
 import fr.dcproject.voter.assert
 import io.ktor.application.*
 import io.ktor.http.*

src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.workgroup.routes.members
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.workgroup.WorkgroupRepository
-import fr.dcproject.component.workgroup.WorkgroupWithMembersI
 import fr.dcproject.component.workgroup.WorkgroupVoter
+import fr.dcproject.component.workgroup.WorkgroupWithMembersI
 import fr.dcproject.voter.assert
 import io.ktor.application.*
 import io.ktor.http.*

src/main/kotlin/event/EventNotification.kt

@@ -2,7 +2,7 @@ package fr.dcproject.event
 
 import com.rabbitmq.client.*
 import com.rabbitmq.client.BuiltinExchangeType.DIRECT
-import fr.dcproject.Config
+import fr.dcproject.application.Configuration
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.entity.FollowSimple
@@ -46,7 +46,7 @@ class EventNotification(
 
     fun config() {
         /* Config Rabbit */
-        val exchangeName = Config.exchangeNotificationName
+        val exchangeName = Configuration.exchangeNotificationName
         rabbitFactory.newConnection().use { connection ->
             connection.createChannel().use { channel ->
                 channel.queueDeclare("push", true, false, false, null)

src/main/kotlin/event/publisher/Publisher.kt

@@ -2,7 +2,7 @@ package fr.dcproject.event.publisher
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.rabbitmq.client.ConnectionFactory
-import fr.dcproject.Config
+import fr.dcproject.application.Configuration
 import fr.dcproject.event.EntityEvent
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
@@ -19,7 +19,7 @@ class Publisher(
         return GlobalScope.launch {
             factory.newConnection().use { connection ->
                 connection.createChannel().use { channel ->
-                    channel.basicPublish(Config.exchangeNotificationName, "", null, it.serialize().toByteArray())
+                    channel.basicPublish(Configuration.exchangeNotificationName, "", null, it.serialize().toByteArray())
                     logger.debug("Publish message ${it.target.id}")
                 }
             }

src/main/kotlin/routes/CommentConstitution.kt

@@ -1,7 +1,7 @@
 package fr.dcproject.routes
 
-import fr.dcproject.citizen
+import fr.dcproject.component.auth.citizen
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.comment.generic.CommentForUpdate
 import fr.dcproject.component.comment.generic.CommentVoter

src/main/kotlin/routes/Constitution.kt

@@ -1,7 +1,7 @@
 package fr.dcproject.routes
 
-import fr.dcproject.citizen
 import fr.dcproject.component.article.ArticleRef
+import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.citizen.CitizenWithUserI
 import fr.dcproject.entity.ConstitutionSimple
 import fr.dcproject.entity.ConstitutionSimple.TitleSimple

src/main/kotlin/routes/FollowArticle.kt

@@ -1,7 +1,7 @@
 package fr.dcproject.routes
 
-import fr.dcproject.citizen
 import fr.dcproject.component.article.ArticleRef
+import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.entity.FollowForUpdate
 import fr.dcproject.security.voter.FollowVoter.Action.*

src/main/kotlin/routes/FollowConstitution.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.routes
 
-import fr.dcproject.citizen
+import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.entity.ConstitutionRef
 import fr.dcproject.entity.FollowForUpdate

src/main/kotlin/routes/Notification.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.routes
 
-import fr.dcproject.citizen
+import fr.dcproject.component.auth.citizen
 import fr.dcproject.event.Event
 import fr.postgresjson.serializer.deserialize
 import io.ktor.client.*

src/main/kotlin/routes/OpinionArticle.kt

@@ -1,7 +1,7 @@
 package fr.dcproject.routes
 
-import fr.dcproject.citizen
 import fr.dcproject.component.article.ArticleForView
+import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.entity.OpinionChoiceRef
 import fr.dcproject.security.voter.OpinionVoter.Action.CREATE

src/main/kotlin/routes/VoteArticle.kt

@@ -1,7 +1,7 @@
 package fr.dcproject.routes
 
-import fr.dcproject.citizen
 import fr.dcproject.component.article.ArticleForView
+import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.comment.generic.CommentRepository
 import fr.dcproject.entity.VoteForUpdate

src/main/kotlin/routes/VoteConstitution.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.routes
 
-import fr.dcproject.citizen
+import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.entity.VoteForUpdate
 import fr.dcproject.routes.VoteConstitutionPaths.ConstitutionVoteRequest.Content

src/main/kotlin/voter/ConstitutionVoter.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.security.voter
 
 import fr.dcproject.component.auth.UserI
+import fr.dcproject.component.auth.user
 import fr.dcproject.component.comment.generic.CommentForView
 import fr.dcproject.entity.ConstitutionSimple
-import fr.dcproject.user
 import fr.dcproject.voter.NoRuleDefinedException
 import fr.dcproject.voter.NoSubjectDefinedException
 import fr.ktorVoter.*

src/main/kotlin/voter/FollowVoter.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.security.voter
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.entity.FollowI
 import fr.dcproject.voter.NoSubjectDefinedException

src/main/kotlin/voter/OpinionVoter.kt

@@ -2,8 +2,8 @@ package fr.dcproject.security.voter
 
 import fr.dcproject.component.article.ArticleAuthI
 import fr.dcproject.component.article.ArticleForView
+import fr.dcproject.component.auth.user
 import fr.dcproject.entity.Opinion
-import fr.dcproject.user
 import fr.dcproject.voter.NoRuleDefinedException
 import fr.dcproject.voter.NoSubjectDefinedException
 import fr.ktorVoter.*

src/main/kotlin/voter/VoteVoter.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.security.voter
 
-import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.entity.VoteForUpdateI
 import fr.dcproject.entity.VoteI
 import fr.dcproject.voter.NoSubjectDefinedException

src/test/kotlin/CucumberTest.kt

@@ -1,6 +1,6 @@
-import fr.dcproject.Config
+import fr.dcproject.application.Configuration
-import fr.dcproject.Env.CUCUMBER
+import fr.dcproject.application.Env.CUCUMBER
-import fr.dcproject.module
+import fr.dcproject.application.module
 import fr.dcproject.utils.LoggerDelegate
 import fr.postgresjson.connexion.Connection
 import fr.postgresjson.connexion.Requester
@@ -32,9 +32,9 @@ class CucumberTest : En, KoinTest {
 
     init {
         if (!unitialized) {
-            Config.database = "test"
+            Configuration.database = "test"
-            Config.username = "test"
+            Configuration.username = "test"
-            Config.password = "test"
+            Configuration.password = "test"
 
             withTestApplication({ module(CUCUMBER) }) {
                 migrations()
@@ -43,9 +43,9 @@ class CucumberTest : En, KoinTest {
         }
 
         Before(-1) { _: Scenario ->
-            Config.database = "test"
+            Configuration.database = "test"
-            Config.username = "test"
+            Configuration.username = "test"
-            Config.password = "test"
+            Configuration.password = "test"
             ktorContext.start()
             //language=PostgreSQL
             get<Connection>().sendQuery("start transaction;", listOf())
@@ -59,9 +59,9 @@ class CucumberTest : En, KoinTest {
     }
 
     private fun migrations() {
-        Config.database = "test"
+        Configuration.database = "test"
-        Config.username = "test"
+        Configuration.username = "test"
-        Config.password = "test"
+        Configuration.password = "test"
         val migrations: Migrations = get()
         migrations.forceAllDown()
         migrations.run()
@@ -85,7 +85,7 @@ class CucumberTest : En, KoinTest {
     private fun getFixturesRequester(): Requester {
         return Requester.RequesterFactory(
             connection = get(),
-            queriesDirectory = Config.Sql.fixtureFiles
+            queriesDirectory = Configuration.Sql.fixtureFiles
         ).createRequester()
     }
 }

src/test/kotlin/functional/MailerTest.kt

@@ -3,9 +3,9 @@ package functional
 import com.sendgrid.helpers.mail.Mail
 import com.sendgrid.helpers.mail.objects.Content
 import com.sendgrid.helpers.mail.objects.Email
-import fr.dcproject.Env
+import fr.dcproject.application.Env.TEST
+import fr.dcproject.application.module
 import fr.dcproject.messages.Mailer
-import fr.dcproject.module
 import io.ktor.locations.*
 import io.ktor.server.testing.*
 import io.ktor.util.*
@@ -25,7 +25,7 @@ class MailerTest : KoinTest, AutoCloseKoinTest() {
     @Test
     @Tag("online, functional")
     fun `can be send an email`() {
-        withTestApplication({ module(Env.TEST) }) {
+        withTestApplication({ module(TEST) }) {
             get<Mailer>().sendEmail {
                 Mail(
                     Email("sso@dc-project.fr"),

src/test/kotlin/functional/ViewTest.kt

@@ -1,10 +1,10 @@
 package functional
 
-import fr.dcproject.Env
+import fr.dcproject.application.Env.TEST
+import fr.dcproject.application.module
 import fr.dcproject.component.article.ArticleRefVersioning
 import fr.dcproject.component.article.ArticleViewManager
 import fr.dcproject.component.citizen.CitizenRef
-import fr.dcproject.module
 import io.ktor.locations.*
 import io.ktor.server.testing.*
 import io.ktor.util.*
@@ -26,7 +26,7 @@ class ViewTest {
         val article = ArticleRefVersioning(id = UUID.randomUUID(), versionId = UUID.randomUUID())
         val citizenRef = CitizenRef()
 
-        withTestApplication({ module(Env.TEST) }) {
+        withTestApplication({ module(TEST) }) {
             val viewManager: ArticleViewManager = application.get()
 
             /* Get view before */

src/test/kotlin/steps/KtorServerAuthSteps.kt

@@ -1,7 +1,7 @@
 package steps
 
 import com.auth0.jwt.JWT
-import fr.dcproject.JwtConfig
+import fr.dcproject.component.auth.jwt.JwtConfig
 import fr.dcproject.component.citizen.CitizenRepository
 import io.cucumber.java8.En
 import io.ktor.http.*

src/test/kotlin/unit/voter/FollowVoterTest.kt

@@ -1,9 +1,9 @@
 package unit.voter
 
-import fr.dcproject.citizenOrNull
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
@@ -105,7 +105,7 @@ internal class FollowVoterTest {
     )
 
     init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
+        mockkStatic("fr.dcproject.component.auth.CitizenContextKt")
     }
 
     @Test

src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt

@@ -3,12 +3,12 @@ package unit.voter
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
+import fr.dcproject.component.auth.user
 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.security.voter.OpinionChoiceVoter
-import fr.dcproject.user
 import fr.ktorVoter.ActionI
 import fr.ktorVoter.Vote
 import fr.ktorVoter.can
@@ -64,7 +64,7 @@ internal class OpinionChoiceVoterTest {
     )
 
     init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
+        mockkStatic("fr.dcproject.component.auth.CitizenContextKt")
     }
 
     @Test

src/test/kotlin/unit/voter/OpinionVoterTest.kt

@@ -3,13 +3,13 @@ package unit.voter
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
+import fr.dcproject.component.auth.user
 import fr.dcproject.component.citizen.CitizenBasic
 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.security.voter.OpinionVoter
-import fr.dcproject.user
 import fr.dcproject.voter.NoSubjectDefinedException
 import fr.ktorVoter.*
 import io.ktor.application.*
@@ -79,7 +79,7 @@ internal class OpinionVoterTest {
     )
 
     init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
+        mockkStatic("fr.dcproject.component.auth.CitizenContextKt")
     }
 
     @Test

src/test/kotlin/unit/voter/VoteVoterTest.kt

@@ -1,10 +1,10 @@
 package unit.voter
 
-import fr.dcproject.citizenOrNull
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
+import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
@@ -116,7 +116,7 @@ internal class VoteVoterTest {
     )
 
     init {
-        mockkStatic("fr.dcproject.ApplicationContextKt")
+        mockkStatic("fr.dcproject.component.auth.CitizenContextKt")
     }
 
     @Test