fix deleted report
This commit is contained in:
@@ -5,7 +5,6 @@ import com.restapi.config.*
|
||||
import com.restapi.config.AppConfig.Companion.appConfig
|
||||
import com.restapi.config.Auth.validateAuthToken
|
||||
import com.restapi.controllers.Entities
|
||||
import com.restapi.domain.AnonSession
|
||||
import com.restapi.domain.DataNotFoundException
|
||||
import com.restapi.domain.Session
|
||||
import com.restapi.domain.Session.currentTenant
|
||||
@@ -13,12 +12,13 @@ import com.restapi.domain.Session.currentUser
|
||||
import com.restapi.domain.Session.objectMapper
|
||||
import com.restapi.domain.Session.setAuthorizedUser
|
||||
import com.restapi.domain.Session.signPayload
|
||||
import com.restapi.domain.TenantModel
|
||||
import io.ebean.DataIntegrityException
|
||||
import io.ebean.DuplicateKeyException
|
||||
import io.javalin.Javalin
|
||||
import io.javalin.apibuilder.ApiBuilder.*
|
||||
import io.javalin.http.*
|
||||
import io.javalin.http.ContentType
|
||||
import io.javalin.http.Context
|
||||
import io.javalin.http.UnauthorizedResponse
|
||||
import io.javalin.http.util.NaiveRateLimit
|
||||
import io.javalin.http.util.RateLimitUtil
|
||||
import io.javalin.json.JavalinJackson
|
||||
@@ -63,43 +63,7 @@ fun main(args: Array<String>) {
|
||||
}
|
||||
.routes {
|
||||
path("/auth") {
|
||||
get("/session") {
|
||||
//a simple session to keep track of anon users
|
||||
val at = it.getAuthHeader()
|
||||
val tenant = Session.database.find(TenantModel::class.java)
|
||||
.where()
|
||||
.eq("domain",it.host())
|
||||
.findOne() ?: throw UnauthorizedResponse()
|
||||
|
||||
if(at == null){
|
||||
//new session
|
||||
val s = AnonSession().apply {
|
||||
sessionId = UUID.randomUUID().toString()
|
||||
firstSeenAt = LocalDateTime.now()
|
||||
lastSeenAt = LocalDateTime.now()
|
||||
tenantId = tenant.name
|
||||
headerMap = it.headerMap()
|
||||
}
|
||||
Session.database.save(s)
|
||||
it.json(s)
|
||||
} else {
|
||||
val s = Session.database.find(AnonSession::class.java)
|
||||
.where()
|
||||
.eq("sessionId", at)
|
||||
.findOne() ?: throw UnauthorizedResponse()
|
||||
|
||||
|
||||
Session.database.save(
|
||||
s.apply {
|
||||
lastSeenAt = LocalDateTime.now()
|
||||
headerMap = it.headerMap()
|
||||
}
|
||||
)
|
||||
|
||||
it.json(s)
|
||||
}
|
||||
|
||||
}
|
||||
get("/endpoint", Auth::endPoint)
|
||||
get("/init", Auth::init)
|
||||
get("/code", Auth::code)
|
||||
@@ -167,7 +131,7 @@ fun main(args: Array<String>) {
|
||||
.exception(DuplicateKeyException::class.java, Exceptions.dupKeyExceptionHandler)
|
||||
.exception(DataIntegrityException::class.java, Exceptions.dataIntegrityException)
|
||||
.exception(DataNotFoundException::class.java, Exceptions.dataNotFoundException)
|
||||
.exception(IllegalArgumentException::class.java,Exceptions.illegalArgumentException)
|
||||
.exception(IllegalArgumentException::class.java, Exceptions.illegalArgumentException)
|
||||
.exception(JsonMappingException::class.java, Exceptions.jsonMappingException)
|
||||
.exception(InvalidJwtException::class.java, Exceptions.invalidJwtException)
|
||||
.start(appConfig.portNumber())
|
||||
|
||||
Reference in New Issue
Block a user