@tachybase/plugin-auth-wecom 1.6.0 → 1.6.3

package/dist/externalVersion.js

@@ -1,10 +1,10 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "1.6.0",
-  "@ant-design/icons": "5.6.1",
+  "@tachybase/client": "1.6.3",
+  "@ant-design/icons": "6.1.0",
   "antd": "5.22.5",
   "react-router-dom": "6.28.1",
-  "@tachybase/module-auth": "1.6.0",
-  "@tego/server": "1.3.52",
+  "@tachybase/module-auth": "1.6.3",
+  "@tego/server": "1.6.1",
   "axios": "1.13.0"
 };

package/dist/server/actions/work.js

@@ -42,7 +42,7 @@ const redirect = async (ctx, next) => {
       prefix += `apps/${appName}`;
     }
   }
-  const auth = await ctx.app.authManager.get(authenticator, ctx);
+  const auth = await ctx.tego.authManager.get(authenticator, ctx);
   if (prefix.endsWith("/")) {
     prefix = prefix.slice(0, -1);
   }

package/dist/server/work-auth.js

@@ -30,7 +30,8 @@ class WorkAuth extends import_server.BaseAuth {
     const { ctx } = config;
     super({
       ...config,
-      userCollection: ctx.db.getCollection("users")
+      userCollection: ctx.db.getCollection("users"),
+      userStatusCollection: ctx.db.getCollection("userStatuses")
     });
   }
   async validate() {
@@ -84,7 +85,7 @@ class WorkAuth extends import_server.BaseAuth {
     var _a, _b, _c, _d;
     const clientId = (_b = (_a = this.options) == null ? void 0 : _a.workWeChat) == null ? void 0 : _b.corpId;
     const agentId = (_d = (_c = this.options) == null ? void 0 : _c.workWeChat) == null ? void 0 : _d.agentId;
-    const app = this.ctx.app.name;
+    const app = this.ctx.tego.name;
     const redirectUrl = encodeURIComponent(
       `${this.ctx.protocol}://${this.ctx.host}${process.env.API_BASE_PATH}workWeChat:redirect`
     );

package/dist/server/work-client.d.ts

@@ -1,3 +1,4 @@
+import { Context } from '@tego/server';
 interface Config {
     clientId: string;
     clientSecret: string;
@@ -5,9 +6,10 @@ interface Config {
 }
 export declare class WorkClient {
     config: Config;
-    ctx: any;
+    ctx: Context;
     accessToken: string;
     tokenExpiresAt: number;
+    private readonly weComApiBaseUrl;
     constructor(config: Config);
     private fetchNewAccessToken;
     getAccessToken(): Promise<string>;

package/dist/server/work-client.js

@@ -35,13 +35,14 @@ class WorkClient {
   constructor(config) {
     this.accessToken = "";
     this.tokenExpiresAt = 0;
+    this.weComApiBaseUrl = "https://qyapi.weixin.qq.com/cgi-bin/";
     this.config = config;
-    this.ctx = config == null ? void 0 : config.ctx;
+    this.ctx = config.ctx;
   }
   async fetchNewAccessToken() {
     try {
       const response = await import_axios.default.get(
-        `https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=${this.config.clientId}&corpsecret=${this.config.clientSecret}`
+        `${this.weComApiBaseUrl}gettoken?corpid=${this.config.clientId}&corpsecret=${this.config.clientSecret}`
       );
       const data = response.data;
       this.accessToken = data.access_token;
@@ -58,24 +59,24 @@ class WorkClient {
     return this.accessToken;
   }
   async getUserInfo(accessToken, code) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     try {
       const response = await import_axios.default.get(
-        `https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo?access_token=${accessToken}&code=${code}`
+        `${this.weComApiBaseUrl}user/getuserinfo?access_token=${accessToken}&code=${code}`
       );
       const userId = response.data.UserId;
       if (userId) {
         const userDetailResponse = await import_axios.default.post(
-          `https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token=${accessToken}&userid=${userId}`
+          `${this.weComApiBaseUrl}user/get?access_token=${accessToken}&userid=${userId}`
         );
         return userDetailResponse.data;
       } else {
-        (_a = this.ctx) == null ? void 0 : _a.log.debug(`get userInfo error message: ${response.data.errmsg}`);
+        this.ctx.logger.debug(`get userInfo error message: ${response.data.errmsg}`);
         return {};
       }
     } catch (err) {
-      if ((_c = (_b = err.response) == null ? void 0 : _b.data) == null ? void 0 : _c.errmsg) {
-        (_d = this.ctx) == null ? void 0 : _d.log.debug(`get userInfo error message: ${err.response.data.errmsg}`);
+      if ((_b = (_a = err.response) == null ? void 0 : _a.data) == null ? void 0 : _b.errmsg) {
+        this.ctx.logger.debug(`get userInfo error message: ${err.response.data.errmsg}`);
       }
       return {};
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-auth-wecom",
   "displayName": "Auth: WeCom",
-  "version": "1.6.0",
+  "version": "1.6.3",
   "description": "work WeChat authentication.",
   "keywords": [
     "Authentication"
@@ -9,16 +9,16 @@
   "main": "dist/server/index.js",
   "dependencies": {},
   "devDependencies": {
-    "@ant-design/icons": "^5.6.1",
-    "@tachybase/test": "1.3.52",
-    "@tego/client": "1.3.52",
-    "@tego/server": "1.3.52",
+    "@ant-design/icons": "^6.1.0",
+    "@tachybase/test": "1.6.1",
+    "@tego/client": "1.6.1",
+    "@tego/server": "1.6.1",
     "ahooks": "^3.9.0",
     "antd": "5.22.5",
     "axios": "1.13.0",
     "react-router-dom": "6.28.1",
-    "@tachybase/client": "1.6.0",
-    "@tachybase/module-auth": "1.6.0"
+    "@tachybase/client": "1.6.3",
+    "@tachybase/module-auth": "1.6.3"
   },
   "description.zh-CN": "提供企业微信的认证支持",
   "displayName.zh-CN": "认证：企业微信",