Skip to content

Commit 7f6fdaa

Browse files
committed
add accessToken into header
1 parent f548a69 commit 7f6fdaa

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

onebot/src/main/kotlin/cn/evolvefield/onebot/client/connection/ConnectFactory.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class ConnectFactory private constructor(
3434
@JvmOverloads
3535
fun createWebsocketClient(scope: CoroutineScope = CoroutineScope(CoroutineName("WSClient"))): WSClient? {
3636
val builder = StringBuilder()
37+
val header = mutableMapOf<String, String>()
3738
var ws: WSClient? = null
3839
if (config.miraiHttp) {
3940
builder.append(config.url)
@@ -49,11 +50,12 @@ class ConnectFactory private constructor(
4950
if (config.isAccessToken) {
5051
builder.append("?access_token=")
5152
builder.append(config.token)
53+
header["Authorization"] = "Bearer ${config.token}"
5254
}
5355
}
5456
val url = builder.toString()
5557
try {
56-
ws = WSClient.createAndConnect(scope, URI.create(url), logger, actionHandler)
58+
ws = WSClient.createAndConnect(scope, URI.create(url), logger, actionHandler, header)
5759
} catch (e: Exception) {
5860
logger.error("▌ {} 连接错误,请检查服务端是否开启 ┈━═☆", url)
5961
}
@@ -66,7 +68,6 @@ class ConnectFactory private constructor(
6668
*/
6769
@JvmOverloads
6870
suspend fun createWebsocketServerAndWaitConnect(scope: CoroutineScope = CoroutineScope(CoroutineName("WSServer"))): Pair<WSServer, Bot>? {
69-
val builder = StringBuilder()
7071
var pair: Pair<WSServer, Bot>? = null
7172
try {
7273
val address = InetSocketAddress(config.reversedPort)

onebot/src/main/kotlin/cn/evolvefield/onebot/client/connection/WSClient.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ class WSClient(
2727
private val scope: CoroutineScope,
2828
uri: URI,
2929
private val logger: Logger,
30-
private val actionHandler: ActionHandler
31-
) : WebSocketClient(uri) {
30+
private val actionHandler: ActionHandler,
31+
header: Map<String, String> = mapOf()
32+
) : WebSocketClient(uri, header) {
3233
private var eventBus: EventBus? = null
3334
fun createBot(): Bot {
3435
return Bot(this, actionHandler)
@@ -79,8 +80,8 @@ class WSClient(
7980
private const val HEART_BEAT = "heartbeat"
8081

8182
val mutex = Mutex()
82-
fun createAndConnect(scope: CoroutineScope, uri: URI, logger: Logger, actionHandler: ActionHandler): WSClient? {
83-
val ws = WSClient(scope, uri, logger, actionHandler)
83+
fun createAndConnect(scope: CoroutineScope, uri: URI, logger: Logger, actionHandler: ActionHandler, header: Map<String, String> = mapOf()): WSClient? {
84+
val ws = WSClient(scope, uri, logger, actionHandler, header)
8485
return if (ws.connectBlocking()) ws else null
8586
}
8687
}

0 commit comments

Comments
 (0)