@tachybase/plugin-auth-wechat 1.5.1 → 1.6.1

package/dist/externalVersion.js

@@ -1,12 +1,12 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "1.5.1",
-  "@ant-design/icons": "5.6.1",
+  "@tachybase/client": "1.6.1",
+  "@ant-design/icons": "6.1.0",
   "antd": "5.22.5",
-  "@tachybase/module-auth": "1.5.1",
-  "@tachybase/schema": "1.3.52",
+  "@tachybase/module-auth": "1.6.1",
+  "@tachybase/schema": "1.6.0-alpha.9",
   "react-router-dom": "6.28.1",
   "react-i18next": "16.2.1",
-  "@tego/server": "1.3.52",
+  "@tego/server": "1.6.0-alpha.9",
   "dayjs": "1.11.13"
 };

package/dist/server/actions/get-auth-cfg.js

@@ -26,7 +26,7 @@ const getAuthCfg = async (ctx, next) => {
   const { redirect, bind } = ctx.action.params.values;
   if (bind) {
     const { authenticator } = ctx.action.params.values;
-    const app = ctx.app;
+    const app = ctx.tego;
     const options = await app.authManager.getOptions(authenticator);
     ctx.body = getBindAuthCfg(ctx, redirect, (_a = options == null ? void 0 : options.wechatAuth) == null ? void 0 : _a.AppID);
   } else {
@@ -40,7 +40,7 @@ const getBindAuthCfg = (ctx, redirect, appID) => {
   if (!userId) {
     ctx.throw(400, "Bind user failed: no user found");
   }
-  const app = ctx.app.name;
+  const app = ctx.tego.name;
   const referer = ctx.req.headers["referer"];
   let redirectUrl;
   if (referer) {
@@ -50,7 +50,7 @@ const getBindAuthCfg = (ctx, redirect, appID) => {
     redirectUrl = `${ctx.protocol}://${ctx.host}${process.env.API_BASE_PATH}wechatAuth:redirect`;
   }
   let state = `redirect=${redirect}&app=${app}&name=${ctx.headers["x-authenticator"]}`;
-  const token = ctx.app.authManager.jwt.sign({ userId: ctx.auth.user.id }, { expiresIn: `${import_constants.AUTH_TIMEOUT_MINUTE}m` });
+  const token = ctx.tego.authManager.jwt.sign({ userId: ctx.auth.user.id }, { expiresIn: `${import_constants.AUTH_TIMEOUT_MINUTE}m` });
   state += `&bindToken=${token}`;
   return {
     appId: appID,

package/dist/server/actions/redirect.js

@@ -47,18 +47,19 @@ 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);
   }
   const bindToken = search.get("bindToken");
   if (bindToken) {
     try {
-      const user = await ctx.app.authManager.jwt.decode(bindToken);
+      const user = await ctx.tego.authManager.jwt.decode(bindToken);
       if (!user) {
         ctx.throw(401, "Bind user failed: no user found");
       }
-      await auth.bindUser(user.userId);
+      const wechatAuth = await ctx.tego.authManager.get(authenticator, ctx);
+      await wechatAuth.bindUser(user.userId);
       ctx.redirect(`${prefix}${redirect2}`);
     } catch (error) {
       ctx.logger.error("WeChat auth error", { error });

package/dist/server/wechat-auth.js

@@ -118,7 +118,7 @@ class WeChatAuth extends import_server.BaseAuth {
   async getAuthCfg(redirect) {
     var _a, _b;
     const appID = (_b = (_a = this.options) == null ? void 0 : _a.wechatAuth) == null ? void 0 : _b.AppID;
-    const app = this.ctx.app.name;
+    const app = this.ctx.tego.name;
     const ctx = this.ctx;
     const referer = ctx.req.headers["referer"];
     let redirectUrl;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-auth-wechat",
   "displayName": "Auth: WeChat",
-  "version": "1.5.1",
+  "version": "1.6.1",
   "description": "WeChat authentication.",
   "keywords": [
     "Authentication"
@@ -10,16 +10,16 @@
   "main": "dist/server/index.js",
   "dependencies": {},
   "devDependencies": {
-    "@ant-design/icons": "^5.6.1",
-    "@tachybase/schema": "1.3.52",
-    "@tego/client": "1.3.52",
-    "@tego/server": "1.3.52",
+    "@ant-design/icons": "^6.1.0",
+    "@tachybase/schema": "1.6.0-alpha.9",
+    "@tego/client": "1.6.0-alpha.9",
+    "@tego/server": "1.6.0-alpha.9",
     "antd": "5.22.5",
     "dayjs": "1.11.13",
     "react-i18next": "16.2.1",
     "react-router-dom": "6.28.1",
-    "@tachybase/client": "1.5.1",
-    "@tachybase/module-auth": "1.5.1"
+    "@tachybase/client": "1.6.1",
+    "@tachybase/module-auth": "1.6.1"
   },
   "description.zh-CN": "通过微信扫码认证身份。",
   "displayName.zh-CN": "认证：微信",