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/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

@@ -0,0 +1,30 @@
+package fr.dcproject.component.auth
+
+import fr.dcproject.component.citizen.CitizenRepository
+import io.ktor.application.*
+import io.ktor.auth.*
+import io.ktor.util.*
+import io.ktor.util.pipeline.*
+import org.koin.core.context.GlobalContext
+import fr.dcproject.component.citizen.Citizen as CitizenEntity
+
+class ForbiddenException(message: String) : Exception(message)
+
+private val citizenAttributeKey = AttributeKey<CitizenEntity>("CitizenContext")
+
+val ApplicationCall.citizen: CitizenEntity
+    get() = attributes.computeIfAbsent(citizenAttributeKey) {
+        val user = authentication.principal<UserI>() ?: throw ForbiddenException("No User Connected")
+        GlobalContext.get().koin.get<CitizenRepository>().findByUser(user)
+            ?: throw ForbiddenException("Citizen not found for this user id \"${user.id}\"")
+    }
+
+val ApplicationCall.citizenOrNull: CitizenEntity?
+    get() = authentication.principal<UserI>()?.let {
+        GlobalContext.get().koin.get<CitizenRepository>().findByUser(it)
+    }
+
+val PipelineContext<Unit, ApplicationCall>.citizen get() = context.citizen
+val PipelineContext<Unit, ApplicationCall>.citizenOrNull get() = context.citizenOrNull
+
+val ApplicationCall.user get() = authentication.principal<User>()

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.citizenOrNull
+import fr.dcproject.component.auth.citizen
+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.citizenOrNull
+import fr.dcproject.component.auth.citizen
+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.citizenOrNull
+import fr.dcproject.component.auth.citizen
+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.*