diff --git a/src/main/kotlin/application/Application.kt b/src/main/kotlin/application/Application.kt index a87bcfb..724ecd9 100644 --- a/src/main/kotlin/application/Application.kt +++ b/src/main/kotlin/application/Application.kt @@ -8,6 +8,7 @@ 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.application.Env.PROD +import fr.dcproject.common.security.AccessDeniedException import fr.dcproject.component.article.articleKoinModule import fr.dcproject.component.article.routes.installArticleRoutes import fr.dcproject.component.auth.ForbiddenException @@ -36,7 +37,6 @@ import fr.dcproject.component.vote.routes.installVoteRoutes import fr.dcproject.component.vote.voteKoinModule import fr.dcproject.component.workgroup.routes.installWorkgroupRoutes import fr.dcproject.component.workgroup.workgroupKoinModule -import fr.dcproject.security.AccessDeniedException import fr.postgresjson.migration.Migrations import io.ktor.application.Application import io.ktor.application.ApplicationStopped diff --git a/src/main/kotlin/application/KoinModule.kt b/src/main/kotlin/application/KoinModule.kt index 8255dc0..3c04166 100644 --- a/src/main/kotlin/application/KoinModule.kt +++ b/src/main/kotlin/application/KoinModule.kt @@ -8,11 +8,11 @@ import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.datatype.joda.JodaModule import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.rabbitmq.client.ConnectionFactory +import fr.dcproject.common.email.Mailer import fr.dcproject.component.notification.NotificationConsumer +import fr.dcproject.component.notification.NotificationEmailSender import fr.dcproject.component.notification.NotificationsPush import fr.dcproject.component.notification.Publisher -import fr.dcproject.messages.Mailer -import fr.dcproject.messages.NotificationEmailSender import fr.postgresjson.connexion.Connection import fr.postgresjson.connexion.Requester import fr.postgresjson.migration.Migrations diff --git a/src/main/kotlin/messages/Mailer.kt b/src/main/kotlin/common/email/Mailer.kt similarity index 94% rename from src/main/kotlin/messages/Mailer.kt rename to src/main/kotlin/common/email/Mailer.kt index 9d91af7..334a283 100644 --- a/src/main/kotlin/messages/Mailer.kt +++ b/src/main/kotlin/common/email/Mailer.kt @@ -1,4 +1,4 @@ -package fr.dcproject.messages +package fr.dcproject.common.email import com.sendgrid.Method import com.sendgrid.Request diff --git a/src/main/kotlin/security/AccessControlModule.kt b/src/main/kotlin/common/security/AccessControlModule.kt similarity index 99% rename from src/main/kotlin/security/AccessControlModule.kt rename to src/main/kotlin/common/security/AccessControlModule.kt index d11aa01..1fe2956 100644 --- a/src/main/kotlin/security/AccessControlModule.kt +++ b/src/main/kotlin/common/security/AccessControlModule.kt @@ -1,4 +1,4 @@ -package fr.dcproject.security +package fr.dcproject.common.security /** Responses of AccessControl */ enum class AccessDecision { diff --git a/src/main/kotlin/utils/DateTime.kt b/src/main/kotlin/common/utils/DateTime.kt similarity index 81% rename from src/main/kotlin/utils/DateTime.kt rename to src/main/kotlin/common/utils/DateTime.kt index 1fec3ba..74ee9d2 100644 --- a/src/main/kotlin/utils/DateTime.kt +++ b/src/main/kotlin/common/utils/DateTime.kt @@ -1,4 +1,4 @@ -package fr.dcproject.utils +package fr.dcproject.common.utils import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat diff --git a/src/main/kotlin/utils/Elastic.kt b/src/main/kotlin/common/utils/Elastic.kt similarity index 95% rename from src/main/kotlin/utils/Elastic.kt rename to src/main/kotlin/common/utils/Elastic.kt index b7955f7..b5f98b7 100644 --- a/src/main/kotlin/utils/Elastic.kt +++ b/src/main/kotlin/common/utils/Elastic.kt @@ -1,4 +1,4 @@ -package fr.dcproject.utils +package fr.dcproject.common.utils import com.jayway.jsonpath.JsonPath import com.jayway.jsonpath.PathNotFoundException diff --git a/src/main/kotlin/utils/LoggerDelegate.kt b/src/main/kotlin/common/utils/LoggerDelegate.kt similarity index 90% rename from src/main/kotlin/utils/LoggerDelegate.kt rename to src/main/kotlin/common/utils/LoggerDelegate.kt index 55322c5..d6392ee 100644 --- a/src/main/kotlin/utils/LoggerDelegate.kt +++ b/src/main/kotlin/common/utils/LoggerDelegate.kt @@ -1,4 +1,4 @@ -package fr.dcproject.utils +package fr.dcproject.common.utils import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/src/main/kotlin/utils/Request.kt b/src/main/kotlin/common/utils/Request.kt similarity index 96% rename from src/main/kotlin/utils/Request.kt rename to src/main/kotlin/common/utils/Request.kt index e144b6e..296ce6d 100644 --- a/src/main/kotlin/utils/Request.kt +++ b/src/main/kotlin/common/utils/Request.kt @@ -1,4 +1,4 @@ -package fr.dcproject.utils +package fr.dcproject.common.utils import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException import io.ktor.application.ApplicationCall diff --git a/src/main/kotlin/utils/Resources.kt b/src/main/kotlin/common/utils/Resources.kt similarity index 84% rename from src/main/kotlin/utils/Resources.kt rename to src/main/kotlin/common/utils/Resources.kt index 92336d7..0a3de93 100644 --- a/src/main/kotlin/utils/Resources.kt +++ b/src/main/kotlin/common/utils/Resources.kt @@ -1,4 +1,4 @@ -package fr.dcproject.utils +package fr.dcproject.common.utils fun String.readResource(callback: (String) -> Unit = {}): String { val content = callback::class.java.getResource(this).readText() diff --git a/src/main/kotlin/utils/Uuid.kt b/src/main/kotlin/common/utils/Uuid.kt similarity index 87% rename from src/main/kotlin/utils/Uuid.kt rename to src/main/kotlin/common/utils/Uuid.kt index 47f53aa..a820612 100644 --- a/src/main/kotlin/utils/Uuid.kt +++ b/src/main/kotlin/common/utils/Uuid.kt @@ -1,4 +1,4 @@ -package fr.dcproject.utils +package fr.dcproject.common.utils import java.util.UUID diff --git a/src/main/kotlin/utils/waitElastic.kt b/src/main/kotlin/common/utils/waitElastic.kt similarity index 96% rename from src/main/kotlin/utils/waitElastic.kt rename to src/main/kotlin/common/utils/waitElastic.kt index d95d6fd..5419797 100644 --- a/src/main/kotlin/utils/waitElastic.kt +++ b/src/main/kotlin/common/utils/waitElastic.kt @@ -1,4 +1,4 @@ -package fr.dcproject.utils +package fr.dcproject.common.utils import org.elasticsearch.client.Request import org.elasticsearch.client.RestClient diff --git a/src/main/kotlin/component/article/ArticleAccessControl.kt b/src/main/kotlin/component/article/ArticleAccessControl.kt index e6d00b1..82e4fae 100644 --- a/src/main/kotlin/component/article/ArticleAccessControl.kt +++ b/src/main/kotlin/component/article/ArticleAccessControl.kt @@ -2,9 +2,9 @@ package fr.dcproject.component.article import fr.dcproject.common.entity.CreatedBy import fr.dcproject.common.entity.VersionableRef +import fr.dcproject.common.security.AccessControl +import fr.dcproject.common.security.AccessResponse import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.security.AccessControl -import fr.dcproject.security.AccessResponse class ArticleAccessControl(private val articleRepo: ArticleRepository) : AccessControl() { fun > canView(subjects: List, citizen: CitizenI?): AccessResponse = diff --git a/src/main/kotlin/component/article/ArticleViewManager.kt b/src/main/kotlin/component/article/ArticleViewManager.kt index c9c6c4c..50e429f 100644 --- a/src/main/kotlin/component/article/ArticleViewManager.kt +++ b/src/main/kotlin/component/article/ArticleViewManager.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.article import fr.dcproject.common.entity.VersionableRef +import fr.dcproject.common.utils.contentToString +import fr.dcproject.common.utils.getJsonField +import fr.dcproject.common.utils.toIso import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.views.ViewManager import fr.dcproject.component.views.entity.ViewAggregation -import fr.dcproject.utils.contentToString -import fr.dcproject.utils.getJsonField -import fr.dcproject.utils.toIso import org.elasticsearch.client.Request import org.elasticsearch.client.Response import org.elasticsearch.client.RestClient diff --git a/src/main/kotlin/component/article/routes/FindArticleVersions.kt b/src/main/kotlin/component/article/routes/FindArticleVersions.kt index 7c01b17..2454aa6 100644 --- a/src/main/kotlin/component/article/routes/FindArticleVersions.kt +++ b/src/main/kotlin/component/article/routes/FindArticleVersions.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.article.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.article.ArticleAccessControl import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.article.ArticleRepository import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.security.assert import fr.postgresjson.repository.RepositoryI import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/article/routes/FindArticles.kt b/src/main/kotlin/component/article/routes/FindArticles.kt index d16a4f7..8a5358c 100644 --- a/src/main/kotlin/component/article/routes/FindArticles.kt +++ b/src/main/kotlin/component/article/routes/FindArticles.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.article.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.article.ArticleAccessControl import fr.dcproject.component.article.ArticleForListing import fr.dcproject.component.article.ArticleRepository import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI -import fr.dcproject.security.assert import fr.postgresjson.connexion.Paginated import fr.postgresjson.repository.RepositoryI import io.ktor.application.call diff --git a/src/main/kotlin/component/article/routes/GetOneArticle.kt b/src/main/kotlin/component/article/routes/GetOneArticle.kt index 9e6c2d0..3889038 100644 --- a/src/main/kotlin/component/article/routes/GetOneArticle.kt +++ b/src/main/kotlin/component/article/routes/GetOneArticle.kt @@ -2,6 +2,7 @@ package fr.dcproject.component.article.routes import fr.dcproject.common.dto.CreatedAt import fr.dcproject.common.dto.Versionable +import fr.dcproject.common.security.assert import fr.dcproject.component.article.ArticleAccessControl import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.article.ArticleRef @@ -12,7 +13,6 @@ import fr.dcproject.component.opinion.dto.Opinionable import fr.dcproject.component.views.dto.Viewable import fr.dcproject.component.views.entity.ViewAggregation import fr.dcproject.component.vote.dto.Votable -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/article/routes/UpsertArticle.kt b/src/main/kotlin/component/article/routes/UpsertArticle.kt index 7c38b51..e37a5a8 100644 --- a/src/main/kotlin/component/article/routes/UpsertArticle.kt +++ b/src/main/kotlin/component/article/routes/UpsertArticle.kt @@ -1,5 +1,7 @@ package fr.dcproject.component.article.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.article.ArticleAccessControl import fr.dcproject.component.article.ArticleForUpdate import fr.dcproject.component.article.ArticleForView @@ -10,8 +12,6 @@ import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.notification.ArticleUpdateNotification import fr.dcproject.component.notification.Publisher import fr.dcproject.component.workgroup.WorkgroupRef -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/auth/KoinModule.kt b/src/main/kotlin/component/auth/KoinModule.kt index 24d3fa0..682d611 100644 --- a/src/main/kotlin/component/auth/KoinModule.kt +++ b/src/main/kotlin/component/auth/KoinModule.kt @@ -1,7 +1,7 @@ package fr.dcproject.component.auth import fr.dcproject.application.Configuration -import fr.dcproject.messages.Mailer +import fr.dcproject.common.email.Mailer import org.koin.dsl.module val authKoinModule = module { diff --git a/src/main/kotlin/component/auth/PasswordlessAuth.kt b/src/main/kotlin/component/auth/PasswordlessAuth.kt index a4bde5f..9b9dad7 100644 --- a/src/main/kotlin/component/auth/PasswordlessAuth.kt +++ b/src/main/kotlin/component/auth/PasswordlessAuth.kt @@ -3,11 +3,11 @@ 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.common.email.Mailer import fr.dcproject.component.auth.jwt.makeToken import fr.dcproject.component.citizen.CitizenRepository import fr.dcproject.component.citizen.CitizenWithEmail import fr.dcproject.component.citizen.CitizenWithUserI -import fr.dcproject.messages.Mailer import io.ktor.http.URLBuilder /** diff --git a/src/main/kotlin/component/auth/routes/Login.kt b/src/main/kotlin/component/auth/routes/Login.kt index a8e0e58..c7fc25f 100644 --- a/src/main/kotlin/component/auth/routes/Login.kt +++ b/src/main/kotlin/component/auth/routes/Login.kt @@ -1,9 +1,9 @@ package fr.dcproject.component.auth.routes import com.fasterxml.jackson.databind.exc.MismatchedInputException +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.UserRepository import fr.dcproject.component.auth.jwt.makeToken -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.call import io.ktor.auth.UserPasswordCredential import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/component/auth/routes/Register.kt b/src/main/kotlin/component/auth/routes/Register.kt index 7dd2147..1cdc248 100644 --- a/src/main/kotlin/component/auth/routes/Register.kt +++ b/src/main/kotlin/component/auth/routes/Register.kt @@ -1,6 +1,7 @@ package fr.dcproject.component.auth.routes import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.User import fr.dcproject.component.auth.UserI import fr.dcproject.component.auth.jwt.makeToken @@ -8,7 +9,6 @@ import fr.dcproject.component.auth.routes.Register.RegisterRequest.Input import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.citizen.CitizenRepository -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.call import io.ktor.features.BadRequestException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/component/auth/routes/Sso.kt b/src/main/kotlin/component/auth/routes/Sso.kt index abf1f2a..26b4155 100644 --- a/src/main/kotlin/component/auth/routes/Sso.kt +++ b/src/main/kotlin/component/auth/routes/Sso.kt @@ -1,8 +1,8 @@ package fr.dcproject.component.auth.routes +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.PasswordlessAuth import fr.dcproject.component.auth.routes.Sso.PasswordlessRequest.Input -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/citizen/CitizenAccessControl.kt b/src/main/kotlin/component/citizen/CitizenAccessControl.kt index 2ec336c..856ae52 100644 --- a/src/main/kotlin/component/citizen/CitizenAccessControl.kt +++ b/src/main/kotlin/component/citizen/CitizenAccessControl.kt @@ -1,7 +1,7 @@ package fr.dcproject.component.citizen -import fr.dcproject.security.AccessControl -import fr.dcproject.security.AccessResponse +import fr.dcproject.common.security.AccessControl +import fr.dcproject.common.security.AccessResponse import fr.postgresjson.entity.EntityDeletedAt class CitizenAccessControl : AccessControl() { diff --git a/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt b/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt index 9402728..524bed9 100644 --- a/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt +++ b/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.citizen.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.UserRepository import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenAccessControl import fr.dcproject.component.citizen.CitizenRef -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.call import io.ktor.auth.UserPasswordCredential import io.ktor.features.BadRequestException diff --git a/src/main/kotlin/component/citizen/routes/FindCitizens.kt b/src/main/kotlin/component/citizen/routes/FindCitizens.kt index d6b35d9..d25311d 100644 --- a/src/main/kotlin/component/citizen/routes/FindCitizens.kt +++ b/src/main/kotlin/component/citizen/routes/FindCitizens.kt @@ -1,11 +1,11 @@ package fr.dcproject.component.citizen.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenAccessControl import fr.dcproject.component.citizen.CitizenRepository import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI -import fr.dcproject.security.assert import fr.postgresjson.repository.RepositoryI import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/citizen/routes/GetCurrentCitizen.kt b/src/main/kotlin/component/citizen/routes/GetCurrentCitizen.kt index 4cdd71b..db61b65 100644 --- a/src/main/kotlin/component/citizen/routes/GetCurrentCitizen.kt +++ b/src/main/kotlin/component/citizen/routes/GetCurrentCitizen.kt @@ -1,9 +1,9 @@ package fr.dcproject.component.citizen.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenAccessControl -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt b/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt index a32259c..2d56d84 100644 --- a/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt +++ b/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.citizen.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenAccessControl import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.citizen.CitizenRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt b/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt index 7521d5e..b9c1428 100644 --- a/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt +++ b/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt @@ -1,5 +1,7 @@ package fr.dcproject.component.comment.article.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull @@ -7,8 +9,6 @@ import fr.dcproject.component.comment.article.CommentArticleRepository import fr.dcproject.component.comment.article.routes.CreateCommentArticle.PostArticleCommentRequest.Input import fr.dcproject.component.comment.generic.CommentAccessControl import fr.dcproject.component.comment.generic.CommentForUpdate -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/component/comment/article/routes/GetArticleComments.kt b/src/main/kotlin/component/comment/article/routes/GetArticleComments.kt index 5768cd5..69fea1e 100644 --- a/src/main/kotlin/component/comment/article/routes/GetArticleComments.kt +++ b/src/main/kotlin/component/comment/article/routes/GetArticleComments.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.comment.article.routes +import fr.dcproject.common.security.assert 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.CommentAccessControl import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt b/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt index 7dc4dbb..f900a7f 100644 --- a/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt +++ b/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.comment.article.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.comment.article.CommentArticleRepository import fr.dcproject.component.comment.generic.CommentAccessControl -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/component/comment/constitution/routes/CreateConstitutionComment.kt b/src/main/kotlin/component/comment/constitution/routes/CreateConstitutionComment.kt index 88c7149..a85353f 100644 --- a/src/main/kotlin/component/comment/constitution/routes/CreateConstitutionComment.kt +++ b/src/main/kotlin/component/comment/constitution/routes/CreateConstitutionComment.kt @@ -1,17 +1,16 @@ package fr.dcproject.component.comment.constitution.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.comment.constitution.CommentConstitutionRepository import fr.dcproject.component.comment.generic.CommentAccessControl import fr.dcproject.component.comment.generic.CommentForUpdate import fr.dcproject.component.constitution.ConstitutionRef -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location -import io.ktor.locations.get import io.ktor.locations.post import io.ktor.request.receiveText import io.ktor.response.respond diff --git a/src/main/kotlin/component/comment/constitution/routes/GetCitizenCommentConstitution.kt b/src/main/kotlin/component/comment/constitution/routes/GetCitizenCommentConstitution.kt index 2511bed..92e92d5 100644 --- a/src/main/kotlin/component/comment/constitution/routes/GetCitizenCommentConstitution.kt +++ b/src/main/kotlin/component/comment/constitution/routes/GetCitizenCommentConstitution.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.comment.constitution.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.comment.constitution.CommentConstitutionRepository import fr.dcproject.component.comment.generic.CommentAccessControl -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/component/comment/constitution/routes/GetConstitutionComment.kt b/src/main/kotlin/component/comment/constitution/routes/GetConstitutionComment.kt index 6709a27..eafa855 100644 --- a/src/main/kotlin/component/comment/constitution/routes/GetConstitutionComment.kt +++ b/src/main/kotlin/component/comment/constitution/routes/GetConstitutionComment.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.comment.constitution.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.comment.constitution.CommentConstitutionRepository import fr.dcproject.component.comment.generic.CommentAccessControl import fr.dcproject.component.constitution.ConstitutionRef -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/comment/generic/CommentAccessControl.kt b/src/main/kotlin/component/comment/generic/CommentAccessControl.kt index c009b56..fd51d11 100644 --- a/src/main/kotlin/component/comment/generic/CommentAccessControl.kt +++ b/src/main/kotlin/component/comment/generic/CommentAccessControl.kt @@ -1,9 +1,9 @@ package fr.dcproject.component.comment.generic import fr.dcproject.common.entity.HasTarget +import fr.dcproject.common.security.AccessControl +import fr.dcproject.common.security.AccessResponse import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.security.AccessControl -import fr.dcproject.security.AccessResponse import fr.postgresjson.entity.EntityCreatedBy import fr.postgresjson.entity.EntityDeletedAt diff --git a/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt b/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt index 1760837..9cfb06e 100644 --- a/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt +++ b/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt @@ -1,13 +1,13 @@ package fr.dcproject.component.comment.generic.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.comment.generic.CommentAccessControl import fr.dcproject.component.comment.generic.CommentForUpdate import fr.dcproject.component.comment.generic.CommentRef import fr.dcproject.component.comment.generic.CommentRepository -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/component/comment/generic/routes/EditComment.kt b/src/main/kotlin/component/comment/generic/routes/EditComment.kt index 2229c31..50a5c6c 100644 --- a/src/main/kotlin/component/comment/generic/routes/EditComment.kt +++ b/src/main/kotlin/component/comment/generic/routes/EditComment.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.comment.generic.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.comment.generic.CommentAccessControl import fr.dcproject.component.comment.generic.CommentRef import fr.dcproject.component.comment.generic.CommentRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/component/comment/generic/routes/GetCommentChildren.kt b/src/main/kotlin/component/comment/generic/routes/GetCommentChildren.kt index dfef745..a452e8c 100644 --- a/src/main/kotlin/component/comment/generic/routes/GetCommentChildren.kt +++ b/src/main/kotlin/component/comment/generic/routes/GetCommentChildren.kt @@ -1,11 +1,11 @@ package fr.dcproject.component.comment.generic.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.comment.generic.CommentAccessControl import fr.dcproject.component.comment.generic.CommentRepository import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt b/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt index 7d05881..743dc6b 100644 --- a/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt +++ b/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.comment.generic.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.comment.generic.CommentAccessControl import fr.dcproject.component.comment.generic.CommentRef import fr.dcproject.component.comment.generic.CommentRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/component/constitution/ConstitutionAccessControl.kt b/src/main/kotlin/component/constitution/ConstitutionAccessControl.kt index cf520fd..f75dfd3 100644 --- a/src/main/kotlin/component/constitution/ConstitutionAccessControl.kt +++ b/src/main/kotlin/component/constitution/ConstitutionAccessControl.kt @@ -1,8 +1,8 @@ package fr.dcproject.component.constitution +import fr.dcproject.common.security.AccessControl +import fr.dcproject.common.security.AccessResponse import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.security.AccessControl -import fr.dcproject.security.AccessResponse import fr.postgresjson.entity.EntityCreatedBy import fr.postgresjson.entity.EntityDeletedAt diff --git a/src/main/kotlin/component/constitution/routes/CreateConstitution.kt b/src/main/kotlin/component/constitution/routes/CreateConstitution.kt index 2668546..ba4b9f8 100644 --- a/src/main/kotlin/component/constitution/routes/CreateConstitution.kt +++ b/src/main/kotlin/component/constitution/routes/CreateConstitution.kt @@ -1,5 +1,7 @@ package fr.dcproject.component.constitution.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull @@ -11,8 +13,6 @@ import fr.dcproject.component.constitution.ConstitutionSimple import fr.dcproject.component.constitution.ConstitutionSimple.TitleSimple import fr.dcproject.component.constitution.routes.CreateConstitution.PostConstitutionRequest.Input import fr.dcproject.component.constitution.routes.CreateConstitution.PostConstitutionRequest.Input.Title -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import fr.postgresjson.entity.UuidEntity import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/constitution/routes/FindConstitutions.kt b/src/main/kotlin/component/constitution/routes/FindConstitutions.kt index 6f954a4..e804d91 100644 --- a/src/main/kotlin/component/constitution/routes/FindConstitutions.kt +++ b/src/main/kotlin/component/constitution/routes/FindConstitutions.kt @@ -1,11 +1,11 @@ package fr.dcproject.component.constitution.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.constitution.ConstitutionAccessControl import fr.dcproject.component.constitution.ConstitutionRepository import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI -import fr.dcproject.security.assert import fr.postgresjson.repository.RepositoryI import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/constitution/routes/GetConstitution.kt b/src/main/kotlin/component/constitution/routes/GetConstitution.kt index 7c8addf..366b8da 100644 --- a/src/main/kotlin/component/constitution/routes/GetConstitution.kt +++ b/src/main/kotlin/component/constitution/routes/GetConstitution.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.constitution.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.constitution.ConstitutionAccessControl import fr.dcproject.component.constitution.ConstitutionRef import fr.dcproject.component.constitution.ConstitutionRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/doc/routes/OpenAPI.kt b/src/main/kotlin/component/doc/routes/OpenAPI.kt index 701f534..5ceab62 100644 --- a/src/main/kotlin/component/doc/routes/OpenAPI.kt +++ b/src/main/kotlin/component/doc/routes/OpenAPI.kt @@ -1,6 +1,6 @@ package fr.dcproject.component.doc.routes -import fr.dcproject.utils.readResource +import fr.dcproject.common.utils.readResource import io.ktor.application.call import io.ktor.http.ContentType import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/follow/FollowAccessControl.kt b/src/main/kotlin/component/follow/FollowAccessControl.kt index 91fe910..58998c9 100644 --- a/src/main/kotlin/component/follow/FollowAccessControl.kt +++ b/src/main/kotlin/component/follow/FollowAccessControl.kt @@ -1,8 +1,8 @@ package fr.dcproject.component.follow +import fr.dcproject.common.security.AccessControl +import fr.dcproject.common.security.AccessResponse import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.security.AccessControl -import fr.dcproject.security.AccessResponse import fr.dcproject.component.follow.Follow as FollowEntity class FollowAccessControl : AccessControl() { diff --git a/src/main/kotlin/component/follow/routes/article/FollowArticle.kt b/src/main/kotlin/component/follow/routes/article/FollowArticle.kt index b476809..42c73df 100644 --- a/src/main/kotlin/component/follow/routes/article/FollowArticle.kt +++ b/src/main/kotlin/component/follow/routes/article/FollowArticle.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.follow.routes.article +import fr.dcproject.common.security.assert import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.follow.FollowAccessControl import fr.dcproject.component.follow.FollowArticleRepository import fr.dcproject.component.follow.FollowForUpdate -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/follow/routes/article/GetFollowArticle.kt b/src/main/kotlin/component/follow/routes/article/GetFollowArticle.kt index bac6a43..c4d3ec5 100644 --- a/src/main/kotlin/component/follow/routes/article/GetFollowArticle.kt +++ b/src/main/kotlin/component/follow/routes/article/GetFollowArticle.kt @@ -1,11 +1,11 @@ package fr.dcproject.component.follow.routes.article +import fr.dcproject.common.security.assert import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.follow.FollowAccessControl import fr.dcproject.component.follow.FollowArticleRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/follow/routes/article/GetMyFollowsArticle.kt b/src/main/kotlin/component/follow/routes/article/GetMyFollowsArticle.kt index e1d600e..46d190a 100644 --- a/src/main/kotlin/component/follow/routes/article/GetMyFollowsArticle.kt +++ b/src/main/kotlin/component/follow/routes/article/GetMyFollowsArticle.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.follow.routes.article +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.follow.FollowAccessControl import fr.dcproject.component.follow.FollowArticleRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/component/follow/routes/article/UnfollowArticle.kt b/src/main/kotlin/component/follow/routes/article/UnfollowArticle.kt index 47d3c83..e2b7015 100644 --- a/src/main/kotlin/component/follow/routes/article/UnfollowArticle.kt +++ b/src/main/kotlin/component/follow/routes/article/UnfollowArticle.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.follow.routes.article +import fr.dcproject.common.security.assert import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.follow.FollowAccessControl import fr.dcproject.component.follow.FollowArticleRepository import fr.dcproject.component.follow.FollowForUpdate -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/follow/routes/constitution/FollowConstitution.kt b/src/main/kotlin/component/follow/routes/constitution/FollowConstitution.kt index 98071ec..0648636 100644 --- a/src/main/kotlin/component/follow/routes/constitution/FollowConstitution.kt +++ b/src/main/kotlin/component/follow/routes/constitution/FollowConstitution.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.follow.routes.constitution +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.constitution.ConstitutionRef import fr.dcproject.component.follow.FollowAccessControl import fr.dcproject.component.follow.FollowConstitutionRepository import fr.dcproject.component.follow.FollowForUpdate -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/follow/routes/constitution/GetFollowConstitution.kt b/src/main/kotlin/component/follow/routes/constitution/GetFollowConstitution.kt index f151327..1f96dc1 100644 --- a/src/main/kotlin/component/follow/routes/constitution/GetFollowConstitution.kt +++ b/src/main/kotlin/component/follow/routes/constitution/GetFollowConstitution.kt @@ -1,11 +1,11 @@ package fr.dcproject.component.follow.routes.constitution +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.constitution.ConstitutionRef import fr.dcproject.component.follow.FollowAccessControl import fr.dcproject.component.follow.FollowConstitutionRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/follow/routes/constitution/GetMyFollowsConstitution.kt b/src/main/kotlin/component/follow/routes/constitution/GetMyFollowsConstitution.kt index dd8b28f..644154b 100644 --- a/src/main/kotlin/component/follow/routes/constitution/GetMyFollowsConstitution.kt +++ b/src/main/kotlin/component/follow/routes/constitution/GetMyFollowsConstitution.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.follow.routes.constitution +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.follow.FollowAccessControl import fr.dcproject.component.follow.FollowConstitutionRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/component/follow/routes/constitution/UnfollowConstitution.kt b/src/main/kotlin/component/follow/routes/constitution/UnfollowConstitution.kt index 17bb7ef..d86f31e 100644 --- a/src/main/kotlin/component/follow/routes/constitution/UnfollowConstitution.kt +++ b/src/main/kotlin/component/follow/routes/constitution/UnfollowConstitution.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.follow.routes.constitution +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.constitution.ConstitutionRef import fr.dcproject.component.follow.FollowAccessControl import fr.dcproject.component.follow.FollowConstitutionRepository import fr.dcproject.component.follow.FollowForUpdate -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/notification/NotificationConsumer.kt b/src/main/kotlin/component/notification/NotificationConsumer.kt index 98354fb..a5b1a47 100644 --- a/src/main/kotlin/component/notification/NotificationConsumer.kt +++ b/src/main/kotlin/component/notification/NotificationConsumer.kt @@ -11,7 +11,6 @@ import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.follow.FollowArticleRepository import fr.dcproject.component.follow.FollowConstitutionRepository import fr.dcproject.component.follow.FollowSimple -import fr.dcproject.messages.NotificationEmailSender import io.ktor.utils.io.errors.IOException import io.lettuce.core.RedisClient import io.lettuce.core.api.async.RedisAsyncCommands diff --git a/src/main/kotlin/messages/NotificationEmailSender.kt b/src/main/kotlin/component/notification/NotificationEmailSender.kt similarity index 97% rename from src/main/kotlin/messages/NotificationEmailSender.kt rename to src/main/kotlin/component/notification/NotificationEmailSender.kt index 47bccc4..80e8480 100644 --- a/src/main/kotlin/messages/NotificationEmailSender.kt +++ b/src/main/kotlin/component/notification/NotificationEmailSender.kt @@ -1,8 +1,9 @@ -package fr.dcproject.messages +package fr.dcproject.component.notification import com.sendgrid.helpers.mail.Mail import com.sendgrid.helpers.mail.objects.Content import com.sendgrid.helpers.mail.objects.Email +import fr.dcproject.common.email.Mailer import fr.dcproject.common.entity.TargetRef import fr.dcproject.component.article.ArticleRepository import fr.dcproject.component.article.ArticleWithTitleI diff --git a/src/main/kotlin/component/opinion/OpinionAccessControl.kt b/src/main/kotlin/component/opinion/OpinionAccessControl.kt index fa39dfe..a55d908 100644 --- a/src/main/kotlin/component/opinion/OpinionAccessControl.kt +++ b/src/main/kotlin/component/opinion/OpinionAccessControl.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.opinion import fr.dcproject.common.entity.HasTarget +import fr.dcproject.common.security.AccessControl +import fr.dcproject.common.security.AccessResponse import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.opinion.entity.OpinionI -import fr.dcproject.security.AccessControl -import fr.dcproject.security.AccessResponse import fr.postgresjson.entity.EntityCreatedBy import fr.postgresjson.entity.EntityDeletedAt diff --git a/src/main/kotlin/component/opinion/OpinionChoiceAccessControl.kt b/src/main/kotlin/component/opinion/OpinionChoiceAccessControl.kt index f936a3b..157b3fb 100644 --- a/src/main/kotlin/component/opinion/OpinionChoiceAccessControl.kt +++ b/src/main/kotlin/component/opinion/OpinionChoiceAccessControl.kt @@ -1,9 +1,9 @@ package fr.dcproject.component.opinion +import fr.dcproject.common.security.AccessControl +import fr.dcproject.common.security.AccessResponse import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.opinion.entity.OpinionChoiceI -import fr.dcproject.security.AccessControl -import fr.dcproject.security.AccessResponse class OpinionChoiceAccessControl : AccessControl() { fun canView(subjects: List, citizen: CitizenI?): AccessResponse = diff --git a/src/main/kotlin/component/opinion/routes/GetCitizenOpinions.kt b/src/main/kotlin/component/opinion/routes/GetCitizenOpinions.kt index ec3fb06..7aaf46f 100644 --- a/src/main/kotlin/component/opinion/routes/GetCitizenOpinions.kt +++ b/src/main/kotlin/component/opinion/routes/GetCitizenOpinions.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.opinion.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.toUUID import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.opinion.OpinionAccessControl import fr.dcproject.component.opinion.entity.Opinion -import fr.dcproject.security.assert -import fr.dcproject.utils.toUUID import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/component/opinion/routes/GetMyOpinionsArticle.kt b/src/main/kotlin/component/opinion/routes/GetMyOpinionsArticle.kt index 22fdcc0..91c3bfd 100644 --- a/src/main/kotlin/component/opinion/routes/GetMyOpinionsArticle.kt +++ b/src/main/kotlin/component/opinion/routes/GetMyOpinionsArticle.kt @@ -1,6 +1,7 @@ package fr.dcproject.component.opinion.routes import fr.dcproject.common.entity.TargetRef +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef @@ -8,7 +9,6 @@ import fr.dcproject.component.opinion.OpinionAccessControl import fr.dcproject.component.opinion.entity.Opinion import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI -import fr.dcproject.security.assert import fr.postgresjson.connexion.Paginated import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/opinion/routes/GetOpinionChoice.kt b/src/main/kotlin/component/opinion/routes/GetOpinionChoice.kt index 07ddb81..f5d9205 100644 --- a/src/main/kotlin/component/opinion/routes/GetOpinionChoice.kt +++ b/src/main/kotlin/component/opinion/routes/GetOpinionChoice.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.opinion.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.opinion.OpinionChoiceAccessControl import fr.dcproject.component.opinion.OpinionChoiceRepository import fr.dcproject.component.opinion.entity.OpinionChoiceRef -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/opinion/routes/GetOpinionChoices.kt b/src/main/kotlin/component/opinion/routes/GetOpinionChoices.kt index 85134c3..42e7212 100644 --- a/src/main/kotlin/component/opinion/routes/GetOpinionChoices.kt +++ b/src/main/kotlin/component/opinion/routes/GetOpinionChoices.kt @@ -1,9 +1,9 @@ package fr.dcproject.component.opinion.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.opinion.OpinionChoiceAccessControl import fr.dcproject.component.opinion.OpinionChoiceRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/component/opinion/routes/OpinionArticle.kt b/src/main/kotlin/component/opinion/routes/OpinionArticle.kt index c7b0be3..1c1259d 100644 --- a/src/main/kotlin/component/opinion/routes/OpinionArticle.kt +++ b/src/main/kotlin/component/opinion/routes/OpinionArticle.kt @@ -1,14 +1,14 @@ package fr.dcproject.component.opinion.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest +import fr.dcproject.common.utils.toUUID import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.opinion.OpinionAccessControl import fr.dcproject.component.opinion.entity.OpinionChoiceRef import fr.dcproject.component.opinion.entity.OpinionForUpdate -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest -import fr.dcproject.utils.toUUID import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/views/createEsIndexForViews.kt b/src/main/kotlin/component/views/createEsIndexForViews.kt index 2c74f94..e328dfa 100644 --- a/src/main/kotlin/component/views/createEsIndexForViews.kt +++ b/src/main/kotlin/component/views/createEsIndexForViews.kt @@ -1,6 +1,6 @@ package fr.dcproject.component.views -import fr.dcproject.utils.waitElasticsearchIsUp +import fr.dcproject.common.utils.waitElasticsearchIsUp import org.elasticsearch.client.Request import org.elasticsearch.client.RestClient diff --git a/src/main/kotlin/component/vote/VoteAccessControl.kt b/src/main/kotlin/component/vote/VoteAccessControl.kt index ca058ae..ead8566 100644 --- a/src/main/kotlin/component/vote/VoteAccessControl.kt +++ b/src/main/kotlin/component/vote/VoteAccessControl.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.vote import fr.dcproject.common.entity.TargetI +import fr.dcproject.common.security.AccessControl +import fr.dcproject.common.security.AccessResponse import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.vote.entity.VoteForUpdateI -import fr.dcproject.security.AccessControl -import fr.dcproject.security.AccessResponse import fr.postgresjson.entity.EntityDeletedAt import fr.dcproject.component.vote.entity.Vote as VoteEntity diff --git a/src/main/kotlin/component/vote/routes/GetCitizenVotes.kt b/src/main/kotlin/component/vote/routes/GetCitizenVotes.kt index 8d80b82..1a4bd30 100644 --- a/src/main/kotlin/component/vote/routes/GetCitizenVotes.kt +++ b/src/main/kotlin/component/vote/routes/GetCitizenVotes.kt @@ -1,11 +1,11 @@ package fr.dcproject.component.vote.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.toUUID import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.vote.VoteAccessControl import fr.dcproject.component.vote.VoteRepository -import fr.dcproject.security.assert -import fr.dcproject.utils.toUUID import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/component/vote/routes/GetCitizenVotesOnArticle.kt b/src/main/kotlin/component/vote/routes/GetCitizenVotesOnArticle.kt index c4bf4e2..b7c5500 100644 --- a/src/main/kotlin/component/vote/routes/GetCitizenVotesOnArticle.kt +++ b/src/main/kotlin/component/vote/routes/GetCitizenVotesOnArticle.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.vote.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.vote.VoteAccessControl import fr.dcproject.component.vote.VoteArticleRepository import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/component/vote/routes/PutVoteOnArticle.kt b/src/main/kotlin/component/vote/routes/PutVoteOnArticle.kt index cabd780..d06b62d 100644 --- a/src/main/kotlin/component/vote/routes/PutVoteOnArticle.kt +++ b/src/main/kotlin/component/vote/routes/PutVoteOnArticle.kt @@ -1,5 +1,7 @@ package fr.dcproject.component.vote.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.article.ArticleRepository import fr.dcproject.component.auth.citizen @@ -7,8 +9,6 @@ import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.vote.VoteAccessControl import fr.dcproject.component.vote.VoteArticleRepository import fr.dcproject.component.vote.entity.VoteForUpdate -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/component/vote/routes/PutVoteOnComment.kt b/src/main/kotlin/component/vote/routes/PutVoteOnComment.kt index 3fbfdef..f8c85f5 100644 --- a/src/main/kotlin/component/vote/routes/PutVoteOnComment.kt +++ b/src/main/kotlin/component/vote/routes/PutVoteOnComment.kt @@ -1,13 +1,13 @@ package fr.dcproject.component.vote.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.comment.generic.CommentRepository import fr.dcproject.component.vote.VoteAccessControl import fr.dcproject.component.vote.VoteCommentRepository import fr.dcproject.component.vote.entity.VoteForUpdate -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/vote/routes/VoteConstitution.kt b/src/main/kotlin/component/vote/routes/VoteConstitution.kt index 074f888..d2cd8a9 100644 --- a/src/main/kotlin/component/vote/routes/VoteConstitution.kt +++ b/src/main/kotlin/component/vote/routes/VoteConstitution.kt @@ -1,5 +1,7 @@ package fr.dcproject.component.vote.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.constitution.ConstitutionRef @@ -8,8 +10,6 @@ import fr.dcproject.component.vote.VoteAccessControl import fr.dcproject.component.vote.VoteConstitutionRepository import fr.dcproject.component.vote.entity.VoteForUpdate import fr.dcproject.component.vote.routes.VoteConstitution.ConstitutionVoteRequest.Input -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/component/workgroup/WorkgroupAccessControl.kt b/src/main/kotlin/component/workgroup/WorkgroupAccessControl.kt index 8f8c6c4..15b2732 100644 --- a/src/main/kotlin/component/workgroup/WorkgroupAccessControl.kt +++ b/src/main/kotlin/component/workgroup/WorkgroupAccessControl.kt @@ -1,9 +1,9 @@ package fr.dcproject.component.workgroup +import fr.dcproject.common.security.AccessControl +import fr.dcproject.common.security.AccessResponse import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member.Role -import fr.dcproject.security.AccessControl -import fr.dcproject.security.AccessResponse class WorkgroupAccessControl : AccessControl() { fun canCreate(subject: WorkgroupI, citizen: CitizenI?): AccessResponse { diff --git a/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt index 44a1e3d..49ce074 100644 --- a/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt @@ -1,13 +1,13 @@ package fr.dcproject.component.workgroup.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.workgroup.WorkgroupAccessControl import fr.dcproject.component.workgroup.WorkgroupRepository import fr.dcproject.component.workgroup.WorkgroupSimple import fr.dcproject.component.workgroup.routes.CreateWorkgroup.PostWorkgroupRequest.Input -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/workgroup/routes/DeleteWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/DeleteWorkgroup.kt index 321d086..296b108 100644 --- a/src/main/kotlin/component/workgroup/routes/DeleteWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/DeleteWorkgroup.kt @@ -1,9 +1,9 @@ package fr.dcproject.component.workgroup.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.workgroup.WorkgroupAccessControl import fr.dcproject.component.workgroup.WorkgroupRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt index bd51854..d604fc2 100644 --- a/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt @@ -1,11 +1,11 @@ package fr.dcproject.component.workgroup.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.workgroup.WorkgroupAccessControl import fr.dcproject.component.workgroup.WorkgroupRepository import fr.dcproject.component.workgroup.routes.EditWorkgroup.PutWorkgroupRequest.Input -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/workgroup/routes/GetWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/GetWorkgroup.kt index 5a786b7..8063be9 100644 --- a/src/main/kotlin/component/workgroup/routes/GetWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/GetWorkgroup.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.workgroup.routes +import fr.dcproject.common.security.assert import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.workgroup.WorkgroupAccessControl import fr.dcproject.component.workgroup.WorkgroupRef import fr.dcproject.component.workgroup.WorkgroupRepository -import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/workgroup/routes/GetWorkgroups.kt b/src/main/kotlin/component/workgroup/routes/GetWorkgroups.kt index 0bcab68..49cd22b 100644 --- a/src/main/kotlin/component/workgroup/routes/GetWorkgroups.kt +++ b/src/main/kotlin/component/workgroup/routes/GetWorkgroups.kt @@ -1,10 +1,10 @@ package fr.dcproject.component.workgroup.routes +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.toUUID import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.workgroup.WorkgroupAccessControl import fr.dcproject.component.workgroup.WorkgroupRepository -import fr.dcproject.security.assert -import fr.dcproject.utils.toUUID import fr.postgresjson.repository.RepositoryI import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt index 4255c57..80227c4 100644 --- a/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.workgroup.routes.members +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.workgroup.WorkgroupAccessControl import fr.dcproject.component.workgroup.WorkgroupRepository import fr.dcproject.component.workgroup.WorkgroupWithMembersI -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt index 584564a..0fb6a16 100644 --- a/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.workgroup.routes.members +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.workgroup.WorkgroupAccessControl import fr.dcproject.component.workgroup.WorkgroupRepository import fr.dcproject.component.workgroup.WorkgroupWithMembersI -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt index 11e4cd7..9787ddc 100644 --- a/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt @@ -1,12 +1,12 @@ package fr.dcproject.component.workgroup.routes.members +import fr.dcproject.common.security.assert +import fr.dcproject.common.utils.receiveOrBadRequest import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.workgroup.WorkgroupAccessControl import fr.dcproject.component.workgroup.WorkgroupRepository import fr.dcproject.component.workgroup.WorkgroupWithMembersI -import fr.dcproject.security.assert -import fr.dcproject.utils.receiveOrBadRequest import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.http.HttpStatusCode diff --git a/src/test/kotlin/CucumberTest.kt b/src/test/kotlin/CucumberTest.kt index c11b773..d17b1b5 100644 --- a/src/test/kotlin/CucumberTest.kt +++ b/src/test/kotlin/CucumberTest.kt @@ -3,7 +3,7 @@ import com.rabbitmq.client.ConnectionFactory import fr.dcproject.application.Configuration import fr.dcproject.application.Env.CUCUMBER import fr.dcproject.application.module -import fr.dcproject.utils.LoggerDelegate +import fr.dcproject.common.utils.LoggerDelegate import fr.postgresjson.connexion.Connection import fr.postgresjson.connexion.Requester import fr.postgresjson.migration.Migrations diff --git a/src/test/kotlin/functional/MailerTest.kt b/src/test/kotlin/functional/MailerTest.kt index 56d9811..6e48b7b 100644 --- a/src/test/kotlin/functional/MailerTest.kt +++ b/src/test/kotlin/functional/MailerTest.kt @@ -5,7 +5,7 @@ import com.sendgrid.helpers.mail.objects.Content import com.sendgrid.helpers.mail.objects.Email import fr.dcproject.application.Env.TEST import fr.dcproject.application.module -import fr.dcproject.messages.Mailer +import fr.dcproject.common.email.Mailer import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.server.testing.withTestApplication import io.ktor.util.KtorExperimentalAPI diff --git a/src/test/kotlin/functional/NotificationConsumerTest.kt b/src/test/kotlin/functional/NotificationConsumerTest.kt index 35d4e99..9c706a1 100644 --- a/src/test/kotlin/functional/NotificationConsumerTest.kt +++ b/src/test/kotlin/functional/NotificationConsumerTest.kt @@ -9,8 +9,8 @@ import fr.dcproject.component.follow.FollowArticleRepository import fr.dcproject.component.follow.FollowSimple import fr.dcproject.component.notification.ArticleUpdateNotification import fr.dcproject.component.notification.NotificationConsumer +import fr.dcproject.component.notification.NotificationEmailSender import fr.dcproject.component.notification.Publisher -import fr.dcproject.messages.NotificationEmailSender import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.util.KtorExperimentalAPI import io.lettuce.core.RedisClient diff --git a/src/test/kotlin/functional/ResourcesKtTest.kt b/src/test/kotlin/functional/ResourcesKtTest.kt index 0b75d66..34f3ff4 100644 --- a/src/test/kotlin/functional/ResourcesKtTest.kt +++ b/src/test/kotlin/functional/ResourcesKtTest.kt @@ -1,6 +1,6 @@ package functional -import fr.dcproject.utils.readResource +import fr.dcproject.common.utils.readResource import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Tags import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/steps/ArticleSteps.kt b/src/test/kotlin/steps/ArticleSteps.kt index ea1442b..c79a188 100644 --- a/src/test/kotlin/steps/ArticleSteps.kt +++ b/src/test/kotlin/steps/ArticleSteps.kt @@ -1,5 +1,6 @@ package steps +import fr.dcproject.common.utils.toUUID import fr.dcproject.component.article.ArticleForUpdate import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.article.ArticleRepository @@ -9,7 +10,6 @@ import fr.dcproject.component.citizen.CitizenRepository import fr.dcproject.component.comment.article.CommentArticleRepository import fr.dcproject.component.comment.generic.CommentForUpdate import fr.dcproject.component.workgroup.WorkgroupRef -import fr.dcproject.utils.toUUID import io.cucumber.datatable.DataTable import io.cucumber.java8.En import org.joda.time.DateTime diff --git a/src/test/kotlin/steps/ConstitutionSteps.kt b/src/test/kotlin/steps/ConstitutionSteps.kt index 06f1126..acf1fd4 100644 --- a/src/test/kotlin/steps/ConstitutionSteps.kt +++ b/src/test/kotlin/steps/ConstitutionSteps.kt @@ -1,5 +1,6 @@ package steps +import fr.dcproject.common.utils.toUUID import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenI @@ -11,7 +12,6 @@ import fr.dcproject.component.constitution.ConstitutionRef import fr.dcproject.component.constitution.ConstitutionRepository import fr.dcproject.component.constitution.ConstitutionSimple import fr.dcproject.component.constitution.ConstitutionSimple.TitleSimple -import fr.dcproject.utils.toUUID import io.cucumber.datatable.DataTable import io.cucumber.java8.En import org.joda.time.DateTime diff --git a/src/test/kotlin/steps/FollowSteps.kt b/src/test/kotlin/steps/FollowSteps.kt index 9d06c16..54c7435 100644 --- a/src/test/kotlin/steps/FollowSteps.kt +++ b/src/test/kotlin/steps/FollowSteps.kt @@ -1,10 +1,10 @@ package steps +import fr.dcproject.common.utils.toUUID import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.citizen.CitizenRepository import fr.dcproject.component.constitution.ConstitutionRef import fr.dcproject.component.follow.FollowForUpdate -import fr.dcproject.utils.toUUID import io.cucumber.java8.En import org.koin.test.KoinTest import org.koin.test.get diff --git a/src/test/kotlin/steps/OpinionSteps.kt b/src/test/kotlin/steps/OpinionSteps.kt index b2e991a..d309969 100644 --- a/src/test/kotlin/steps/OpinionSteps.kt +++ b/src/test/kotlin/steps/OpinionSteps.kt @@ -1,12 +1,12 @@ package steps +import fr.dcproject.common.utils.toUUID import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.article.ArticleRepository import fr.dcproject.component.citizen.CitizenRepository import fr.dcproject.component.opinion.OpinionChoiceRepository import fr.dcproject.component.opinion.entity.OpinionChoice import fr.dcproject.component.opinion.entity.OpinionForUpdate -import fr.dcproject.utils.toUUID import io.cucumber.datatable.DataTable import io.cucumber.java8.En import org.koin.test.KoinTest diff --git a/src/test/kotlin/steps/VoteSteps.kt b/src/test/kotlin/steps/VoteSteps.kt index 08b68c6..04c3dd2 100644 --- a/src/test/kotlin/steps/VoteSteps.kt +++ b/src/test/kotlin/steps/VoteSteps.kt @@ -1,9 +1,9 @@ package steps +import fr.dcproject.common.utils.toUUID import fr.dcproject.component.article.ArticleRepository import fr.dcproject.component.citizen.CitizenRepository import fr.dcproject.component.vote.entity.VoteForUpdate -import fr.dcproject.utils.toUUID import io.cucumber.java8.En import org.koin.test.KoinTest import org.koin.test.get diff --git a/src/test/kotlin/steps/WorkgroupSteps.kt b/src/test/kotlin/steps/WorkgroupSteps.kt index 7f37b0e..e8a8922 100644 --- a/src/test/kotlin/steps/WorkgroupSteps.kt +++ b/src/test/kotlin/steps/WorkgroupSteps.kt @@ -1,5 +1,6 @@ package steps +import fr.dcproject.common.utils.toUUID import fr.dcproject.component.auth.User import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenI @@ -9,7 +10,6 @@ import fr.dcproject.component.workgroup.Workgroup import fr.dcproject.component.workgroup.WorkgroupRef import fr.dcproject.component.workgroup.WorkgroupRepository import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member -import fr.dcproject.utils.toUUID import io.cucumber.datatable.DataTable import io.cucumber.java8.En import org.joda.time.DateTime diff --git a/src/test/kotlin/unit/security/ArticleAccessControlTest.kt b/src/test/kotlin/unit/security/ArticleAccessControlTest.kt index 4162be0..a286441 100644 --- a/src/test/kotlin/unit/security/ArticleAccessControlTest.kt +++ b/src/test/kotlin/unit/security/ArticleAccessControlTest.kt @@ -1,13 +1,13 @@ package unit.security +import fr.dcproject.common.security.AccessDecision.DENIED +import fr.dcproject.common.security.AccessDecision.GRANTED import fr.dcproject.component.article.ArticleAccessControl import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.auth.User import fr.dcproject.component.auth.UserI import fr.dcproject.component.citizen.CitizenCart import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.security.AccessDecision.DENIED -import fr.dcproject.security.AccessDecision.GRANTED import fr.postgresjson.connexion.Paginated import io.mockk.every import io.mockk.mockk @@ -24,7 +24,7 @@ import fr.dcproject.component.article.ArticleRepository as ArticleRepo @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT) -@Tags(Tag("security"), Tag("unit")) +@Tags(Tag("common/security"), Tag("unit")) internal class ArticleAccessControlTest { private val tesla = CitizenCart( id = UUID.fromString("e6efc288-4283-4729-a268-6debb18de1a0"), diff --git a/src/test/kotlin/unit/security/CitizenAccessControlTest.kt b/src/test/kotlin/unit/security/CitizenAccessControlTest.kt index 349afa6..4f903ba 100644 --- a/src/test/kotlin/unit/security/CitizenAccessControlTest.kt +++ b/src/test/kotlin/unit/security/CitizenAccessControlTest.kt @@ -1,12 +1,12 @@ package unit.security +import fr.dcproject.common.security.AccessDecision.DENIED +import fr.dcproject.common.security.AccessDecision.GRANTED import fr.dcproject.component.auth.User import fr.dcproject.component.auth.UserI import fr.dcproject.component.citizen.CitizenAccessControl import fr.dcproject.component.citizen.CitizenBasic import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.security.AccessDecision.DENIED -import fr.dcproject.security.AccessDecision.GRANTED import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag @@ -18,7 +18,7 @@ import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT) -@Tags(Tag("security"), Tag("unit")) +@Tags(Tag("common/security"), Tag("unit")) internal class CitizenAccessControlTest { private val tesla = CitizenBasic( user = User( diff --git a/src/test/kotlin/unit/security/CommentAccessControlTest.kt b/src/test/kotlin/unit/security/CommentAccessControlTest.kt index 8314c7f..a52f634 100644 --- a/src/test/kotlin/unit/security/CommentAccessControlTest.kt +++ b/src/test/kotlin/unit/security/CommentAccessControlTest.kt @@ -1,5 +1,7 @@ package unit.security +import fr.dcproject.common.security.AccessDecision.DENIED +import fr.dcproject.common.security.AccessDecision.GRANTED import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.auth.User @@ -10,8 +12,6 @@ import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.comment.generic.CommentAccessControl import fr.dcproject.component.comment.generic.CommentForUpdate import fr.dcproject.component.comment.generic.CommentForView -import fr.dcproject.security.AccessDecision.DENIED -import fr.dcproject.security.AccessDecision.GRANTED import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag @@ -24,7 +24,7 @@ import java.util.UUID @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT) -@Tags(Tag("security"), Tag("unit")) +@Tags(Tag("common/security"), Tag("unit")) internal class CommentAccessControlTest { private val tesla = Citizen( user = User( diff --git a/src/test/kotlin/unit/security/FollowAccessControlTest.kt b/src/test/kotlin/unit/security/FollowAccessControlTest.kt index 8c2ab9c..1e16230 100644 --- a/src/test/kotlin/unit/security/FollowAccessControlTest.kt +++ b/src/test/kotlin/unit/security/FollowAccessControlTest.kt @@ -1,5 +1,7 @@ package unit.security +import fr.dcproject.common.security.AccessDecision.DENIED +import fr.dcproject.common.security.AccessDecision.GRANTED import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.auth.User import fr.dcproject.component.auth.UserI @@ -9,8 +11,6 @@ import fr.dcproject.component.citizen.CitizenCart import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.follow.Follow import fr.dcproject.component.follow.FollowAccessControl -import fr.dcproject.security.AccessDecision.DENIED -import fr.dcproject.security.AccessDecision.GRANTED import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag @@ -23,7 +23,7 @@ import java.util.UUID @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT) -@Tags(Tag("security"), Tag("unit")) +@Tags(Tag("common/security"), Tag("unit")) internal class FollowAccessControlTest { private val tesla = CitizenBasic( user = User( diff --git a/src/test/kotlin/unit/security/OpinionAccessControlTest.kt b/src/test/kotlin/unit/security/OpinionAccessControlTest.kt index c888ef7..2eee04d 100644 --- a/src/test/kotlin/unit/security/OpinionAccessControlTest.kt +++ b/src/test/kotlin/unit/security/OpinionAccessControlTest.kt @@ -1,5 +1,7 @@ package unit.security +import fr.dcproject.common.security.AccessDecision.DENIED +import fr.dcproject.common.security.AccessDecision.GRANTED import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.auth.User import fr.dcproject.component.auth.UserI @@ -9,8 +11,6 @@ import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.opinion.OpinionAccessControl import fr.dcproject.component.opinion.entity.Opinion import fr.dcproject.component.opinion.entity.OpinionChoice -import fr.dcproject.security.AccessDecision.DENIED -import fr.dcproject.security.AccessDecision.GRANTED import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag @@ -23,7 +23,7 @@ import java.util.UUID @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT) -@Tags(Tag("security"), Tag("unit")) +@Tags(Tag("common/security"), Tag("unit")) internal class OpinionAccessControlTest { private val tesla = CitizenBasic( user = User( diff --git a/src/test/kotlin/unit/security/OpinionChoiceAccessControlTest.kt b/src/test/kotlin/unit/security/OpinionChoiceAccessControlTest.kt index 23b320e..6db2336 100644 --- a/src/test/kotlin/unit/security/OpinionChoiceAccessControlTest.kt +++ b/src/test/kotlin/unit/security/OpinionChoiceAccessControlTest.kt @@ -1,5 +1,6 @@ package unit.security +import fr.dcproject.common.security.AccessDecision.GRANTED import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.auth.User import fr.dcproject.component.auth.UserI @@ -8,7 +9,6 @@ import fr.dcproject.component.citizen.CitizenCart import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.opinion.OpinionChoiceAccessControl import fr.dcproject.component.opinion.entity.OpinionChoice -import fr.dcproject.security.AccessDecision.GRANTED import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag @@ -21,7 +21,7 @@ import java.util.UUID @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT) -@Tags(Tag("security"), Tag("unit")) +@Tags(Tag("common/security"), Tag("unit")) internal class OpinionChoiceAccessControlTest { private val tesla = CitizenBasic( id = UUID.fromString("e6efc288-4283-4729-a268-6debb18de1a0"), diff --git a/src/test/kotlin/unit/security/VoteAccessControlTest.kt b/src/test/kotlin/unit/security/VoteAccessControlTest.kt index 85a2f98..02da86b 100644 --- a/src/test/kotlin/unit/security/VoteAccessControlTest.kt +++ b/src/test/kotlin/unit/security/VoteAccessControlTest.kt @@ -1,5 +1,7 @@ package unit.security +import fr.dcproject.common.security.AccessDecision.DENIED +import fr.dcproject.common.security.AccessDecision.GRANTED import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.auth.User import fr.dcproject.component.auth.UserI @@ -9,8 +11,6 @@ import fr.dcproject.component.citizen.CitizenCart import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.vote.VoteAccessControl import fr.dcproject.component.vote.entity.VoteForUpdate -import fr.dcproject.security.AccessDecision.DENIED -import fr.dcproject.security.AccessDecision.GRANTED import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag @@ -24,7 +24,7 @@ import fr.dcproject.component.vote.entity.Vote as VoteEntity @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT) -@Tags(Tag("security"), Tag("unit")) +@Tags(Tag("common/security"), Tag("unit")) internal class VoteAccessControlTest { private val tesla = Citizen( id = UUID.fromString("a1e35c99-9d33-4fb4-9201-58d7071243bb"), diff --git a/src/test/kotlin/unit/security/WorkgroupAccessControlTest.kt b/src/test/kotlin/unit/security/WorkgroupAccessControlTest.kt index 827fe74..1a6d1e7 100644 --- a/src/test/kotlin/unit/security/WorkgroupAccessControlTest.kt +++ b/src/test/kotlin/unit/security/WorkgroupAccessControlTest.kt @@ -1,5 +1,7 @@ package unit.security +import fr.dcproject.common.security.AccessDecision.DENIED +import fr.dcproject.common.security.AccessDecision.GRANTED import fr.dcproject.component.auth.User import fr.dcproject.component.auth.UserI import fr.dcproject.component.citizen.CitizenBasic @@ -7,8 +9,6 @@ import fr.dcproject.component.citizen.CitizenCart import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.workgroup.WorkgroupAccessControl import fr.dcproject.component.workgroup.WorkgroupWithMembersI -import fr.dcproject.security.AccessDecision.DENIED -import fr.dcproject.security.AccessDecision.GRANTED import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag @@ -22,7 +22,7 @@ import fr.dcproject.component.workgroup.Workgroup as WorkgroupEntity @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT) -@Tags(Tag("security"), Tag("unit")) +@Tags(Tag("common/security"), Tag("unit")) internal class WorkgroupAccessControlTest { private val tesla = CitizenBasic( user = User(