hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Add new route /user/me

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-04-23 00:08:18 +02:00
parent 64816a1160
commit f0b5682a25
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
api/src/routing/LoginController.kt
View File

@ -2,8 +2,10 @@ package be.vandewalleh.routing
import be.vandewalleh.auth.SimpleJWT import be.vandewalleh.auth.SimpleJWT
import be.vandewalleh.auth.UsernamePasswordCredential import be.vandewalleh.auth.UsernamePasswordCredential
import be.vandewalleh.extensions.respondStatus
import be.vandewalleh.services.UserService import be.vandewalleh.services.UserService
import io.ktor.application.* import io.ktor.application.*
import io.ktor.auth.*
import io.ktor.http.* import io.ktor.http.*
import io.ktor.request.* import io.ktor.request.*
import io.ktor.response.* import io.ktor.response.*
@ -18,20 +20,27 @@ fun Routing.login(kodein: Kodein) {
data class TokenResponse(val token: String) data class TokenResponse(val token: String)
route("/user/login"){ post("/user/login") {
post { val credential = call.receive<UsernamePasswordCredential>()
val credential = call.receive<UsernamePasswordCredential>()
val (email, password) = userService.getEmailAndPasswordFromUsername(credential.username) val (email, password) = userService.getEmailAndPasswordFromUsername(credential.username)
?: return@post call.respond(HttpStatusCode.Unauthorized) ?: return@post call.respond(HttpStatusCode.Unauthorized)
if (!BCrypt.checkpw(credential.password, password)) { if (!BCrypt.checkpw(credential.password, password)) {
return@post call.respond(HttpStatusCode.Unauthorized) return@post call.respond(HttpStatusCode.Unauthorized)
} }
return@post call.respond(TokenResponse(simpleJwt.sign(email))) return@post call.respond(TokenResponse(simpleJwt.sign(email)))
}
authenticate {
get("/user/me") {
// retrieve email from token
val email = call.principal<UserIdPrincipal>()!!.name
val info = userService.getUserInfo(email)
if (info != null) call.respond(mapOf("user" to info))
else call.respondStatus(HttpStatusCode.Unauthorized)
} }
} }
} }

12
api/src/services/UserService.kt
View File

@ -48,6 +48,15 @@ class UserService(override val kodein: Kodein) : KodeinAware {
.firstOrNull() != null .firstOrNull() != null
} }
fun getUserInfo(email: String): UserInfoDto? {
return db.from(Users)
.select(Users.email, Users.username)
.where { Users.email eq email }
.limit(0, 1)
.map { UserInfoDto(it[Users.username]!!, it[Users.email]!!) }
.firstOrNull()
}
/** /**
* create a new user * create a new user
* password should already be hashed * password should already be hashed
@ -85,4 +94,5 @@ class UserService(override val kodein: Kodein) : KodeinAware {
} }
} }
data class UserDto(val username: String, val email: String, val password: String) data class UserDto(val username: String, val email: String, val password: String)
data class UserInfoDto(val username: String, val email: String)