chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt

@@ -46,7 +46,7 @@ object ChzzkHandler {
         UserService.getAllUsers().map {
             if(!it.isDisabled)
                 try {
-                    getChannel(it.token)?.let { token -> addUser(token, it) }
+                    Connector.getChannel(it.token)?.let { token -> addUser(token, it) }
                 } catch(e: Exception) {
                     logger.info("Exception: ${it.token}(${it.username}) not found. ${e.stackTraceToString()}")
                 }
@@ -223,7 +223,7 @@ class UserHandler(
             throw RuntimeException("AccessToken or RefreshToken is not valid.")
         }
         try {
-            val tokens = user.refreshToken?.let { token -> Connector.client.refreshAccessToken(token)}
+            val tokens = user.refreshToken?.let { token -> Connector.client.refreshAccessToken(token) }
             if(tokens == null) {
                 throw RuntimeException("AccessToken is not valid.")
             }

chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/utils/accessTokenRefresh.kt

@@ -1,15 +1,27 @@
 package space.mori.chzzk_bot.chatbot.utils
 
-import com.google.gson.reflect.TypeToken
+import com.google.gson.Gson
+import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import space.mori.chzzk_bot.chatbot.chzzk.dotenv
-import space.mori.chzzk_bot.common.utils.IData
 import space.mori.chzzk_bot.common.utils.client
 import xyz.r2turntrue.chzzk4j.ChzzkClient
 import java.io.IOException
 
+val client = OkHttpClient.Builder()
+    .addNetworkInterceptor { chain ->
+        chain.proceed(
+            chain.request()
+                .newBuilder()
+                .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36")
+                .build()
+        )
+    }
+    .build()
+val gson = Gson()
 
 data class RefreshTokenResponse(
     val accessToken: String,
@@ -36,9 +48,9 @@ fun ChzzkClient.refreshAccessToken(refreshToken: String): Pair<String, String> {
         try {
             if(!response.isSuccessful) throw IOException("Unexpected code ${response.code}")
             val body = response.body?.string()
-            val data = gson.fromJson(body, object: TypeToken<IData<RefreshTokenResponse>>() {})
+            val data = gson.fromJson(body, RefreshTokenResponse::class.java)
 
-            return Pair(data.content.accessToken, data.content.refreshToken)
+            return Pair(data.accessToken, data.refreshToken)
         } catch(e: Exception) {
             throw e
         }

webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt

@@ -228,7 +228,8 @@ val server = embeddedServer(Netty, port = 8080, ) {
             // common: logout
             get("/logout") {
                 call.sessions.clear<UserSession>()
-                call.respondRedirect(getFrontendURL(""))
+                call.response.status(HttpStatusCode.OK)
+                return@get
             }
         }