@tachybase/plugin-auth-main-app 1.3.18 → 1.3.20

package/dist/externalVersion.js

@@ -1,11 +1,8 @@
 module.exports = {
-  "@tachybase/client": "1.3.20",
-  "@tachybase/module-auth": "1.3.20",
+  "@tachybase/client": "1.3.22",
+  "@tachybase/module-auth": "1.3.22",
   "react": "18.3.1",
-  "@tachybase/schema": "1.3.20",
+  "@tachybase/schema": "1.3.39",
   "antd": "5.22.5",
-  "@tachybase/server": "1.3.20",
-  "@tachybase/actions": "1.3.20",
-  "@tachybase/utils": "1.3.20",
-  "@tachybase/database": "1.3.20"
+  "@tego/server": "1.3.39"
 };

package/dist/server/actions/authMainApp.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@tachybase/actions';
+import { Context } from '@tego/server';
 export declare class AuthMainAppController {
     getMainUser(ctx: Context, next: () => Promise<any>): Promise<any>;
     get(ctx: Context, next: () => Promise<any>): Promise<any>;

package/dist/server/actions/authMainApp.js

@@ -65,11 +65,10 @@ __export(authMainApp_exports, {
   AuthMainAppController: () => AuthMainAppController
 });
 module.exports = __toCommonJS(authMainApp_exports);
-var import_server = require("@tachybase/server");
-var import_utils = require("@tachybase/utils");
+var import_server = require("@tego/server");
 var import_constants = require("../../constants");
 var _set_dec, _get_dec, _getMainUser_dec, _AuthMainAppController_decorators, _init;
-_AuthMainAppController_decorators = [(0, import_utils.Controller)("authMainAppConfig")], _getMainUser_dec = [(0, import_utils.Action)("getMainUser", { acl: "public" })], _get_dec = [(0, import_utils.Action)("get", { acl: "public" })], _set_dec = [(0, import_utils.Action)("set", { acl: "public" })];
+_AuthMainAppController_decorators = [(0, import_server.Controller)("authMainAppConfig")], _getMainUser_dec = [(0, import_server.Action)("getMainUser", { acl: "public" })], _get_dec = [(0, import_server.Action)("get", { acl: "public" })], _set_dec = [(0, import_server.Action)("set", { acl: "public" })];
 class AuthMainAppController {
   constructor() {
     __runInitializers(_init, 5, this);
@@ -91,8 +90,7 @@ class AuthMainAppController {
     const multiAppRepo = mainApp.db.getRepository("applications");
     const multiApp = await multiAppRepo.findOne({
       filter: {
-        name: ctx.app.name,
-        createdById: user.userId
+        $and: [{ name: ctx.app.name }, { $or: [{ createdById: user.userId }, { partners: { id: user.userId } }] }]
       }
     });
     if (!multiApp) {

package/dist/server/collections/authMainAppConfig.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("@tachybase/database").CollectionOptions;
+declare const _default: import("@tego/server").CollectionOptions;
 export default _default;

package/dist/server/collections/authMainAppConfig.js

@@ -20,9 +20,9 @@ __export(authMainAppConfig_exports, {
   default: () => authMainAppConfig_default
 });
 module.exports = __toCommonJS(authMainAppConfig_exports);
-var import_database = require("@tachybase/database");
+var import_server = require("@tego/server");
 var import_constants = require("../../constants");
-var authMainAppConfig_default = (0, import_database.defineCollection)({
+var authMainAppConfig_default = (0, import_server.defineCollection)({
   dumpRules: "required",
   name: import_constants.COLLECTION_AUTH_MAIN_APP_CONFIG,
   updatedAt: true,

package/dist/server/plugin.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from '@tachybase/server';
+import { Plugin } from '@tego/server';
 export declare class PluginAuthMainAppServer extends Plugin {
     afterAdd(): Promise<void>;
     beforeLoad(): Promise<void>;

package/dist/server/plugin.js

@@ -66,7 +66,7 @@ __export(plugin_exports, {
   default: () => plugin_default
 });
 module.exports = __toCommonJS(plugin_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 var import_authMainApp = require("./actions/authMainApp");
 var import_authMainAppService = require("./service/authMainAppService");
 var _PluginAuthMainAppServer_decorators, _init, _a;

package/dist/server/service/authMainAppService.d.ts

@@ -1,5 +1,4 @@
-import Database from '@tachybase/database';
-import { Application } from '@tachybase/server';
+import { Application, Database } from '@tego/server';
 export declare class AuthMainAppService {
     db: Database;
     app: Application;

package/dist/server/service/authMainAppService.js

@@ -65,10 +65,10 @@ __export(authMainAppService_exports, {
   AuthMainAppService: () => AuthMainAppService
 });
 module.exports = __toCommonJS(authMainAppService_exports);
-var import_utils = require("@tachybase/utils");
+var import_server = require("@tego/server");
 var import_constants = require("../../constants");
 var _logger_dec, _app_dec, _db_dec, _AuthMainAppService_decorators, _init;
-_AuthMainAppService_decorators = [(0, import_utils.Service)()], _db_dec = [(0, import_utils.Db)()], _app_dec = [(0, import_utils.App)()], _logger_dec = [(0, import_utils.InjectLog)()];
+_AuthMainAppService_decorators = [(0, import_server.Service)()], _db_dec = [(0, import_server.Db)()], _app_dec = [(0, import_server.App)()], _logger_dec = [(0, import_server.InjectLog)()];
 class AuthMainAppService {
   constructor() {
     this.db = __runInitializers(_init, 8, this), __runInitializers(_init, 11, this);

package/package.json

@@ -1,25 +1,20 @@
 {
   "name": "@tachybase/plugin-auth-main-app",
   "displayName": "Single Sign-On on multi app (SSO)",
-  "version": "1.3.18",
+  "version": "1.3.20",
   "description": "Users log in via the main application; sub-applications can disable their standalone login.",
   "keywords": [
     "Authentication"
   ],
   "main": "dist/server/index.js",
   "devDependencies": {
-    "antd": "5.22.5"
-  },
-  "peerDependencies": {
-    "@tachybase/auth": "1.3.20",
-    "@tachybase/actions": "1.3.20",
-    "@tachybase/database": "1.3.20",
-    "@tachybase/client": "1.3.20",
-    "@tachybase/module-auth": "1.3.20",
-    "@tachybase/schema": "1.3.20",
-    "@tachybase/server": "1.3.20",
-    "@tachybase/test": "1.3.20",
-    "@tachybase/utils": "1.3.20"
+    "@tachybase/schema": "^1.3.39",
+    "@tachybase/test": "^1.3.39",
+    "@tego/client": "^1.3.39",
+    "@tego/server": "^1.3.39",
+    "antd": "5.22.5",
+    "@tachybase/client": "1.3.22",
+    "@tachybase/module-auth": "1.3.22"
   },
   "description.zh-CN": "通过主应用登录子应用,子应用可关闭登录",
   "displayName.zh-CN": "多应用统一登录"