@tachybase/plugin-auth-cas 1.6.0 → 1.6.3

package/README.md

@@ -7,6 +7,5 @@
 > 首先你要开启此插件
 
 1. 在 Authentication 中添加一个 Auth Type 为 CAS 类型的登录方式
-<img src="https://github.com/tachybase/tachybase/assets/29533304/a9dd6965-afce-4ff3-85d8-ff0c1baa7298">
 2. 然后你将在登录页看到一个名为 CAS Login 的按钮
 3. 完成

package/README.zh-CN.md

@@ -7,6 +7,5 @@
 > 首先你要开启此插件
 
 1. 在 Authentication 中添加一个 Auth Type 为 CAS 类型的登录方式
-<img src="https://github.com/tachybase/tachybase/assets/29533304/a9dd6965-afce-4ff3-85d8-ff0c1baa7298">
 2. 然后你将在登录页看到一个名为 CAS Login 的按钮
 3. 完成

package/dist/externalVersion.js

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

package/dist/server/actions/login.js

@@ -22,9 +22,9 @@ __export(login_exports, {
 module.exports = __toCommonJS(login_exports);
 const login = async (ctx, next) => {
   const { authenticator, redirect = "/admin" } = ctx.action.params;
-  const auth = await ctx.app.authManager.get(authenticator, ctx);
+  const auth = await ctx.tego.authManager.get(authenticator, ctx);
   const { casUrl } = auth.getOptions();
-  const service = auth.getService(authenticator, ctx.app.name, redirect);
+  const service = auth.getService(authenticator, ctx.tego.name, redirect);
   ctx.redirect(`${casUrl}/login?service=${service}`);
   next();
 };

package/dist/server/actions/service.js

@@ -30,7 +30,7 @@ const service = 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/auth.js

@@ -37,7 +37,8 @@ class CASAuth extends import_server.BaseAuth {
     const { ctx } = config;
     super({
       ...config,
-      userCollection: ctx.db.getCollection("users")
+      userCollection: ctx.db.getCollection("users"),
+      userStatusCollection: ctx.db.getCollection("userStatuses")
     });
   }
   getOptions() {

package/dist/server/plugin.js

@@ -35,7 +35,7 @@ class CasPlugin extends import_server.Plugin {
     this.app.authManager.registerTypes(import_constants.authType, {
       auth: import_auth.CASAuth
     });
-    this.app.resource({
+    this.app.resourcer.define({
       name: "cas",
       actions: {
         service: import_service.service,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-auth-cas",
   "displayName": "Auth: CAS",
-  "version": "1.6.0",
+  "version": "1.6.3",
   "description": "CAS authentication.",
   "keywords": [
     "Authentication"
@@ -10,16 +10,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",
     "antd": "5.22.5",
     "axios": "1.13.0",
     "react-i18next": "16.2.1",
     "react-router-dom": "6.28.1",
-    "@tachybase/client": "1.6.0",
-    "@tachybase/module-auth": "1.6.0"
+    "@tachybase/module-auth": "1.6.3",
+    "@tachybase/client": "1.6.3"
   },
   "description.zh-CN": "通过 CAS 协议认证身份。",
   "displayName.zh-CN": "认证：CAS",

package/src/server/actions/login.ts

@@ -4,9 +4,9 @@ import { CASAuth } from '../auth';
 
 export const login = async (ctx: Context, next: Next) => {
   const { authenticator, redirect = '/admin' } = ctx.action.params;
-  const auth = (await ctx.app.authManager.get(authenticator, ctx)) as CASAuth;
+  const auth = (await ctx.tego.authManager.get(authenticator, ctx)) as CASAuth;
   const { casUrl } = auth.getOptions();
-  const service = auth.getService(authenticator, ctx.app.name, redirect);
+  const service = auth.getService(authenticator, ctx.tego.name, redirect);
   ctx.redirect(`${casUrl}/login?service=${service}`);
   next();
 };

package/src/server/actions/service.ts

@@ -13,7 +13,7 @@ export const service = async (ctx: Context, next: Next) => {
     }
   }
 
-  const auth = (await ctx.app.authManager.get(authenticator, ctx)) as CASAuth;
+  const auth = (await ctx.tego.authManager.get(authenticator, ctx)) as CASAuth;
 
   if (prefix.endsWith('/')) {
     prefix = prefix.slice(0, -1);

package/src/server/auth.ts

@@ -1,6 +1,6 @@
 import { AuthModel } from '@tachybase/module-auth';
-
 import { AuthConfig, BaseAuth, Model } from '@tego/server';
+
 import axios from 'axios';
 
 export class CASAuth extends BaseAuth {
@@ -9,6 +9,7 @@ export class CASAuth extends BaseAuth {
     super({
       ...config,
       userCollection: ctx.db.getCollection('users'),
+      userStatusCollection: ctx.db.getCollection('userStatuses'),
     });
   }
 

package/src/server/plugin.ts

@@ -15,7 +15,7 @@ export class CasPlugin extends Plugin {
       auth: CASAuth,
     });
 
-    this.app.resource({
+    this.app.resourcer.define({
       name: 'cas',
       actions: {
         service,