DC/dc-project
1
1
Fork 0
Code Issues 25 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

#72 Move Entity and repository on the same package

Browse Source
This commit is contained in:
Fabrice Lecomte
2021-03-03 02:46:51 +01:00
parent 79feed54dd
commit d9deb4836e
126 changed files with 426 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/fr/dcproject/component/auth/CitizenContext.kt
View File

@@ -1,12 +1,14 @@
package fr.dcproject.component.auth
import fr.dcproject.component.citizen.CitizenRepository
import fr.dcproject.component.auth.database.User
import fr.dcproject.component.auth.database.UserI
import fr.dcproject.component.citizen.database.CitizenRepository
import io.ktor.application.ApplicationCall
import io.ktor.auth.authentication
import io.ktor.util.AttributeKey
import io.ktor.util.pipeline.PipelineContext
import org.koin.core.context.GlobalContext
import fr.dcproject.component.citizen.Citizen as CitizenEntity
import fr.dcproject.component.citizen.database.Citizen as CitizenEntity
class ForbiddenException(message: String) : Exception(message)

1
src/main/kotlin/fr/dcproject/component/auth/KoinModule.kt
View File

@@ -2,6 +2,7 @@ package fr.dcproject.component.auth
import fr.dcproject.application.Configuration
import fr.dcproject.common.email.Mailer
import fr.dcproject.component.auth.database.UserRepository
import org.koin.dsl.module
val authKoinModule = module {

6
src/main/kotlin/fr/dcproject/component/auth/PasswordlessAuth.kt
View File

@@ -5,9 +5,9 @@ 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.component.citizen.database.CitizenRepository
import fr.dcproject.component.citizen.database.CitizenWithEmail
import fr.dcproject.component.citizen.database.CitizenWithUserI
import io.ktor.http.URLBuilder
/**

4
src/main/kotlin/fr/dcproject/component/auth/User.kt → src/main/kotlin/fr/dcproject/component/auth/database/User.kt
View File

@@ -1,10 +1,10 @@
package fr.dcproject.component.auth
package fr.dcproject.component.auth.database
import fr.dcproject.common.entity.CreatedAt
import fr.dcproject.common.entity.Entity
import fr.dcproject.common.entity.EntityI
import fr.dcproject.common.entity.UpdatedAt
import fr.dcproject.component.auth.UserI.Roles
import fr.dcproject.component.auth.database.UserI.Roles
import io.ktor.auth.Principal
import org.joda.time.DateTime
import java.util.UUID

2
src/main/kotlin/fr/dcproject/component/auth/UserRepository.kt → src/main/kotlin/fr/dcproject/component/auth/database/UserRepository.kt
View File

@@ -1,4 +1,4 @@
package fr.dcproject.component.auth
package fr.dcproject.component.auth.database
import fr.postgresjson.connexion.Requester
import fr.postgresjson.repository.RepositoryI

2
src/main/kotlin/fr/dcproject/component/auth/jwt/JWTMaker.kt
View File

@@ -1,7 +1,7 @@
package fr.dcproject.component.auth.jwt
import com.auth0.jwt.JWT
import fr.dcproject.component.auth.UserI
import fr.dcproject.component.auth.database.UserI
/**
* Produce a token for this combination of User and Account

4
src/main/kotlin/fr/dcproject/component/auth/jwt/JwtInstallation.kt
View File

@@ -1,7 +1,7 @@
package fr.dcproject.component.auth.jwt
import fr.dcproject.component.auth.User
import fr.dcproject.component.auth.UserRepository
import fr.dcproject.component.auth.database.User
import fr.dcproject.component.auth.database.UserRepository
import io.ktor.application.ApplicationCall
import io.ktor.auth.Authentication
import io.ktor.auth.jwt.jwt

2
src/main/kotlin/fr/dcproject/component/auth/routes/Login.kt
View File

@@ -2,7 +2,7 @@ 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.database.UserRepository
import fr.dcproject.component.auth.jwt.makeToken
import fr.dcproject.component.auth.routes.Login.LoginRequest.Input
import io.ktor.application.call

11
src/main/kotlin/fr/dcproject/component/auth/routes/Register.kt
View File

@@ -2,14 +2,13 @@ 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.UserForCreate
import fr.dcproject.component.auth.UserI
import fr.dcproject.component.auth.database.UserForCreate
import fr.dcproject.component.auth.database.UserI
import fr.dcproject.component.auth.jwt.makeToken
import fr.dcproject.component.auth.routes.Register.RegisterRequest.Input
import fr.dcproject.component.citizen.CitizenForCreate
import fr.dcproject.component.citizen.CitizenI
import fr.dcproject.component.citizen.CitizenRepository
import fr.dcproject.component.citizen.database.CitizenForCreate
import fr.dcproject.component.citizen.database.CitizenI
import fr.dcproject.component.citizen.database.CitizenRepository
import io.ktor.application.call
import io.ktor.features.BadRequestException
import io.ktor.http.HttpStatusCode