fix(wechat): fix unparsed body for xml

satorijs · Jan 22, 2025 · 5b21e61 · 5b21e61
1 parent d93003a
commit 5b21e61
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/adapters/wechat-official/package.json b/adapters/wechat-official/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-wechat-official",
   "description": "Wechat Official Adapter for Satorijs",
-  "version": "2.4.2",
+  "version": "2.5.0",
   "type": "module",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",

diff --git a/adapters/wechat-official/src/http.ts b/adapters/wechat-official/src/http.ts
@@ -32,13 +32,15 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, WechatOf
 
     bot.ctx.server.post('/wechat-official', async (ctx) => {
       const { timestamp, nonce, msg_signature } = ctx.request.query
+      bot.logger.debug('%c', ctx.request.body)
       let { xml: data }: {
         xml: Message
-      } = await xml2js.parseStringPromise(ctx.request.body[Symbol.for('unparsedBody')], {
+      } = await xml2js.parseStringPromise(ctx.request.body, {
         explicitArray: false,
       })
       const botId = data.ToUserName
       const localBot = this.bots.find((bot) => bot.selfId === botId)
+      if (!localBot) return ctx.status = 403
 
       if (data.Encrypt) {
         const localSign = getSignature(localBot.config.token, timestamp?.toString(), nonce?.toString(), data.Encrypt)
@@ -52,8 +54,6 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, WechatOf
         data = data2
       }
 
-      bot.logger.debug('%c', ctx.request.body[Symbol.for('unparsedBody')])
-
       const session = await decodeMessage(localBot, data)
 
       let resolveFunction: (text: string) => void

diff --git a/adapters/wecom/package.json b/adapters/wecom/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-wecom",
   "description": "Wecom Adapter for Satorijs",
-  "version": "2.4.3-alpha.0",
+  "version": "2.5.0",
   "type": "module",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",

diff --git a/adapters/wecom/src/http.ts b/adapters/wecom/src/http.ts
@@ -32,13 +32,15 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, WecomBot
 
     bot.ctx.server.post('/wecom', async (ctx) => {
       const { timestamp, nonce, msg_signature } = ctx.request.query
+      bot.logger.debug(ctx.request.body)
       let { xml: data }: {
         xml: Message
-      } = await xml2js.parseStringPromise(ctx.request.body[Symbol.for('unparsedBody')], {
+      } = await xml2js.parseStringPromise(ctx.request.body, {
         explicitArray: false,
       })
       const botId = data.AgentID
       const localBot = this.bots.find((bot) => bot.selfId === botId)
+      if (!localBot) return ctx.status = 403
 
       if (data.Encrypt) {
         const localSign = getSignature(localBot.config.token, timestamp?.toString(), nonce?.toString(), data.Encrypt)
@@ -52,8 +54,6 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, WecomBot
         data = data2
       }
 
-      bot.logger.debug('%c', ctx.request.body[Symbol.for('unparsedBody')])
-
       const session = await decodeMessage(localBot, data)
       if (session) {
         localBot.dispatch(session)