Shamrock: fix #159

This commit is contained in:
WhiteChi 2023-12-19 22:11:22 +08:00
parent 31936feb98
commit ccbfc9a1e1

View File

@ -6,6 +6,7 @@ import io.ktor.server.application.createApplicationPlugin
import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig
import moe.fuqiuluo.shamrock.tools.fetchOrNull import moe.fuqiuluo.shamrock.tools.fetchOrNull
import java.net.URLDecoder import java.net.URLDecoder
import java.nio.charset.Charset
private suspend fun ApplicationCall.checkToken() { private suspend fun ApplicationCall.checkToken() {
val token = ShamrockConfig.getToken() val token = ShamrockConfig.getToken()
@ -14,10 +15,10 @@ private suspend fun ApplicationCall.checkToken() {
} }
var accessToken = request.headers["Authorization"] var accessToken = request.headers["Authorization"]
?: fetchOrNull("ticket")?.let { ?: fetchOrNull("ticket")?.let {
URLDecoder.decode(it, "UTF-8") URLDecoder.decode(it)
} }
?: fetchOrNull("access_token")?.let { ?: fetchOrNull("access_token")?.let {
URLDecoder.decode(it, "UTF-8") URLDecoder.decode(it)
} }
?: throw ErrorTokenException ?: throw ErrorTokenException
if (accessToken.startsWith("Bearer ", ignoreCase = true)) { if (accessToken.startsWith("Bearer ", ignoreCase = true)) {