From 73841170cc120f17e7e1bbdf029e5cd6fee3d629 Mon Sep 17 00:00:00 2001
From: luevard <99143550+saucepommefrite@users.noreply.github.com>
Date: Thu, 11 Jan 2024 09:55:41 +0100
Subject: [PATCH 01/31] :sparkles: Add database for local usage
---
Sources/pom.xml | 5 +++++
Sources/src/main/kotlin/allin/Application.kt | 2 --
Sources/src/main/kotlin/allin/entities/UserEntity.kt | 5 +++--
Sources/src/main/kotlin/allin/model/User.kt | 4 ++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Sources/pom.xml b/Sources/pom.xml
index 0d8b30f..c569b14 100644
--- a/Sources/pom.xml
+++ b/Sources/pom.xml
@@ -32,6 +32,11 @@
ktor-server-core-jvm
${ktor_version}
+
+ org.postgresql
+ postgresql
+ 42.7.1
+
io.ktor
ktor-server-netty-jvm
diff --git a/Sources/src/main/kotlin/allin/Application.kt b/Sources/src/main/kotlin/allin/Application.kt
index 93119eb..5f8fb99 100644
--- a/Sources/src/main/kotlin/allin/Application.kt
+++ b/Sources/src/main/kotlin/allin/Application.kt
@@ -1,6 +1,4 @@
package allin
-
-import allin.model.User
import allin.routing.BasicRouting
import allin.routing.BetRouter
import allin.routing.UserRouter
diff --git a/Sources/src/main/kotlin/allin/entities/UserEntity.kt b/Sources/src/main/kotlin/allin/entities/UserEntity.kt
index d8f0996..0500cf5 100644
--- a/Sources/src/main/kotlin/allin/entities/UserEntity.kt
+++ b/Sources/src/main/kotlin/allin/entities/UserEntity.kt
@@ -1,11 +1,12 @@
package allin.entities
import org.ktorm.schema.Table
+import org.ktorm.schema.double
import org.ktorm.schema.int
import org.ktorm.schema.varchar
-
-object UserEntity : Table("user") {
+object UserEntity : Table("utilisateur") {
val id = int("id").primaryKey()
val username = varchar("username")
val password = varchar("password")
+ val nbCoins = double("nbCoins")
}
\ No newline at end of file
diff --git a/Sources/src/main/kotlin/allin/model/User.kt b/Sources/src/main/kotlin/allin/model/User.kt
index d01dc50..3159bc9 100644
--- a/Sources/src/main/kotlin/allin/model/User.kt
+++ b/Sources/src/main/kotlin/allin/model/User.kt
@@ -1,10 +1,10 @@
package allin.model
import allin.dto.UserDTO
+import allin.routing.users
import kotlinx.serialization.Serializable
@Serializable
data class User(val username: String, val email: String, var password: String, var nbCoins: Int = 1000, var token: String? = null)
-
@Serializable
-data class CheckUser(val login: String,val password: String)
\ No newline at end of file
+data class CheckUser(val login: String,val password: String)
--
2.36.3
From ff4e36beea0c00af19cb9ab309fa7905a80cf409 Mon Sep 17 00:00:00 2001
From: luevard <99143550+saucepommefrite@users.noreply.github.com>
Date: Mon, 15 Jan 2024 13:34:26 +0100
Subject: [PATCH 02/31] :sparkles: Local Database link
---
Sources/src/main/kotlin/allin/dto/UserDTO.kt | 13 +---
.../main/kotlin/allin/entities/UserEntity.kt | 63 ++++++++++++++++++-
Sources/src/main/kotlin/allin/model/Bet.kt | 15 +----
.../src/main/kotlin/allin/model/BetAction.kt | 4 +-
Sources/src/main/kotlin/allin/model/User.kt | 4 +-
.../main/kotlin/allin/routing/BetRouter.kt | 15 +++--
.../main/kotlin/allin/routing/UserRouter.kt | 48 +++++++-------
.../kotlin/allin/serializer/DateSerializer.kt | 26 ++++----
.../main/kotlin/allin/utils/CryptManager.kt | 16 +++--
.../main/kotlin/allin/utils/TokenManager.kt | 26 +++++++-
10 files changed, 151 insertions(+), 79 deletions(-)
diff --git a/Sources/src/main/kotlin/allin/dto/UserDTO.kt b/Sources/src/main/kotlin/allin/dto/UserDTO.kt
index d59f39c..a440450 100644
--- a/Sources/src/main/kotlin/allin/dto/UserDTO.kt
+++ b/Sources/src/main/kotlin/allin/dto/UserDTO.kt
@@ -1,15 +1,4 @@
package allin.dto
-
-import allin.model.User
import kotlinx.serialization.Serializable
-
@Serializable
-data class UserDTO(val username: String,val email: String, val nbCoins: Int)
-@Serializable
-data class UserDTOWithToken(val username: String,val email: String, val nbCoins: Int, val token:String?)
-fun convertUserToUserDTO(user: User): UserDTO {
- return UserDTO(user.username, user.email, user.nbCoins)
-}
-fun convertUserToUserDTOToken(user: User): UserDTOWithToken {
- return UserDTOWithToken(user.username, user.email, user.nbCoins,user.token)
-}
+data class UserDTO(val username: String, val email: String, val nbCoins: Double, var token:String?)
diff --git a/Sources/src/main/kotlin/allin/entities/UserEntity.kt b/Sources/src/main/kotlin/allin/entities/UserEntity.kt
index 0500cf5..e1ba032 100644
--- a/Sources/src/main/kotlin/allin/entities/UserEntity.kt
+++ b/Sources/src/main/kotlin/allin/entities/UserEntity.kt
@@ -1,12 +1,71 @@
package allin.entities
+import allin.dto.UserDTO
+import allin.model.User
+import allin.routing.database
+import org.ktorm.dsl.*
+import org.ktorm.entity.*
import org.ktorm.schema.Table
import org.ktorm.schema.double
import org.ktorm.schema.int
import org.ktorm.schema.varchar
-object UserEntity : Table("utilisateur") {
+
+interface UserEntity : Entity {
+ val username: String
+ var email: String
+ var password: String
+ var nbCoins: Double
+}
+object UsersEntity : Table("utilisateur") {
val id = int("id").primaryKey()
val username = varchar("username")
val password = varchar("password")
val nbCoins = double("nbCoins")
-}
\ No newline at end of file
+ val email = varchar("email")
+
+ fun getUserToUserDTO(): MutableList {
+ return database.from(UsersEntity).select().map {
+ row -> UserDTO(
+ row[username].toString(),
+ row[email].toString(),
+ row[nbCoins]?:0.0,
+ null
+ )
+ }.toMutableList()
+ }
+
+ fun getUserByUsernameAndPassword(login: String): Pair {
+ return database.from(UsersEntity)
+ .select()
+ .where { (username eq login) /*and (password eq passwordParam)*/ }
+ .map { row ->
+ Pair(
+ UserDTO(
+ row[username].toString(),
+ row[email].toString(),
+ row[nbCoins] ?: 0.0,
+ null
+ ),
+ row[password].toString()
+ )
+ }
+ .firstOrNull() ?: Pair(null, null)
+ }
+
+ fun addUserEntity(user : User){
+ database.insert(UsersEntity){
+ set(it.nbCoins,user.nbCoins)
+ set(it.username,user.username)
+ set(it.password,user.password)
+ set(it.email,user.email)
+ }
+ }
+ fun deleteUserByUsername(username: String): Boolean {
+ val deletedCount = database.delete(UsersEntity) {
+ it.username eq username
+ }
+ return deletedCount > 0
+ }
+}
+
+
diff --git a/Sources/src/main/kotlin/allin/model/Bet.kt b/Sources/src/main/kotlin/allin/model/Bet.kt
index 5d4bc13..c99b923 100644
--- a/Sources/src/main/kotlin/allin/model/Bet.kt
+++ b/Sources/src/main/kotlin/allin/model/Bet.kt
@@ -1,19 +1,10 @@
package allin.model
-import allin.dto.UserDTOWithToken
-import allin.serializer.DateSerializer
+import allin.serializer.ZonedDateTimeSerializer
import kotlinx.serialization.Serializable
import java.util.*
@Serializable
-data class Bet(val id: Int, val theme: String, val sentenceBet: String, @Serializable(DateSerializer::class) val endRegistration: Date, @Serializable(DateSerializer::class) var endBet : Date, var isPrivate : Boolean, var response : MutableList, val createdBy : String)
-
-@Serializable
-data class UpdatedBetData(val id: Int,@Serializable(DateSerializer::class) val endBet: Date, val isPrivate: Boolean, val response: MutableList)
-
+data class Bet(val id: Int, val theme: String, val sentenceBet: String, @Serializable(ZonedDateTimeSerializer::class) val endRegistration: Date, @Serializable(ZonedDateTimeSerializer::class) var endBet : Date, var isPrivate : Boolean, var response : MutableList, var createdBy : String)
@Serializable
-data class BetWithoutId(val theme: String, val sentenceBet: String, @Serializable(DateSerializer::class) val endRegistration: Date, @Serializable(DateSerializer::class) var endBet : Date, var isPrivate : Boolean, var response : MutableList, val createdBy : String)
-
-fun convertBetWithoutIdToBet(betWithoutId: BetWithoutId,id : Int, username : String): Bet {
- return Bet(id,betWithoutId.theme,betWithoutId.sentenceBet,betWithoutId.endRegistration, betWithoutId.endBet, betWithoutId.isPrivate, betWithoutId.response, username)
-}
+data class UpdatedBetData(val id: Int,@Serializable(ZonedDateTimeSerializer::class) val endBet: Date, val isPrivate: Boolean, val response: MutableList)
\ No newline at end of file
diff --git a/Sources/src/main/kotlin/allin/model/BetAction.kt b/Sources/src/main/kotlin/allin/model/BetAction.kt
index f830e2c..2f2298b 100644
--- a/Sources/src/main/kotlin/allin/model/BetAction.kt
+++ b/Sources/src/main/kotlin/allin/model/BetAction.kt
@@ -1,5 +1,5 @@
package allin.model
-import allin.dto.UserDTOWithToken
+import allin.dto.UserDTO
data class BetAction(val id:Int, val coins: Int, val user: String, val bet: Int)
-data class BetActionCompleted(val id:Int, val coins: Int, val user: UserDTOWithToken, val bet: Bet)
+data class BetActionCompleted(val id:Int, val coins: Int, val user: UserDTO, val bet: Bet)
diff --git a/Sources/src/main/kotlin/allin/model/User.kt b/Sources/src/main/kotlin/allin/model/User.kt
index 3159bc9..4f3f1f0 100644
--- a/Sources/src/main/kotlin/allin/model/User.kt
+++ b/Sources/src/main/kotlin/allin/model/User.kt
@@ -1,10 +1,8 @@
package allin.model
-import allin.dto.UserDTO
-import allin.routing.users
import kotlinx.serialization.Serializable
@Serializable
-data class User(val username: String, val email: String, var password: String, var nbCoins: Int = 1000, var token: String? = null)
+data class User(val username: String, val email: String, var password: String, var nbCoins: Double = 1000.0, var token: String? = null)
@Serializable
data class CheckUser(val login: String,val password: String)
diff --git a/Sources/src/main/kotlin/allin/routing/BetRouter.kt b/Sources/src/main/kotlin/allin/routing/BetRouter.kt
index 997cee5..51e398d 100644
--- a/Sources/src/main/kotlin/allin/routing/BetRouter.kt
+++ b/Sources/src/main/kotlin/allin/routing/BetRouter.kt
@@ -5,7 +5,10 @@ import io.ktor.server.routing.*
import allin.model.*
import allin.utils.AppConfig
import io.ktor.http.*
+import io.ktor.server.auth.*
+import io.ktor.server.auth.jwt.*
import io.ktor.server.response.*
+import java.time.ZonedDateTime
val bets = mutableListOf()
val tokenManagerBet= AppConfig.tokenManager
@@ -16,20 +19,22 @@ fun CreateId() : Int{
fun Application.BetRouter(){
routing{
+ authenticate {
route("/bets/add"){
post{
- val bet = call.receive()
+ val bet = call.receive()
+ val token= call.principal()
val id = CreateId()
- val username = tokenManagerBet.getUsernameFromToken(bet.createdBy)
+ bet.createdBy = tokenManagerBet.getUsernameFromToken(token.toString())
val findbet = bets.find { it.id == id }
if(findbet==null){
- val betWithId = convertBetWithoutIdToBet(bet,id,username)
- bets.add(betWithId)
- call.respond(HttpStatusCode.Created, betWithId)
+ bets.add(bet)
+ call.respond(HttpStatusCode.Created, bet)
}
call.respond(HttpStatusCode.Conflict,"Bet already exist")
}
}
+ }
route("/bets/gets"){
get{
// if(bets.size>0)
diff --git a/Sources/src/main/kotlin/allin/routing/UserRouter.kt b/Sources/src/main/kotlin/allin/routing/UserRouter.kt
index 18489be..bfde82d 100644
--- a/Sources/src/main/kotlin/allin/routing/UserRouter.kt
+++ b/Sources/src/main/kotlin/allin/routing/UserRouter.kt
@@ -1,8 +1,10 @@
package allin.routing
-import allin.dto.*
-import allin.model.CheckUser
-import allin.model.User
+import allin.entities.UsersEntity.addUserEntity
+import allin.entities.UsersEntity.deleteUserByUsername
+import allin.entities.UsersEntity.getUserByUsernameAndPassword
+import allin.entities.UsersEntity.getUserToUserDTO
+import allin.model.*
import allin.utils.AppConfig
import io.ktor.http.*
import io.ktor.server.application.*
@@ -11,15 +13,13 @@ import io.ktor.server.auth.jwt.*
import io.ktor.server.request.*
import io.ktor.server.response.*
import io.ktor.server.routing.*
+import org.ktorm.database.Database
-val users = mutableListOf()
val RegexCheckerUser= AppConfig.regexChecker
val CryptManagerUser= AppConfig.cryptManager
val tokenManagerUser=AppConfig.tokenManager
-
-
+val database = Database.connect("jdbc:postgresql://localhost:5432/Allin", user = "postgres", password = "lulu")
fun Application.UserRouter() {
-
routing {
route("/users/register"){
post {
@@ -27,12 +27,13 @@ fun Application.UserRouter() {
if (RegexCheckerUser.isEmailInvalid(TempUser.email)){
call.respond(HttpStatusCode.Forbidden,"Input a valid mail !")
}
+ val users=getUserToUserDTO()
val user = users.find { it.username == TempUser.username || it.email == TempUser.email }
if(user == null) {
CryptManagerUser.passwordCrypt(TempUser)
TempUser.token=tokenManagerUser.generateOrReplaceJWTToken(TempUser)
- users.add(TempUser)
- call.respond(HttpStatusCode.Created, TempUser)
+ addUserEntity(TempUser)
+ call.respond(HttpStatusCode.Created,TempUser)
}
call.respond(HttpStatusCode.Conflict,"Mail or/and username already exist")
}
@@ -41,25 +42,27 @@ fun Application.UserRouter() {
route("/users/login") {
post {
val checkUser = call.receive()
- val user = users.find { it.username == checkUser.login || it.email == checkUser.login }
- if (user != null && CryptManagerUser.passwordDecrypt(user,checkUser.password)) {
- user.token=tokenManagerUser.generateOrReplaceJWTToken(user)
- call.respond(HttpStatusCode.OK, convertUserToUserDTOToken(user))
+ val user =getUserByUsernameAndPassword(checkUser.login)
+ if (CryptManagerUser.passwordDecrypt(user.second.toString(),checkUser.password)) {
+ val userDtoWithToken=user.first
+ userDtoWithToken?.token=tokenManagerUser.generateOrReplaceJWTToken(userDtoWithToken!!)
+ call.respond(HttpStatusCode.OK, userDtoWithToken)
} else {
call.respond(HttpStatusCode.NotFound,"Login and/or password incorrect.")
}
}
}
-
route("/users/delete") {
post {
val checkUser = call.receive()
- val user = users.find { it.username == checkUser.login || it.email == checkUser.login }
- if (user != null && user.password == checkUser.password) {
- users.remove(user)
- call.respond(HttpStatusCode.Accepted,convertUserToUserDTO(user))
+ val user =getUserByUsernameAndPassword(checkUser.login)
+ if (CryptManagerUser.passwordDecrypt(user.second.toString(),checkUser.password)) {
+ if (!deleteUserByUsername(checkUser.login)) {
+ call.respond(HttpStatusCode.InternalServerError, "This user can't be delete now !")
+ }
+ call.respond(HttpStatusCode.Accepted,user.first!!)
} else {
- call.respond(HttpStatusCode.NotFound,"Login and/or password incorrect.")
+ call.respond(HttpStatusCode.NotFound, "Login and/or password incorrect.")
}
}
}
@@ -68,14 +71,13 @@ fun Application.UserRouter() {
get("/users/token") {
val principal = call.principal()
val username = principal!!.payload.getClaim("username").asString()
- val user = users.find { it.username == username }
- if (user != null) {
- call.respond(HttpStatusCode.OK,convertUserToUserDTO(user))
+ val user=getUserByUsernameAndPassword(username)
+ if (user.first != null) {
+ call.respond(HttpStatusCode.OK, user.first!!)
} else {
call.respond(HttpStatusCode.NotFound, "User not found with the valid token !")
}
}
}
-
}
}
diff --git a/Sources/src/main/kotlin/allin/serializer/DateSerializer.kt b/Sources/src/main/kotlin/allin/serializer/DateSerializer.kt
index 6002c28..dc84760 100644
--- a/Sources/src/main/kotlin/allin/serializer/DateSerializer.kt
+++ b/Sources/src/main/kotlin/allin/serializer/DateSerializer.kt
@@ -6,22 +6,22 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder
-import java.text.SimpleDateFormat
-import java.util.*
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
-@Serializer(Date::class)
-class DateSerializer : KSerializer {
- override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("Date", PrimitiveKind.STRING)
+@Serializer(ZonedDateTime::class)
+object ZonedDateTimeSerializer : KSerializer {
+ private val formatter: DateTimeFormatter = DateTimeFormatter.ISO_ZONED_DATE_TIME
- val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.FRANCE)
+ override val descriptor: SerialDescriptor =
+ PrimitiveSerialDescriptor("ZonedDateTime", PrimitiveKind.STRING)
- override fun deserialize(decoder: Decoder): Date {
- val dateString = decoder.decodeString()
- return formatter.parse(dateString)
+ override fun serialize(encoder: Encoder, value: ZonedDateTime) {
+ encoder.encodeString(formatter.format(value))
}
- override fun serialize(encoder: Encoder, value: Date) {
- val dateString = formatter.format(value)
- encoder.encodeString(dateString)
+ override fun deserialize(decoder: Decoder): ZonedDateTime {
+ val dateString = decoder.decodeString()
+ return ZonedDateTime.parse(dateString, formatter)
}
-}
\ No newline at end of file
+}
diff --git a/Sources/src/main/kotlin/allin/utils/CryptManager.kt b/Sources/src/main/kotlin/allin/utils/CryptManager.kt
index 216e733..df9f8be 100644
--- a/Sources/src/main/kotlin/allin/utils/CryptManager.kt
+++ b/Sources/src/main/kotlin/allin/utils/CryptManager.kt
@@ -4,12 +4,18 @@ import allin.model.User
import org.mindrot.jbcrypt.BCrypt
class CryptManager {
- val salt=BCrypt.gensalt()
+ //val salt=BCrypt.gensalt()
+ fun passwordCrypt(password : String): String {
+ return BCrypt.hashpw(password,"\$2a\$10\$42wsdBeoLKaF6SM9oADONe")
+ }
fun passwordCrypt(user: User){
- user.password=BCrypt.hashpw(user.password,salt)
-
+ user.password=BCrypt.hashpw(user.password,"\$2a\$10\$42wsdBeoLKaF6SM9oADONe")
}
- fun passwordDecrypt(user: User, password: String): Boolean{
- return BCrypt.hashpw(password,salt)==user.password
+ fun passwordDecrypt(password: String, passwordClear: String): Boolean{
+ return BCrypt.hashpw(passwordClear,"\$2a\$10\$42wsdBeoLKaF6SM9oADONe")==password
+ }
+
+ fun CheckPassword(hashed: String, clear: String): Boolean{
+ return BCrypt.checkpw(hashed,clear)
}
}
\ No newline at end of file
diff --git a/Sources/src/main/kotlin/allin/utils/TokenManager.kt b/Sources/src/main/kotlin/allin/utils/TokenManager.kt
index d35ede5..0d82193 100644
--- a/Sources/src/main/kotlin/allin/utils/TokenManager.kt
+++ b/Sources/src/main/kotlin/allin/utils/TokenManager.kt
@@ -1,5 +1,6 @@
package allin.utils
+import allin.dto.UserDTO
import allin.model.User
import com.auth0.jwt.JWT
import com.auth0.jwt.JWTVerifier
@@ -15,7 +16,6 @@ class TokenManager private constructor(val config: HoconApplicationConfig) {
val issuer=config.property("issuer").getString()
fun generateJWTToken(user : User): String {
val expirationDate = System.currentTimeMillis() + 604800000 // une semaine en miliseconde
-
val token = JWT.create()
.withAudience(audience)
.withIssuer(issuer)
@@ -41,6 +41,26 @@ class TokenManager private constructor(val config: HoconApplicationConfig) {
}
}
+ fun generateOrReplaceJWTToken(user: UserDTO): String {
+ val userToken = getUserToken(user)
+ if (userToken != null && !isTokenExpired(userToken)) {
+ return userToken
+ } else {
+ return generateJWTToken(user)
+ }
+ }
+
+ fun generateJWTToken(user : UserDTO): String {
+ val expirationDate = System.currentTimeMillis() + 604800000 // une semaine en miliseconde
+ val token = JWT.create()
+ .withAudience(audience)
+ .withIssuer(issuer)
+ .withClaim("username", user.username)
+ .withExpiresAt(Date(expirationDate))
+ .sign(Algorithm.HMAC256(secret))
+ return token
+ }
+
fun isTokenExpired(token: String): Boolean {
val expirationTime = JWT.decode(token).expiresAt.time
return System.currentTimeMillis() > expirationTime
@@ -49,7 +69,9 @@ class TokenManager private constructor(val config: HoconApplicationConfig) {
fun getUserToken(user: User): String? {
return user.token
}
-
+ fun getUserToken(user: UserDTO): String? {
+ return user.token
+ }
fun getUsernameFromToken(token: String) : String{
val decodedJWT: DecodedJWT = JWT.decode(token)
return decodedJWT.getClaim("username").asString()
--
2.36.3
From 59faa48897b1c07d808cafcb974d52f5cc2ee902 Mon Sep 17 00:00:00 2001
From: luevard <99143550+saucepommefrite@users.noreply.github.com>
Date: Thu, 11 Jan 2024 09:55:41 +0100
Subject: [PATCH 03/31] :sparkles: Add database for local usage
---
Sources/pom.xml | 5 +++++
Sources/src/main/kotlin/allin/entities/UserEntity.kt | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Sources/pom.xml b/Sources/pom.xml
index 0d8b30f..c569b14 100644
--- a/Sources/pom.xml
+++ b/Sources/pom.xml
@@ -32,6 +32,11 @@
ktor-server-core-jvm
${ktor_version}
+
+ org.postgresql
+ postgresql
+ 42.7.1
+
io.ktor
ktor-server-netty-jvm
diff --git a/Sources/src/main/kotlin/allin/entities/UserEntity.kt b/Sources/src/main/kotlin/allin/entities/UserEntity.kt
index d8f0996..0500cf5 100644
--- a/Sources/src/main/kotlin/allin/entities/UserEntity.kt
+++ b/Sources/src/main/kotlin/allin/entities/UserEntity.kt
@@ -1,11 +1,12 @@
package allin.entities
import org.ktorm.schema.Table
+import org.ktorm.schema.double
import org.ktorm.schema.int
import org.ktorm.schema.varchar
-
-object UserEntity : Table("user") {
+object UserEntity : Table("utilisateur") {
val id = int("id").primaryKey()
val username = varchar("username")
val password = varchar("password")
+ val nbCoins = double("nbCoins")
}
\ No newline at end of file
--
2.36.3
From aa938cbfb38e12fd6ab34de635bf38578c7ded5f Mon Sep 17 00:00:00 2001
From: luevard <99143550+saucepommefrite@users.noreply.github.com>
Date: Mon, 15 Jan 2024 13:34:26 +0100
Subject: [PATCH 04/31] :sparkles: Local Database link
---
Sources/src/main/kotlin/allin/dto/UserDTO.kt | 13 +---
.../main/kotlin/allin/entities/UserEntity.kt | 63 ++++++++++++++++++-
.../src/main/kotlin/allin/model/BetAction.kt | 0
Sources/src/main/kotlin/allin/model/User.kt | 2 +-
.../main/kotlin/allin/routing/BetRouter.kt | 11 ++--
.../main/kotlin/allin/routing/UserRouter.kt | 8 ++-
.../main/kotlin/allin/utils/CryptManager.kt | 16 +++--
.../main/kotlin/allin/utils/TokenManager.kt | 22 ++++++-
8 files changed, 106 insertions(+), 29 deletions(-)
create mode 100644 Sources/src/main/kotlin/allin/model/BetAction.kt
diff --git a/Sources/src/main/kotlin/allin/dto/UserDTO.kt b/Sources/src/main/kotlin/allin/dto/UserDTO.kt
index d59f39c..a440450 100644
--- a/Sources/src/main/kotlin/allin/dto/UserDTO.kt
+++ b/Sources/src/main/kotlin/allin/dto/UserDTO.kt
@@ -1,15 +1,4 @@
package allin.dto
-
-import allin.model.User
import kotlinx.serialization.Serializable
-
@Serializable
-data class UserDTO(val username: String,val email: String, val nbCoins: Int)
-@Serializable
-data class UserDTOWithToken(val username: String,val email: String, val nbCoins: Int, val token:String?)
-fun convertUserToUserDTO(user: User): UserDTO {
- return UserDTO(user.username, user.email, user.nbCoins)
-}
-fun convertUserToUserDTOToken(user: User): UserDTOWithToken {
- return UserDTOWithToken(user.username, user.email, user.nbCoins,user.token)
-}
+data class UserDTO(val username: String, val email: String, val nbCoins: Double, var token:String?)
diff --git a/Sources/src/main/kotlin/allin/entities/UserEntity.kt b/Sources/src/main/kotlin/allin/entities/UserEntity.kt
index 0500cf5..e1ba032 100644
--- a/Sources/src/main/kotlin/allin/entities/UserEntity.kt
+++ b/Sources/src/main/kotlin/allin/entities/UserEntity.kt
@@ -1,12 +1,71 @@
package allin.entities
+import allin.dto.UserDTO
+import allin.model.User
+import allin.routing.database
+import org.ktorm.dsl.*
+import org.ktorm.entity.*
import org.ktorm.schema.Table
import org.ktorm.schema.double
import org.ktorm.schema.int
import org.ktorm.schema.varchar
-object UserEntity : Table("utilisateur") {
+
+interface UserEntity : Entity {
+ val username: String
+ var email: String
+ var password: String
+ var nbCoins: Double
+}
+object UsersEntity : Table("utilisateur") {
val id = int("id").primaryKey()
val username = varchar("username")
val password = varchar("password")
val nbCoins = double("nbCoins")
-}
\ No newline at end of file
+ val email = varchar("email")
+
+ fun getUserToUserDTO(): MutableList {
+ return database.from(UsersEntity).select().map {
+ row -> UserDTO(
+ row[username].toString(),
+ row[email].toString(),
+ row[nbCoins]?:0.0,
+ null
+ )
+ }.toMutableList()
+ }
+
+ fun getUserByUsernameAndPassword(login: String): Pair {
+ return database.from(UsersEntity)
+ .select()
+ .where { (username eq login) /*and (password eq passwordParam)*/ }
+ .map { row ->
+ Pair(
+ UserDTO(
+ row[username].toString(),
+ row[email].toString(),
+ row[nbCoins] ?: 0.0,
+ null
+ ),
+ row[password].toString()
+ )
+ }
+ .firstOrNull() ?: Pair(null, null)
+ }
+
+ fun addUserEntity(user : User){
+ database.insert(UsersEntity){
+ set(it.nbCoins,user.nbCoins)
+ set(it.username,user.username)
+ set(it.password,user.password)
+ set(it.email,user.email)
+ }
+ }
+ fun deleteUserByUsername(username: String): Boolean {
+ val deletedCount = database.delete(UsersEntity) {
+ it.username eq username
+ }
+ return deletedCount > 0
+ }
+}
+
+
diff --git a/Sources/src/main/kotlin/allin/model/BetAction.kt b/Sources/src/main/kotlin/allin/model/BetAction.kt
new file mode 100644
index 0000000..e69de29
diff --git a/Sources/src/main/kotlin/allin/model/User.kt b/Sources/src/main/kotlin/allin/model/User.kt
index 6234988..e368fec 100644
--- a/Sources/src/main/kotlin/allin/model/User.kt
+++ b/Sources/src/main/kotlin/allin/model/User.kt
@@ -8,7 +8,7 @@ data class User(
val username: String,
val email: String,
var password: String,
- var nbCoins: Int = 1000,
+ var nbCoins: Int = 500,
var token: String? = null
)
diff --git a/Sources/src/main/kotlin/allin/routing/BetRouter.kt b/Sources/src/main/kotlin/allin/routing/BetRouter.kt
index f55abde..fa1d210 100644
--- a/Sources/src/main/kotlin/allin/routing/BetRouter.kt
+++ b/Sources/src/main/kotlin/allin/routing/BetRouter.kt
@@ -1,11 +1,8 @@
package allin.routing
-
-import allin.ext.hasToken
-import allin.ext.verifyUserFromToken
-import allin.model.ApiMessage
-import allin.model.Bet
-import allin.model.BetWithoutId
-import allin.model.UpdatedBetData
+import io.ktor.server.application.*
+import io.ktor.server.request.*
+import io.ktor.server.routing.*
+import allin.model.*
import allin.utils.AppConfig
import io.ktor.http.*
import io.ktor.server.application.*
diff --git a/Sources/src/main/kotlin/allin/routing/UserRouter.kt b/Sources/src/main/kotlin/allin/routing/UserRouter.kt
index 5cf3ba3..e0e52b1 100644
--- a/Sources/src/main/kotlin/allin/routing/UserRouter.kt
+++ b/Sources/src/main/kotlin/allin/routing/UserRouter.kt
@@ -16,6 +16,7 @@ import io.ktor.server.request.*
import io.ktor.server.response.*
import io.ktor.server.routing.*
import java.util.*
+import org.ktorm.database.Database
val users = mutableListOf()
val RegexCheckerUser = AppConfig.regexChecker
@@ -23,6 +24,11 @@ val CryptManagerUser = AppConfig.cryptManager
val tokenManagerUser = AppConfig.tokenManager
const val DEFAULT_COINS = 500
+val RegexCheckerUser= AppConfig.regexChecker
+val CryptManagerUser= AppConfig.cryptManager
+val tokenManagerUser=AppConfig.tokenManager
+val database = Database.connect("jdbc:postgresql://localhost:5432/Allin", user = "postgres", password = "lulu")
+
fun Application.UserRouter() {
routing {
@@ -79,7 +85,7 @@ fun Application.UserRouter() {
}
}
}
-
+
get("/users/token") {
hasToken { principal ->
verifyUserFromToken(principal) { user ->
diff --git a/Sources/src/main/kotlin/allin/utils/CryptManager.kt b/Sources/src/main/kotlin/allin/utils/CryptManager.kt
index 216e733..df9f8be 100644
--- a/Sources/src/main/kotlin/allin/utils/CryptManager.kt
+++ b/Sources/src/main/kotlin/allin/utils/CryptManager.kt
@@ -4,12 +4,18 @@ import allin.model.User
import org.mindrot.jbcrypt.BCrypt
class CryptManager {
- val salt=BCrypt.gensalt()
+ //val salt=BCrypt.gensalt()
+ fun passwordCrypt(password : String): String {
+ return BCrypt.hashpw(password,"\$2a\$10\$42wsdBeoLKaF6SM9oADONe")
+ }
fun passwordCrypt(user: User){
- user.password=BCrypt.hashpw(user.password,salt)
-
+ user.password=BCrypt.hashpw(user.password,"\$2a\$10\$42wsdBeoLKaF6SM9oADONe")
}
- fun passwordDecrypt(user: User, password: String): Boolean{
- return BCrypt.hashpw(password,salt)==user.password
+ fun passwordDecrypt(password: String, passwordClear: String): Boolean{
+ return BCrypt.hashpw(passwordClear,"\$2a\$10\$42wsdBeoLKaF6SM9oADONe")==password
+ }
+
+ fun CheckPassword(hashed: String, clear: String): Boolean{
+ return BCrypt.checkpw(hashed,clear)
}
}
\ No newline at end of file
diff --git a/Sources/src/main/kotlin/allin/utils/TokenManager.kt b/Sources/src/main/kotlin/allin/utils/TokenManager.kt
index dbebe03..93b7e50 100644
--- a/Sources/src/main/kotlin/allin/utils/TokenManager.kt
+++ b/Sources/src/main/kotlin/allin/utils/TokenManager.kt
@@ -40,6 +40,26 @@ class TokenManager private constructor(val config: HoconApplicationConfig) {
}
}
+ fun generateOrReplaceJWTToken(user: UserDTO): String {
+ val userToken = getUserToken(user)
+ if (userToken != null && !isTokenExpired(userToken)) {
+ return userToken
+ } else {
+ return generateJWTToken(user)
+ }
+ }
+
+ fun generateJWTToken(user : UserDTO): String {
+ val expirationDate = System.currentTimeMillis() + 604800000 // une semaine en miliseconde
+ val token = JWT.create()
+ .withAudience(audience)
+ .withIssuer(issuer)
+ .withClaim("username", user.username)
+ .withExpiresAt(Date(expirationDate))
+ .sign(Algorithm.HMAC256(secret))
+ return token
+ }
+
fun isTokenExpired(token: String): Boolean {
val expirationTime = JWT.decode(token).expiresAt.time
return System.currentTimeMillis() > expirationTime
@@ -49,7 +69,7 @@ class TokenManager private constructor(val config: HoconApplicationConfig) {
return user.token
}
- fun getUsernameFromToken(token: String): String {
+ fun getUsernameFromToken(token: String) : String{
val decodedJWT: DecodedJWT = JWT.decode(token)
return decodedJWT.getClaim("username").asString()
}
--
2.36.3
From b4ac31431d4d249625a6cc9c622cf17ec68e74f5 Mon Sep 17 00:00:00 2001
From: "arthur.valin"
Date: Mon, 15 Jan 2024 16:58:59 +0100
Subject: [PATCH 05/31] Start bet participations and refactoring
---
.gitignore | 2 +-
.../kotlin/allin/ext/PipelineContextExt.kt | 9 ++--
.../src/main/kotlin/allin/model/ApiMessage.kt | 1 +
.../main/kotlin/allin/routing/BetRouter.kt | 24 +++++++--
.../allin/routing/ParticipationRouter.kt | 6 +--
.../main/kotlin/allin/routing/UserRouter.kt | 51 +++++++++---------
.../main/kotlin/allin/utils/TokenManager.kt | 21 ++++----
.../classes/META-INF/allin-api.kotlin_module | Bin 132 -> 0 bytes
.../allin/ApplicationKt$extracted$1$1$1.class | Bin 4041 -> 0 bytes
.../allin/ApplicationKt$extracted$1$1.class | Bin 2618 -> 0 bytes
.../allin/ApplicationKt$extracted$1.class | Bin 2007 -> 0 bytes
.../allin/ApplicationKt$extracted$2.class | Bin 1928 -> 0 bytes
.../classes/allin/ApplicationKt$main$1.class | Bin 1543 -> 0 bytes
.../target/classes/allin/ApplicationKt.class | Bin 3163 -> 0 bytes
.../allin/dto/UserDTO$$serializer.class | Bin 5508 -> 0 bytes
.../classes/allin/dto/UserDTO$Companion.class | Bin 1275 -> 0 bytes
.../target/classes/allin/dto/UserDTO.class | Bin 5137 -> 0 bytes
.../target/classes/allin/dto/UserDTOKt.class | Bin 1390 -> 0 bytes
.../dto/UserDTOWithToken$$serializer.class | Bin 6120 -> 0 bytes
.../dto/UserDTOWithToken$Companion.class | Bin 1338 -> 0 bytes
.../classes/allin/dto/UserDTOWithToken.class | Bin 6105 -> 0 bytes
.../classes/allin/entities/UserEntity.class | Bin 2022 -> 0 bytes
.../classes/allin/model/Bet$$serializer.class | Bin 6534 -> 0 bytes
.../classes/allin/model/Bet$Companion.class | Bin 1257 -> 0 bytes
Sources/target/classes/allin/model/Bet.class | Bin 9414 -> 0 bytes
.../allin/model/CheckUser$$serializer.class | Bin 5271 -> 0 bytes
.../allin/model/CheckUser$Companion.class | Bin 1300 -> 0 bytes
.../classes/allin/model/CheckUser.class | Bin 4635 -> 0 bytes
.../model/UpdatedBetData$$serializer.class | Bin 6054 -> 0 bytes
.../model/UpdatedBetData$Companion.class | Bin 1334 -> 0 bytes
.../classes/allin/model/UpdatedBetData.class | Bin 7171 -> 0 bytes
.../allin/model/User$$serializer.class | Bin 6119 -> 0 bytes
.../classes/allin/model/User$Companion.class | Bin 1265 -> 0 bytes
Sources/target/classes/allin/model/User.class | Bin 7414 -> 0 bytes
.../BasicRoutingKt$BasicRouting$1$1.class | Bin 6007 -> 0 bytes
.../BasicRoutingKt$BasicRouting$1.class | Bin 1950 -> 0 bytes
.../allin/routing/BasicRoutingKt.class | Bin 1144 -> 0 bytes
.../routing/BetRouterKt$BetRouter$1$1$1.class | Bin 9372 -> 0 bytes
.../routing/BetRouterKt$BetRouter$1$1.class | Bin 1856 -> 0 bytes
.../routing/BetRouterKt$BetRouter$1$2$1.class | Bin 10482 -> 0 bytes
.../routing/BetRouterKt$BetRouter$1$2.class | Bin 1856 -> 0 bytes
.../routing/BetRouterKt$BetRouter$1$3$1.class | Bin 9610 -> 0 bytes
.../routing/BetRouterKt$BetRouter$1$3.class | Bin 1856 -> 0 bytes
.../routing/BetRouterKt$BetRouter$1.class | Bin 2187 -> 0 bytes
.../classes/allin/routing/BetRouterKt.class | Bin 1608 -> 0 bytes
.../UserRouterKt$UserRouter$1$1$1.class | Bin 10934 -> 0 bytes
.../routing/UserRouterKt$UserRouter$1$1.class | Bin 1865 -> 0 bytes
.../UserRouterKt$UserRouter$1$2$1.class | Bin 10232 -> 0 bytes
.../routing/UserRouterKt$UserRouter$1$2.class | Bin 1865 -> 0 bytes
.../UserRouterKt$UserRouter$1$3$1.class | Bin 9933 -> 0 bytes
.../routing/UserRouterKt$UserRouter$1$3.class | Bin 1865 -> 0 bytes
.../UserRouterKt$UserRouter$1$4$1.class | Bin 9821 -> 0 bytes
.../routing/UserRouterKt$UserRouter$1$4.class | Bin 1909 -> 0 bytes
.../routing/UserRouterKt$UserRouter$1.class | Bin 2570 -> 0 bytes
.../classes/allin/routing/UserRouterKt.class | Bin 2733 -> 0 bytes
.../allin/serializer/DateSerializer.class | Bin 3623 -> 0 bytes
.../classes/allin/utils/CryptManager.class | Bin 1717 -> 0 bytes
.../classes/allin/utils/RegexChecker.class | Bin 1249 -> 0 bytes
.../classes/allin/utils/TokenManager.class | Bin 4571 -> 0 bytes
Sources/target/classes/application.conf | 4 --
Sources/target/classes/logback.xml | 12 -----
.../META-INF/allin-api.kotlin_module | Bin 24 -> 0 bytes
.../test-classes/allin/ApplicationTest.class | Bin 486 -> 0 bytes
63 files changed, 67 insertions(+), 63 deletions(-)
delete mode 100644 Sources/target/classes/META-INF/allin-api.kotlin_module
delete mode 100644 Sources/target/classes/allin/ApplicationKt$extracted$1$1$1.class
delete mode 100644 Sources/target/classes/allin/ApplicationKt$extracted$1$1.class
delete mode 100644 Sources/target/classes/allin/ApplicationKt$extracted$1.class
delete mode 100644 Sources/target/classes/allin/ApplicationKt$extracted$2.class
delete mode 100644 Sources/target/classes/allin/ApplicationKt$main$1.class
delete mode 100644 Sources/target/classes/allin/ApplicationKt.class
delete mode 100644 Sources/target/classes/allin/dto/UserDTO$$serializer.class
delete mode 100644 Sources/target/classes/allin/dto/UserDTO$Companion.class
delete mode 100644 Sources/target/classes/allin/dto/UserDTO.class
delete mode 100644 Sources/target/classes/allin/dto/UserDTOKt.class
delete mode 100644 Sources/target/classes/allin/dto/UserDTOWithToken$$serializer.class
delete mode 100644 Sources/target/classes/allin/dto/UserDTOWithToken$Companion.class
delete mode 100644 Sources/target/classes/allin/dto/UserDTOWithToken.class
delete mode 100644 Sources/target/classes/allin/entities/UserEntity.class
delete mode 100644 Sources/target/classes/allin/model/Bet$$serializer.class
delete mode 100644 Sources/target/classes/allin/model/Bet$Companion.class
delete mode 100644 Sources/target/classes/allin/model/Bet.class
delete mode 100644 Sources/target/classes/allin/model/CheckUser$$serializer.class
delete mode 100644 Sources/target/classes/allin/model/CheckUser$Companion.class
delete mode 100644 Sources/target/classes/allin/model/CheckUser.class
delete mode 100644 Sources/target/classes/allin/model/UpdatedBetData$$serializer.class
delete mode 100644 Sources/target/classes/allin/model/UpdatedBetData$Companion.class
delete mode 100644 Sources/target/classes/allin/model/UpdatedBetData.class
delete mode 100644 Sources/target/classes/allin/model/User$$serializer.class
delete mode 100644 Sources/target/classes/allin/model/User$Companion.class
delete mode 100644 Sources/target/classes/allin/model/User.class
delete mode 100644 Sources/target/classes/allin/routing/BasicRoutingKt$BasicRouting$1$1.class
delete mode 100644 Sources/target/classes/allin/routing/BasicRoutingKt$BasicRouting$1.class
delete mode 100644 Sources/target/classes/allin/routing/BasicRoutingKt.class
delete mode 100644 Sources/target/classes/allin/routing/BetRouterKt$BetRouter$1$1$1.class
delete mode 100644 Sources/target/classes/allin/routing/BetRouterKt$BetRouter$1$1.class
delete mode 100644 Sources/target/classes/allin/routing/BetRouterKt$BetRouter$1$2$1.class
delete mode 100644 Sources/target/classes/allin/routing/BetRouterKt$BetRouter$1$2.class
delete mode 100644 Sources/target/classes/allin/routing/BetRouterKt$BetRouter$1$3$1.class
delete mode 100644 Sources/target/classes/allin/routing/BetRouterKt$BetRouter$1$3.class
delete mode 100644 Sources/target/classes/allin/routing/BetRouterKt$BetRouter$1.class
delete mode 100644 Sources/target/classes/allin/routing/BetRouterKt.class
delete mode 100644 Sources/target/classes/allin/routing/UserRouterKt$UserRouter$1$1$1.class
delete mode 100644 Sources/target/classes/allin/routing/UserRouterKt$UserRouter$1$1.class
delete mode 100644 Sources/target/classes/allin/routing/UserRouterKt$UserRouter$1$2$1.class
delete mode 100644 Sources/target/classes/allin/routing/UserRouterKt$UserRouter$1$2.class
delete mode 100644 Sources/target/classes/allin/routing/UserRouterKt$UserRouter$1$3$1.class
delete mode 100644 Sources/target/classes/allin/routing/UserRouterKt$UserRouter$1$3.class
delete mode 100644 Sources/target/classes/allin/routing/UserRouterKt$UserRouter$1$4$1.class
delete mode 100644 Sources/target/classes/allin/routing/UserRouterKt$UserRouter$1$4.class
delete mode 100644 Sources/target/classes/allin/routing/UserRouterKt$UserRouter$1.class
delete mode 100644 Sources/target/classes/allin/routing/UserRouterKt.class
delete mode 100644 Sources/target/classes/allin/serializer/DateSerializer.class
delete mode 100644 Sources/target/classes/allin/utils/CryptManager.class
delete mode 100644 Sources/target/classes/allin/utils/RegexChecker.class
delete mode 100644 Sources/target/classes/allin/utils/TokenManager.class
delete mode 100644 Sources/target/classes/application.conf
delete mode 100644 Sources/target/classes/logback.xml
delete mode 100644 Sources/target/test-classes/META-INF/allin-api.kotlin_module
delete mode 100644 Sources/target/test-classes/allin/ApplicationTest.class
diff --git a/.gitignore b/.gitignore
index f0d8881..b3f8ec6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,4 @@ out/
### VS Code ###
.vscode/
-**/src/target/**
\ No newline at end of file
+!**/src/target/**
\ No newline at end of file
diff --git a/Sources/src/main/kotlin/allin/ext/PipelineContextExt.kt b/Sources/src/main/kotlin/allin/ext/PipelineContextExt.kt
index 0d9cfd9..e111f9b 100644
--- a/Sources/src/main/kotlin/allin/ext/PipelineContextExt.kt
+++ b/Sources/src/main/kotlin/allin/ext/PipelineContextExt.kt
@@ -1,8 +1,8 @@
package allin.ext
+import allin.dto.UserDTO
+import allin.entities.UsersEntity
import allin.model.ApiMessage
-import allin.model.User
-import allin.routing.users
import io.ktor.http.*
import io.ktor.server.application.*
import io.ktor.server.auth.*
@@ -15,9 +15,10 @@ suspend fun PipelineContext<*, ApplicationCall>.hasToken(content: suspend (princ
suspend fun PipelineContext<*, ApplicationCall>.verifyUserFromToken(
principal: JWTPrincipal,
- content: suspend (user: User) -> Unit
+ content: suspend (user: UserDTO, password: String) -> Unit
) {
val username = principal.payload.getClaim("username").asString()
- users.find { it.username == username }?.let { content(it) }
+ val userPassword = UsersEntity.getUserByUsernameAndPassword(username)
+ userPassword.first?.let { content(it, userPassword.second ?: "") }
?: call.respond(HttpStatusCode.NotFound, ApiMessage.TokenUserNotFound)
}
\ No newline at end of file
diff --git a/Sources/src/main/kotlin/allin/model/ApiMessage.kt b/Sources/src/main/kotlin/allin/model/ApiMessage.kt
index deaa55f..9f47ea3 100644
--- a/Sources/src/main/kotlin/allin/model/ApiMessage.kt
+++ b/Sources/src/main/kotlin/allin/model/ApiMessage.kt
@@ -3,6 +3,7 @@ package allin.model
object ApiMessage {
const val Welcome = "Welcome on AllIn's API !"
const val TokenUserNotFound = "User not found with the valid token !"
+ const val UserNotFound = "User not found."
const val BetNotFound = "Bet not found."
const val BetAlreadyExist = "Bet already exists."
const val IncorrectLoginPassword = "Login and/or password incorrect."
diff --git a/Sources/src/main/kotlin/allin/routing/BetRouter.kt b/Sources/src/main/kotlin/allin/routing/BetRouter.kt
index fa1d210..6d7cb79 100644
--- a/Sources/src/main/kotlin/allin/routing/BetRouter.kt
+++ b/Sources/src/main/kotlin/allin/routing/BetRouter.kt
@@ -1,8 +1,11 @@
package allin.routing
-import io.ktor.server.application.*
-import io.ktor.server.request.*
-import io.ktor.server.routing.*
-import allin.model.*
+
+import allin.ext.hasToken
+import allin.ext.verifyUserFromToken
+import allin.model.ApiMessage
+import allin.model.Bet
+import allin.model.BetWithoutId
+import allin.model.UpdatedBetData
import allin.utils.AppConfig
import io.ktor.http.*
import io.ktor.server.application.*
@@ -40,6 +43,7 @@ fun Application.BetRouter() {
}
}
}
+
route("/bets/gets") {
get {
// if(bets.size>0)
@@ -47,6 +51,16 @@ fun Application.BetRouter() {
// else call.respond(HttpStatusCode.NoContent)
}
}
+
+ route("/bets/get/{id}") {
+ get {
+ val id = call.parameters["id"] ?: ""
+ bets.find { it.id == id }?.let { bet ->
+ call.respond(HttpStatusCode.Accepted, bet)
+ } ?: call.respond(HttpStatusCode.NotFound, ApiMessage.BetNotFound)
+ }
+ }
+
route("/bets/delete") {
post {
val idbet = call.receive>()["id"]
@@ -71,7 +85,7 @@ fun Application.BetRouter() {
authenticate {
get("/bets/current") {
hasToken { principal ->
- verifyUserFromToken(principal) { user ->
+ verifyUserFromToken(principal) { user, _ ->
val bets = participations
.filter { it.username == user.username }
.mapNotNull { itParticipation -> bets.find { it.id == itParticipation.betId } }
diff --git a/Sources/src/main/kotlin/allin/routing/ParticipationRouter.kt b/Sources/src/main/kotlin/allin/routing/ParticipationRouter.kt
index 11ac4da..16106b3 100644
--- a/Sources/src/main/kotlin/allin/routing/ParticipationRouter.kt
+++ b/Sources/src/main/kotlin/allin/routing/ParticipationRouter.kt
@@ -21,7 +21,7 @@ fun Application.ParticipationRouter() {
post("/participations/add") {
hasToken { principal ->
val participation = call.receive()
- verifyUserFromToken(principal) { user ->
+ verifyUserFromToken(principal) { user, _ ->
if (user.nbCoins >= participation.stake) {
participations.add(
Participation(
@@ -43,8 +43,8 @@ fun Application.ParticipationRouter() {
hasToken { principal ->
val participationId = call.receive()
participations.find { it.id == participationId }?.let { participation ->
- verifyUserFromToken(principal) { user ->
- user.nbCoins += participation.stake
+ verifyUserFromToken(principal) { user, _ ->
+ // user.nbCoins += participation.stake
participations.remove(participation)
call.respond(HttpStatusCode.NoContent)
}
diff --git a/Sources/src/main/kotlin/allin/routing/UserRouter.kt b/Sources/src/main/kotlin/allin/routing/UserRouter.kt
index e0e52b1..b89af65 100644
--- a/Sources/src/main/kotlin/allin/routing/UserRouter.kt
+++ b/Sources/src/main/kotlin/allin/routing/UserRouter.kt
@@ -1,7 +1,9 @@
package allin.routing
-import allin.dto.convertUserToUserDTO
-import allin.dto.convertUserToUserDTOToken
+import allin.entities.UsersEntity.addUserEntity
+import allin.entities.UsersEntity.deleteUserByUsername
+import allin.entities.UsersEntity.getUserByUsernameAndPassword
+import allin.entities.UsersEntity.getUserToUserDTO
import allin.ext.hasToken
import allin.ext.verifyUserFromToken
import allin.model.ApiMessage
@@ -15,18 +17,13 @@ import io.ktor.server.auth.*
import io.ktor.server.request.*
import io.ktor.server.response.*
import io.ktor.server.routing.*
-import java.util.*
import org.ktorm.database.Database
+import java.util.*
-val users = mutableListOf()
val RegexCheckerUser = AppConfig.regexChecker
val CryptManagerUser = AppConfig.cryptManager
val tokenManagerUser = AppConfig.tokenManager
const val DEFAULT_COINS = 500
-
-val RegexCheckerUser= AppConfig.regexChecker
-val CryptManagerUser= AppConfig.cryptManager
-val tokenManagerUser=AppConfig.tokenManager
val database = Database.connect("jdbc:postgresql://localhost:5432/Allin", user = "postgres", password = "lulu")
fun Application.UserRouter() {
@@ -38,6 +35,7 @@ fun Application.UserRouter() {
if (RegexCheckerUser.isEmailInvalid(tempUser.email)) {
call.respond(HttpStatusCode.Forbidden, ApiMessage.InvalidMail)
}
+ val users = getUserToUserDTO()
users.find { it.username == tempUser.username || it.email == tempUser.email }?.let { user ->
call.respond(HttpStatusCode.Conflict, ApiMessage.UserAlreadyExist)
} ?: run {
@@ -51,7 +49,7 @@ fun Application.UserRouter() {
)
CryptManagerUser.passwordCrypt(user)
user.token = tokenManagerUser.generateOrReplaceJWTToken(user)
- users.add(user)
+ addUserEntity(user)
call.respond(HttpStatusCode.Created, user)
}
}
@@ -60,36 +58,41 @@ fun Application.UserRouter() {
route("/users/login") {
post {
val checkUser = call.receive()
- users.find { it.username == checkUser.login || it.email == checkUser.login }?.let { user ->
- if (CryptManagerUser.passwordDecrypt(user, checkUser.password)) {
- user.token = tokenManagerUser.generateOrReplaceJWTToken(user)
- call.respond(HttpStatusCode.OK, convertUserToUserDTOToken(user))
- } else {
- call.respond(HttpStatusCode.NotFound, ApiMessage.IncorrectLoginPassword)
- }
- } ?: call.respond(HttpStatusCode.NotFound, ApiMessage.IncorrectLoginPassword)
+ val user = getUserByUsernameAndPassword(checkUser.login)
+ if (CryptManagerUser.passwordDecrypt(user.second ?: "", checkUser.password)) {
+ user.first?.let { userDtoWithToken ->
+ userDtoWithToken.token = tokenManagerUser.generateOrReplaceJWTToken(userDtoWithToken)
+ call.respond(HttpStatusCode.OK, userDtoWithToken)
+ } ?: call.respond(HttpStatusCode.NotFound, ApiMessage.UserNotFound)
+ } else {
+ call.respond(HttpStatusCode.NotFound, ApiMessage.IncorrectLoginPassword)
+ }
}
}
authenticate {
post("/users/delete") {
hasToken { principal ->
- verifyUserFromToken(principal) { user ->
+ verifyUserFromToken(principal) { _, password ->
val checkUser = call.receive()
- if (user.username == checkUser.login && user.password == checkUser.password) {
- users.remove(user)
- call.respond(HttpStatusCode.Accepted, convertUserToUserDTO(user))
+
+ if (CryptManagerUser.passwordDecrypt(password, checkUser.password)) {
+ if (!deleteUserByUsername(checkUser.login)) {
+ call.respond(HttpStatusCode.InternalServerError, "This user can't be delete now !")
+ }
+ call.respond(HttpStatusCode.Accepted, password)
} else {
- call.respond(HttpStatusCode.NotFound, ApiMessage.IncorrectLoginPassword)
+ call.respond(HttpStatusCode.NotFound, "Login and/or password incorrect.")
}
+
}
}
}
get("/users/token") {
hasToken { principal ->
- verifyUserFromToken(principal) { user ->
- call.respond(HttpStatusCode.OK, convertUserToUserDTO(user))
+ verifyUserFromToken(principal) { userDto, _ ->
+ call.respond(HttpStatusCode.OK, userDto)
}
}
}
diff --git a/Sources/src/main/kotlin/allin/utils/TokenManager.kt b/Sources/src/main/kotlin/allin/utils/TokenManager.kt
index 93b7e50..86f2073 100644
--- a/Sources/src/main/kotlin/allin/utils/TokenManager.kt
+++ b/Sources/src/main/kotlin/allin/utils/TokenManager.kt
@@ -1,5 +1,6 @@
package allin.utils
+import allin.dto.UserDTO
import allin.model.User
import com.auth0.jwt.JWT
import com.auth0.jwt.JWTVerifier
@@ -40,36 +41,36 @@ class TokenManager private constructor(val config: HoconApplicationConfig) {
}
}
+
fun generateOrReplaceJWTToken(user: UserDTO): String {
val userToken = getUserToken(user)
- if (userToken != null && !isTokenExpired(userToken)) {
- return userToken
+ return if (userToken != null && !isTokenExpired(userToken)) {
+ userToken
} else {
- return generateJWTToken(user)
+ generateJWTToken(user)
}
}
- fun generateJWTToken(user : UserDTO): String {
+ fun generateJWTToken(user: UserDTO): String {
val expirationDate = System.currentTimeMillis() + 604800000 // une semaine en miliseconde
- val token = JWT.create()
+ return JWT.create()
.withAudience(audience)
.withIssuer(issuer)
.withClaim("username", user.username)
.withExpiresAt(Date(expirationDate))
.sign(Algorithm.HMAC256(secret))
- return token
}
+
fun isTokenExpired(token: String): Boolean {
val expirationTime = JWT.decode(token).expiresAt.time
return System.currentTimeMillis() > expirationTime
}
- fun getUserToken(user: User): String? {
- return user.token
- }
+ fun getUserToken(user: User): String? = user.token
+ fun getUserToken(user: UserDTO): String? = user.token
- fun getUsernameFromToken(token: String) : String{
+ fun getUsernameFromToken(token: String): String {
val decodedJWT: DecodedJWT = JWT.decode(token)
return decodedJWT.getClaim("username").asString()
}
diff --git a/Sources/target/classes/META-INF/allin-api.kotlin_module b/Sources/target/classes/META-INF/allin-api.kotlin_module
deleted file mode 100644
index 800390ea11a064bbc23773deb2f4818d2e4de1e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 132
zcmZQzU|?ooU|VB#7(u}O@Bz`%f)HVwoz#gNDri!H#Vq)vy?MGTB)lv!ll
z)m_u3Te>%0((R$AeM);;FZDSsr;q(x`rgxrA$A
zpjMbMiZ@(`8wM-->Wx6ZbZvIblX>X`mO-?70mob(IblVwk^Wuj%y^b#S|#2;Kb&1P
z%7$(mPC=huT9sx%m_T1W-G?i#At7)qy73U@H8cn`j988poTmrUdk8+d
zo=eyJqNg4tFt7{l2fTApE`^0j85nsZFz8LOEbv54xDTua1lk-H2Xz#bSQI(T&DSwd
zgI@nSXw9ta74%gZEO~~-C^sC(4Jt9`>rRKtrd%p@Iy?rms%V&1R;?U(LgJR)3d4_(pmK}+&*LM_co7$v
z5FX00f~(=9c*f(QrxNsJSA|
zwW(^XjjxwH>HB=4^M)PLsok|&M)|MCf17&K%~?z)aT!w#zwL}UwqkfW`C2F)Q)-xD
zhO?zp2v!&i=^n<|Rpgp+1+#SDBiz1~jx{h(olNiT=N<~wh>s<44GRKK??$_Z=%T>!
zZJ9H+EenR7<7<`U>!vKJgr(sV0=mg;+8MZ=-852Il--?6a@qA{XLmJIb$8ydf)z$m
zR16#O>W*hoW3NUSNnFPg9mle@U9xENU29T(Z4=PClpr>fRYO$*f!EV@xBur=lySdp
zz9>ipe*b@vfu^eX;Db&=YCa{#OsZE>;u3Kuy3J}ZFMgtqST9O;L
zlCi_F%BXHzHf|kB92SG3H#QhM-Ov(05*tjs{Es)7FJpOHsd>b3T<2!d4Slvr$Ls8@
zipAE;X61Zl&;Cclw*+3SkJXy8Gs?Z{C#${ijOUiEy!5(goMnqipSh-h?@*dOcxm{q
z!1Ftu^0<67d|zPbec#sbLuQAnsBGEB+&r^-Th?VNn>Rd5wIQ==5@^a<1;+>~wR}Ib
zpSd<^l%lf(S@!l*VR1=%5#;FAkQOP*j8nFJiv&iu8ysfyou@N~$4bjz1rMO5GL9oX
zmOI~;s9}g-
z2@bw*p8SM69q|f|*4uFE4)*_%Ac40yAF6`!1P<^EB-Mgep8b^j7?Rxck@K=5@-ME6
zZ0RmeUhDlcdj7x<{#~ywmAU=YUFbYJvw?GyeYf%9w&8mijo}_%5?E-<+{N?;u1xjc
z!<@j|&=S8xBK{WI@8jBnLcfELZ{QUI#XI+LeWC4>cVPaVl;ijr=R;_C>Rp`Ha8ARO
z3*z7f4X^x%@Sk%WqwI0cX&lE4M-H9Hv%izvFB7h`?WO!_{^tpe5vx7gbz&m2fZ8q7
zfC9fDegoHIT;Jx<_^3$=GzrrI2`Q7zk>x(F9rqDi=)Z%t7ZM$bzQ5p1N8(R-?Kb>(
zcv!Wx;!VUYOLrhZ$TI~iSL9K<8zdi(tZ&uHa4;UpP?e-2T+1lsStne{Gf5_jO>6I|
z4ScGPPUzpjXKv$jJLPEIlB1P!D1DV;W$sicwNj3uifX^)*Rv$~J+8oEd^=hdmiqny
zeuN)W?qBgM!P7S*+2i;%Au)RFH(U+w+UcJseF8qPNXTI|b*SlxnvVL6v!{GKjnC7b
uw-yo4;0qaiF@rDR%NcwHU(Mikd~K0GOYn8Pv50*>zTxAWK0+UPAM(GynR{3O
diff --git a/Sources/target/classes/allin/ApplicationKt$extracted$1$1.class b/Sources/target/classes/allin/ApplicationKt$extracted$1$1.class
deleted file mode 100644
index 9d2dbac06f4b76f1e5af99912e79945aae8d07dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2618
zcmbVN+g95~6y2kMWrPTq=1T5~n;1Jm&|Di68gP@wi6In-)0Ex@c`(AVM5VElyz$Z>
z=@+zF4e4dAE><7=QC&SF3!=Etq164&Vx&F`VJ9>v-1G`nv1b
zTspq@KxV`<8E{*QYGyn$u7fdrSFZa~EnI6gEXR`~@VIN0d1JZC3(2{are`aZ(7GF2
z;}d1ax9ZXltWX3k5m>w_SFN?D(z^e6af)o=$=LT?;J2Kr2r@RFl6QuYYzMd9okkJ3h)V|Y
z7-i@V1a}*0j4@p7VDhgr*YN>)Ul06s5y$GTHNF=9f2?K@N9Zc|YFuHdSH
z%eb~Dm)&>jxIs#)3EB3`aDejkS_?576E{)l#fO+6;-Qf9>fj`&-H4M&Ch?I9(QQ)l
zTg##41XxUYCWV7S>C{&&B?4Cj+!iEmRfsPT}A!#HA4;d#i=8`oP^pmlso+)J|y
zi&L{jI%?l`WTNVAVgZXin8zaqZGD_!D3PuhnPG5y&y0|qLcpnBXpPoBdajuI^{5{h
zSX~+WX!4n(ERwQTCD6>)hG}eV7}|hlXh$?M2evkbwK0~{#(>R0K$EjTrg%Vt1cj0L|L*y66ETpo=bRNC+fRE&{O
zx+%Ciw1ENj?g7-&)1~r9Um86$>ytH2E7izAF8>mJxr;9`nCp6l13%Ij!#e#>x94#X
zhp0y@BRt9-Sqf3ZpwcF_3a^DOvVd#(p<_SeOg{G$`ZjT43nQDbRBv!-d=uAy!7YYO
zOyz$=@d9BQNQu(^g|%n;Ln=5&%M
zjuNjaA~Z|3B6OQJC_-i~zlHoJ=3b!k1NGZ(QnU&QpiMl+XEfi9kk*_fLaWpw
zI%>Nu#{E28G|020zFM`0CRr-5t*G_zl-lcr^@PwqU&6i;mP+`dgfH<`318!z5;&HZ
Uz(UxlE}<)g2(c1kCdA>t0q3^U4*&oF
diff --git a/Sources/target/classes/allin/ApplicationKt$extracted$1.class b/Sources/target/classes/allin/ApplicationKt$extracted$1.class
deleted file mode 100644
index 2e3a1cf59133d4a935cc73e169862bbec87df0b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2007
zcmb7ETT|Oc6#iBi3xpC3xsx`Kq9(>B2zpCfQ(BioQ7}##JER?+7Fif!dBsR8H+|!`
z^cS?9q{*~19j1@{QJtQ(9peNuX&$tDw7cg!-?{$t?;n2w_y~^~rg;$f!Y&>j2ENOs
zABs(Bc~4}-UFp@VB^`_*DK$c=o*lHBwlAa?2_D!b-rTM6LjT=fB3y+L+v{CvX}RQw
zc0-1d9eYvBi)^0AeY;4DCuG;;YAE*ndJpN5@MU48z%X^TSsf{c8-4c!OzTK9q?dhy
zTVdGDmO8#B(hp+08a6z!#Rac>QQ>utZkv$35t7gsnl8_|ZH9A}>;oXGXM>wCFg6Me
zCWCHupcxk4&Zdd;7*`+}hE&#>+cq(RNdv>UKnHT)j~Q-uIrK4pHJKFBv@cpjoZ(LP
zbpmH6MmaoN3ZuGx;K|*H`;=fVL@3(@6WirbmXjbL_=}dJVkxMT^p0Ta)m-&T$PqFk
zFyD=Jyu)zG-S^x^7wrL$c+;a=W4N6y9q<;n11{?J{oMo4m4&{OiUO$@R7`GQ+Q7S*
zpJfKyTWE$5o4XbVM
za!0>sZw6DCCobR7Tb)V>*T`~_Ox__`nf!_rlu0v}KZgA~mVU$CU+BLBpQcwJ2<1u#
z+U!A__!OVf{V*QV?PM1RuwuW5dO}_^=0EWm(n%~(9+h;6}nC+6mSSl)1=+RbxRW>q5L{tpE$=}pS5<+
zS}DKs2D}4Lz(t}JNGReb4~3XxJI+R=LIPxYc6N5=oBRCn=P$njxQ7=EH@NRh<*c^b
zzVx`3f!fjqai~M?X;CXIWxyD|EjI&g)Eb?ZBb64R;=WVnt!j;zlHc}YC24p80V%CSJdgUV
zkYc!=_EV%l}X!3MVa9CujV>yu%%ztGe^7+7O;DB_!Jhq+T**x{7Nyu3&-!
zP4riCUw$*_C3P+iyKfmxF%-{N>~-qUX+(i?Hi>Mb%7?SGhPhUs%^
zJ@SUk0yOzg17IK)w
z`wUilkzxG22(!x`T?g7FvpzZFWYHL2$`SV=!`KPrQ=xf{Yfgh}wK_v|gP0*XL%_hA
zh8d!dhthCG;%elxaD0@vkB@9?)UvG!i`dcQqbaM%=B=Xj#Qy!ew3RhhwIxbznX5p(
zYz1*dn@ymX&)MD#));bwE61>KW~xk)`RPGS9>?zNuVaJZQsQLZZPH|>)`A*cfbnwR
zaetT7*j0V8V+g}YSt?P9TU8PEC50EU(y}F7)sc}TrNI`io-R5~zpIo8*L)sDf^N~s
zy7K%Wq9vqK9t1VYVq4Y~*KtT*?Cl^9J+UE;%gMfj-5z`b6-8>x1u6~Qc1)T+QLR(-
zr{0moC9XgkR6V5UQ?HQ!fjEXuqWPW_7rQoNW~4~dSZoraMbGht@yo9Z*}r}rLwx*Ob`1ay7?oyT1`^gT<-pCoy$ivtl9_%3%
NVKu_T2)81P`~|{H21oz^
diff --git a/Sources/target/classes/allin/ApplicationKt$main$1.class b/Sources/target/classes/allin/ApplicationKt$main$1.class
deleted file mode 100644
index ccafde632bc7683ba679b5b7ee4c28d85530e4aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1543
zcma)6U2hvj6g{(c{ju3Lj+3@YC@pPG>%`DaN}+&Fs4)p$Y7D|963WwfcSt5)&qh0A
ztGwm6@C*2mXay3Ac;rVR?l`V%q*Tg-?_AH^d+xnw&g?(`{_z)p2WT^_@;H{tZyp`R
zGUP@k>WQfgxKx$RJQ#y+_Y-3y4o3rDDkDTYQK}1
z&M=M%e5qo4sE9#NM3IQPW0ndi|9`+K>wz*Ufyq$kvBYpWJP=`jg7yth`9RS1Fx;)S
z5BZ4uF<1Nk*S$j#n)=L6*MjWVEg4sE)x~8jGc2A#LLRFOB_4)CQ;*L~%0nX}57$s~
z@dn;xI5#B>cg|>PZKkV9pA>jL&E#>@!@TXp!EJ`Qi6E?k@_3t}5Olgvo1NA+!^M{}
z9m~tZT~v#>gEa={Xp^CQRu_dvNTMhCSj7}=k$X1rQjxq3hJ}}qUkSq_Za7`0GZO@qta&qjsC&#W+a$INGA-8mLyy|SQb!WqQ?Ed{z&MDZe
z=su0s;3`o+4w9iJF%xLkK2HyiP-M6?^KkF=4IQ?Uh}2qcCn1k_c`A7?7Ei5Vm~TrZ
zIzv)hI@zgwJ5)vvM4(1eOA4CGsQF5;3|^p=NLw-2TF{f3-&SFqXi^c4e~?5B#je~}
z+zeBy;&zi^8j2lhORh``?4H8Upkjllyg=j7X9g>lTjD26KjNEqTI5wIf+j|8J^LKq
zFXS;Xf|UV9+Kd*h4y|*w^5P4u)L!7aO>?kK*4|9g5A<-C+SJH3|JK@-6x!O0ekOdhGT3eX6eZ_5s>E~gD=PHXLv&ELyEjl
pS?}#36W~FB_XB)@hXFpsM*%)YeGg2dflv03)!5SbRO5!m{C_18bH@Mx
diff --git a/Sources/target/classes/allin/ApplicationKt.class b/Sources/target/classes/allin/ApplicationKt.class
deleted file mode 100644
index a845276e2ed90d90cd8b2fb08db582c88e4616a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3163
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
NOxbX3T(t3r{{d0m31k2O
diff --git a/Sources/target/classes/allin/dto/UserDTO$Companion.class b/Sources/target/classes/allin/dto/UserDTO$Companion.class
deleted file mode 100644
index d9c38c81b34cbf0733898f2a6854697c37c06df9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1275
zcmb7EOK%cU6#niEWq_ikRBIpBT1yqG?Ld7c(ljcy5v4Sd%BBl*fw5i~?ldzO(zs&P
zAL7cTx-oHKNZt9PjAtl)Bt)%?Iq&bBGxwZ(fByRR9l$+2WSHi*Eu>jfj``ZN-1Y6P
zM9yjMaVZ>WfHB1Cyv8M^6&n!Bs*s^Vkni*_6aom#S8W>>+<%^~5C&k<|hS|Ydi8JBZC`J(vBZe`C
zxqtqlfy)e;WdA74db?=~sVrA=+g!Ka@|LY~j`Wns0J1phR=+O04Hlt+u6Sg%MC>vopWjy!$?6$tJrE*
zEO(n%Y_h})PL-xw~5UCC9;rGV*IEvZD)%FDL!1jRf#-8qJ6UP{Z&+1&Fi
zx-pTG({iiUhVWBQ_L1cQ95OWSfIkE1B+0)#1#2-dX9iNd1JVZJ7m>}FA={_b`8sTK>RU9P7~(p4)i=`^0=1A
kEUuG?xjb%Qeh17$0t-7ZJbGks(?ih1u!mb7k{(jO0StFENdN!<
diff --git a/Sources/target/classes/allin/dto/UserDTO.class b/Sources/target/classes/allin/dto/UserDTO.class
deleted file mode 100644
index 864d973b74c93c2d96d7cf4d25f3846f19587d29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5137
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
AaR2}S
diff --git a/Sources/target/classes/allin/dto/UserDTOWithToken$Companion.class b/Sources/target/classes/allin/dto/UserDTOWithToken$Companion.class
deleted file mode 100644
index 363fed4fd24995b835dad0269a70114bb862b7fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1338
zcmb7EOH&g;5dLO2WRrjrf+8;;NWg%?CipspqQoF&G=wS>M=E<$yY_2ecq`@g
zH&Snx-G)%foZH;tO1jDdV~E%JF1H=7w(Rw4UDUJ%lOen)mDEcNW@@I=haQAu2*F|q
z>22vVOcySaAj=S=?2>OQZt2ytEsX*`$*3uuR}p{pL3%D1^vuI{As?V_uTEyp3R>2rQ0c~qqEEc7!(^2JhlxtM##kUA%O@)R!H
zhXEv_h+~jp;-5cn;VMHW)x9OVzT32=(!x{Ru~)=9-g0!#RlfFGHSKz9+-nFgJ5!0l
z2%0mPteqI&Hak{^`TvW?FmMD|6Pj;w&FPwq=B`P@#eyRm9AID#((lPYN)xx4VOVYN
z55jPLJpKj${};yWbXO8G27OkC4a9LZjT>r1^%XJ;=G6
zf}y`4l_<8FRpFI+)geuy;MTZP;WYImca_nS+)`Y(JaQO&)lynEMPBVnUy{%A$y_q@
z<&_d%&f&fEustiJpbdi<6aLCXAgo3WXB#zdVuFfXO4%$StXZ9;1pNTP$
zrZX@D5rP4Ie;g1+jHChdlE&_g39`m<7xzeO5S=6Xkn{%T@rdXX@*E?~
t_y){8uIF(hkDItfEGF`}jmZr#A4yDY!1C!u!nBXDk6s^le58EL{01zTP1gVb
diff --git a/Sources/target/classes/allin/dto/UserDTOWithToken.class b/Sources/target/classes/allin/dto/UserDTOWithToken.class
deleted file mode 100644
index 00325c57b7e904a12dfe0a7977bbf82978b26878..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6105
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
diff --git a/Sources/target/classes/allin/model/Bet$$serializer.class b/Sources/target/classes/allin/model/Bet$$serializer.class
deleted file mode 100644
index b24930ae913026e1ab08436535809d66b88a3c77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6534
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
diff --git a/Sources/target/classes/allin/model/Bet$Companion.class b/Sources/target/classes/allin/model/Bet$Companion.class
deleted file mode 100644
index 76f393cfd87af6f85c2471a2a65e6ddc17a05d1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1257
zcmb7EOHUI~6#ni^>9nOvTNHVSiWF^8m=>Q2gossQwbVoi8y4oaT=BNkJ7ngzA+EaO
zhq!X7ZcJR526z4_35PlZkw
z+{P|f(p451L!!o8+;+Iyv0qneqN**J4B;iIq+Vt)Guh2J1`v)R1dAc0-%FoiqI71~
zMTVF!JjosTL3j)^nQW=cU&hZpL5)7e1V>o&?`E
zx>1Jt|I5aZJR+g$I>**#};UG6BZn;ros-ZYh#4N+7r=}W?_oa`Axyr`7$3J&*uK`$h>
z?l!%uSd~HQu^w~tFCOwV=1_3=FiE3_Mi*q0We39`IWYSTkuRhe$k7>u0gGrr{1AXB
zVq_&TNFK9G&iBaHS6u2~Tg{ahhE=x2_kK{DuPH0XzR
zn$D3!XDgq$GG)h(DsOcrsii0imP
hDyE9KiRmpcA8E{N!Sd;|f?GbqJ_dc<_L1?C{R0doE@uD$
diff --git a/Sources/target/classes/allin/model/Bet.class b/Sources/target/classes/allin/model/Bet.class
deleted file mode 100644
index c8f6ea00310cad518befeb4e94995e2d607198f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 9414
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
L1sH!>3g7<&ggu%A
diff --git a/Sources/target/classes/allin/model/CheckUser$$serializer.class b/Sources/target/classes/allin/model/CheckUser$$serializer.class
deleted file mode 100644
index 5b18949edb14bffd12ac12c274f322ab45e4d9f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5271
zcmcIo`&Sg#9sk_f#|*=w>mn*9QLHq91z9wPSU{r!>LL;gN`llT!|n}?%+7A+&Z4G|
zn7-2YySC}O>BF>5+ti$+QcoLBJSRW&=l(sV-#a@yyWlRU=hVZ_ow@gWzpwlGKCb`%
z??3(p;2_>(*kf3hX{U1eEVoia^E|U~UT~+qogSuPnXhq21!H(=?2@r)q%6apOFch(
ziD%q_v4y-#Td$n{;Y*uNL@O!!dH4j1md;IvX`xBGHg!*i|wvb!jnINd{?Knk38&fv=mP
zB_lJ9kLV!47@q2=k!LE2p=8#8jOZSubnHWK4BN3or-M8|Az9n4YYkCxkYUp-Cx8&c
zV#X~xoMEn>AJ)SG`D6o`L-|}GFHD!0y%<9uo^8Z4I8+x0fx>GytLSG)l$<@uUoCRm
zr6g@#_0rsh7zS~;5d)yK*X$E{KpL@ljz}5Ok7Q%Iv+7X%BZ%QBj!9X^1BHAkX*DIt`;-%~YaYMWJwem^+9yg!t;g$L5SbH;EMWEgt&
zY*NPr&N0+;bAX{T?p9UU(kZHVfuW%)7aZS^+lWjGq(q%m&^blPz!S|K4KoapMZ+p`
z4Hq|#PM@`km;V33ST;ijqtS?$F-ryJvO{6oKFO_D7+&wFW8nkGds#%C4eMtWI^rz2
zJYv$NPPOpdEc0`aC47-8<{M#3tUmB@GHkD7FT>!5T*?ru&J%u<7()j-WqP(54sXaP
z@L470`+Owmr*T1YdX+LxRZ#f^R38U3)Q(cqCy8`f@S0?SUt~D4LBMU$EU2J-Rtozb
zuTSm?`eY5SF^pChEk8fjIrSjM*K{Vb&mQn|*JpKH#pft=tUOgH4X+b4jchhZ;@fJ7
zyCD7Z2EHJ-evw>JFod|Acd{D3OtrvQh6;JX;ThSI%bK0zLKt&Y`3{|V&lrP)9CPmWn}mZraRBDwJd0&GE0(l
zeud-;LEIQXl1(a!j!W%Q#NvzGqCUI4v8*AHj>#q39X*vE9v&HI*it4s!(Ah5xCSjM
zxy2COWSD$3$Oo}!3p9VllwZB{mfg?r!Sb~}efgTM>`+QStvrTwCBDUD?)Z9ZPi&2s0QK{PTk>ubWMI%KG
zBFWom{5!oUxIs_32}Je|J!2&T8k^{gT3c*JXwBw3*!CVRZnXK29!*f#rYYimly
zrer#sCKojj`;WR3U3aiQc?(aU2_FgdMOc57^{ZXoOZbF>eyvqo!gCC7p`%sn4lQ9Q
zg#KttBz&zeLKETAgxV5`(8LX7pLh!|)BF-nD(DNhg#Sb$aB_wI(I`D5PjEN=o(>(k
zvGSk$c-~l9zMt*NyLXYEZVBJU*asf-vkLBFV!9>L8f{hCZJd`L2|)@YyH+rc211dF
zXH@K>15xp!_cs8nkOQjLSoK=Cxp{?rQnkElYk;e$kE?Co`F!L%oLq?{rpUg6T;m+DFPf=^LTBWLM%-XkEeY@K+jvztQg-^!+B;^;Lnd;p<1e?{5lx3*Vlh)$ee8
z7vID8iS-X=5K7~RY5XXS>-aIf;wNbeo1e~r3H%H{pFxYjF9d!mU2j6EYKm46qpj2_9kZp76dK|{N{h03BQ5>
diff --git a/Sources/target/classes/allin/model/CheckUser$Companion.class b/Sources/target/classes/allin/model/CheckUser$Companion.class
deleted file mode 100644
index 82cf4d4af5fe5ca61c1094cc16c6a81416bd2b6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1300
zcmb7E%}*0S6#va`>9z%>6!}&W0c}y(f?o#+5v#;%sfop2IGAY}Vd!?2>`n>s)DwS*
zCy(mI#Di(@<{xEzQwo@f0S`Ox^Y`A{dGF27U*En1xQ|B+L`ds@j3g5M7c=>SYEyohkRA3(*83a2O(bTZRl1
zg>zyrG9)OO$#>P+?S;jHv%nR#Bb^B?2F43V6xx`Tkej~
zm4HhXx?Cw=w=;!q(bvU>=aJXM+2v0imnH%Sy$rE@v9!KY%sn%4&xI`Zpbx1ylIW)l
z=l-pO0fzZ>=UUvIy}B!v7J=fP`&7K+4NvEM73!c-)qb$XgPI5yGvx#<(}@15>Z$Q<
zy=`Tf`@d)meaC<`q4_4)oG!W;TNG|P7-!@!x{axlZt{YRGxbg~W%j@gg7nx-+&(b6#V7NiozM!h0}
zbzbpElPdUC?v*)BHpv}jyd<|2*NuQ2#$Gp+mUWR=doq;dvvN9s3_W?JM3D1%7z$dW
zM9FUiRk12f=#dVx{1*=M)bogG1Z?7H8|k)Ol3ddnqFpmz5&KMxg)E)M48#Zq^c*=L
zjs!`4=q8Qb2G4iE&KF#1Vek`~{{?qC@P)R|CEO!wl3WIojOrO8-qbTo)FNu?88-FM
zfYUj6r0fJCGe$5lZ+ab~+GQR;vG(W}w
diff --git a/Sources/target/classes/allin/model/CheckUser.class b/Sources/target/classes/allin/model/CheckUser.class
deleted file mode 100644
index e2c114335f5cab515d4c7fe19f5a9a0f395b8ad8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4635
zcmbVO>vI#=7609pEUjf3)&gwH#$Xq>@rwu?8WId4V4GTCI~0R~(6m`g7klw~rRc5<
zp(&xS(4=kBXWFD6I@1rGe&9o20a|7{6u$Lu>U8?MyK7ls8QRR)y62v~_dI{+-1D#h
z{QVyQ4&XNeJ8ai=yxdBuDBaxnk}NErQ?inT5U{S;t9H({y~W&X3s+>pPa-CeIP7?i
z|BAqK1JmmV=KPA|EskyE49*MenJ!fpb62FlP_Z3PVW2$?E2KIF;{KAO1UjZ0
z#*{9ai_)LgUJ7g<7~CjUpoJ$+N5%-G3Z<2D$&;SHzkV}HRfSUdZGj{ITMjlcNIRKG
z(ThC-X)Un7C@P=3d1@nRt>8I0d9_%*h_HQ<+AjO0(%<-W@Er3sbgv6uultSm|I4A*U&(jF9_@$
z7=QZBFYB8xrZI>fO}#`!HrEmnSr9?%lAnt;P6Y{O9
z?Gi{k>YZ2%b!ASsmjYvuYb*cN=2VWuWsxxxYzI63fn
ztgEkus7dPXavEQ4!D~3fN>)J(6Q!zOu2RkZO|)!kGQCWN@zp^QIIxL;rv_11d;?SK
z3OO=<6XCTk9i}JB^f)`bU#S+DxEZ^$%mnLXZHr{&CSQAZs-;rZE%x#S>0OY$Ri!^W6yv+>hbZ@AymX
zv1^LXtaEj=UZ#&SJ;XcvDA#qa0FWU7_0+b;6=U}jq&`{+@`S%H${;v
zL|5bcwe+2Kt9+g&uN7oDc%M)4(Ju*f`Ae13)ftCD^A=Ay(k<4G2)sOy&wn1fbRE2f
zN(yD@*efYL_TOD=@e9(u0YL&sH_=t|;TaHQN)8t|T?9kS?#3C>jmh?y^(2U@{cDx~
z_&_odK9(CyB*^v4`pp!s;~jzKnlNH!69m+bF#k93uAVGz>OS8%TQvv6KHnA{%gspN
zF513Llo~6mF^+gb|1|3#;#@3~f6dXmeWZ%}g}CtG<|`?q(?}WCgPSS-8I~C?TT+He
zw*F)`lik8K&Q-NZGa*MOfo*=%jmyQxR-#Yk_h(LI($`oYan(=@`1
z0To>3VR3Ss)y4yvQPbKMC=yeTKGq_(lN%!~Nbd;6k?ynFNq3AUtWK^Jo3OGZy0~_8
z-8uE>mN?TEDxzgNL|t*S#Y&U8W^Tl6wbBp&kl3x`%Q3B`t{V^u0oeB1W!835kJ-;J
zv*CB2sd~P%BJMGiAnI65F}FGs?e&?s598wS$X)bnpF(M2(A#T4Z?6TtJqmh#kTxd3YQ`7w
zB?{9@U!ck+u01{R8=t_`X_)S5ipcED(D29|41~Hr=CL@8mK3jY4v#W;f~!u}zrYw!*Z-oeZ3euRk~XpmT;$M(p;qm*w@en%+t=;3Z__Y!H!
zJo@J0?%VtnhNYdyOl-xgI2IVx5eXJJj&Xj|-j=!Q5FZ>G{ym!Fw}<};<5M)nZVx|z
zF{3q%@c$mB0;bl&eRgdh*UAj&IJ6+1H2;n5Nf=uLd}!^ITT9A8!yB*S>$LeB3U9)`#1jh=
z1r#ah8v9uY(as=cK>9weUle!ot-s*gIykxye!|}j1zhI;hwO^ix!&OVDftF|5-9wL
z)OWc5E)D*x@nF=HTX4yUrS+C;i|$#
vg@nRRg&xH*3cHm)-=}aqIF?s9q%f#(D%hS?IHxeLa9-hp!iNes6h8VdEaqq?
diff --git a/Sources/target/classes/allin/model/UpdatedBetData$$serializer.class b/Sources/target/classes/allin/model/UpdatedBetData$$serializer.class
deleted file mode 100644
index 39e6f80aecb47f2fac869b5328c6745ead92c32b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6054
zcmcIoiF*^r75|N{mDU1;zyuKjrnreO5V+K#wmEGRL~Ms*Ab^{;YiY0-uUA65GLRl2
zY1*_&)3j+yo8CNxX_b7s_t)eSw18K-&cR%YIbMdy!YlEzj@Dh|NG&`
z0CwQ6z@vs`nRa|4osw4kSSDq-GPPg2y@qQvHaaqE8kYI2%xVw~%aNG8qqMA+S;EU~#iogIyzk?u&=Fl{Gp*ml~@TiA&Yrrp7uWsz#n{adE7
zSDrR`!rd1K=
z42pHtBV9v-zy>3kl#bI#qcqOn-I&aT@d>QZu?d?6HZAVtirCWdNrAS-$;yUE*zRmJ
zYIsZ_m>3*7x^J+jPhjg(W}LITD~x8egwTXmfo)63-Jecd(y%LKZ=tD|61ZSnUT8do
zt=J||N1v2nMc_cS2$ps-oid48y^=37+tpknex3A7Ln(HX`=SgSJ*yNM`^n{@tZ
zG!WaCk4VNh8Rn91E-M8_s~MwK7}GFI$m~f^WYUi5%91I=*o%F2*n|B7@%!AYp;sVU
zF!qo&E@&;b+8i7*b~NyWEcV9Vkf
z6BvqNmB(6|l{eVv1r39|14{Z9ZboCol4YGbuF$vZJeUcc$M8cvnnTojbBQ}VpP;}2vn
z<-*V5871uV0bd6q0F*m=~TkXd<^!aZ6}}I>Fj`!9akWhFJ?@2J)BWh
z%;I*Kj~0Zt#(Sw#G)xGDN@+kqd16TkeF|o&SS@gEK2CVe>m;*5oE7j-8dgpQp(>~)
zPEh2pA@~1>x6)Y@yq&AVBp9vwxh#RNaY$OH1zxOGHdb?O{^05&D#K_=P8ILf25Sbu
zv-pwETb}6nN&@k
zDwZZ#z#5}Oh@D5-Pc=9fY#{Oq8A5lPkDhWC=J4;ErJWsifLv8|~WRtZ>)+KWIEjcMI-p!?rB@Id1ua>ww
za4^x^+s6xhWr=7&x(3@_gNvStNiQ2>p?*T@hwQ~T=g*t!i>0O~wO!!W^u-Q+`l9Yx
z>nS|J(&*Jak(I?czH?oXMGAwW4tj!jUh=G+zStg&`l6m~o^4{k7WCYHE8vNE53P*^
z*M+0OXdvnddbjD@LI>|$68W{dLn|ZUb);_(M3!+}u2v4kA}jbF;oM4&QI4w=jaoah
zI^yHIf9LTNcP{zKBe2dF3`DfsZwFSZW3<<7`L|ZI`~o|Qrn;Z*p4P0kttOhOW_R)A
zt7vh^Jd|&#wip?cVKYbDaAi+Rhcl?Rj9GvQk&In^D4okDr^|-Z-r|7hX-e;`4#8L%z?kui6CYxXs^ifq>&OezBCp3V7#jzJWFG
zb8)H7ck(omO1;RC?G1NMb8S1nlwj=&)=y(YEtXnQpNb=L>&CKf1MpExVDk+$_G=&E
z(SbJa6|@bt`C5JLLv8*m*gn)2XbteamYB^&F^g-?+o@m*F+-b%X`SKL=%;U>tK}MY
z4fu9@JN({`fauh`9YN6AJRz2A4S!_Ns{
ztj^ayji+MT6o&k?&aqCd-tR9g`loP`)WLecR+tFH>H>M{P?37LGgR-71i5+{?>+J+
z-X+T^e8GbbU%l@g+J%3w&+w0lTbPeB}t8fWJ3JU9GUV2$!oeF=8
zx&-lZ8I(@sfeh%r3D3#vc;zZyy@}UOM!$CjuTDeLuH%g-TcVe|*YM+(=uZp7&kMsZ
z^TSoFS9*xN_wofD4cCPT`Tmph(fsK*;je_mRRqkBI2IDzi+^$5gOBlVj=+ETyu$Ba
z@sw{l_%(jB7r*8A?;Kpl+rwP_y~I0s7k?n@KMup2z@HL$FM;>*0bg+?fvfoQFoc7@
z;My?i9b9*CgFbTDNg?K7%E3bp);icomJU92u);yRgB=bm2kHFeSqINMa2(wHA7-n*
As{jB1
diff --git a/Sources/target/classes/allin/model/UpdatedBetData$Companion.class b/Sources/target/classes/allin/model/UpdatedBetData$Companion.class
deleted file mode 100644
index 2c6d0ca240ab4582184f75fc0f61219f4a9cb829..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1334
zcmb7E%}*0S6#va`>9(axDT;jgffQ^}*cQJI5F!+b)lw6Sy>Ku?JL1soEZLnB;;AS8
z5KkV}i-`x*;LShE__h=wF;qP4ywBfzZ|A)?KYxAu4&VVEGo-lVNM$$NnsDsbdo`{_
zZB^(su6Zi&HukuZuCl-w61#k#+YVPd_RH;EQPmbqhVYV9QZF-@=}aY#K7?Zk!D0yM
zchYB=DPAPOB16mzM+u9|6lJRD
zdOP;6(AyrD%D1^vuI{As?UJiYO~)axnI1oqIw?|k76uq1g;IHQrIdflknWK^bq2Q>
z#~_kXBrwD<`OlxXaFrpK?%tBUyWg;-(!x{RvDd^~-gI={RlfF`Rqc8k+^Y+3F;j`b
z2%0mLs-7C(G&)v>`TvW?Fn9vk5Sr8IaJnX=v2W6FvEYaX2N+nL^anDKvc%PL4D0RI
zaLgDnVn(9fiWw1N0)f7ED{^#bj$JB)eW}-(osQ757$8&s7GK`(yZws>w{b!m-$Unw~ZNrreq
zDdFWE?)!pvELL`#URA8iAoOS#S@{cx95p`_bOa`Gw5oJ%Hc58SBBFh>UlI9CjDakj
zffAx!h!5(S
zBWe&0>KO^@p-HE6_*mHuLS~F&jBF;oWI&Rv3Eag!(i%kPh(08}fq6V4`h+~k2{W+;
qvw-Ub+$i8CZV`*g0&Zh!3(Q9f(_657dW|sSBkZH!#~mMOADQ3JdrW}<
diff --git a/Sources/target/classes/allin/model/UpdatedBetData.class b/Sources/target/classes/allin/model/UpdatedBetData.class
deleted file mode 100644
index c65c0cff1b7d3732da97d23f446e343dbe2d2a5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7171
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