@tachybase/plugin-auth-main-app 1.6.6 → 1.6.8-alpha.1

package/dist/externalVersion.js

@@ -1,8 +1,8 @@
 module.exports = {
-  "@tachybase/client": "1.6.6",
-  "@tachybase/module-auth": "1.6.6",
+  "@tachybase/client": "1.6.8-alpha.1",
+  "@tachybase/module-auth": "1.6.8-alpha.1",
   "react": "18.3.1",
-  "@tachybase/schema": "1.6.2",
+  "@tachybase/schema": "1.6.3",
   "antd": "5.22.5",
-  "@tego/server": "1.6.2"
+  "@tego/server": "1.6.3"
 };

package/dist/server/plugin.js

@@ -71,8 +71,7 @@ var import_authMainApp = require("./actions/authMainApp");
 var import_authMainAppService = require("./service/authMainAppService");
 var _PluginAuthMainAppServer_decorators, _init, _a;
 _PluginAuthMainAppServer_decorators = [(0, import_server.InjectedPlugin)({
-  Controllers: [import_authMainApp.AuthMainAppController],
-  Services: [import_authMainAppService.AuthMainAppService]
+  Controllers: [import_authMainApp.AuthMainAppController]
 })];
 class PluginAuthMainAppServer extends (_a = import_server.Plugin) {
   async afterAdd() {
@@ -80,6 +79,8 @@ class PluginAuthMainAppServer extends (_a = import_server.Plugin) {
   async beforeLoad() {
   }
   async load() {
+    const authMainAppService = new import_authMainAppService.AuthMainAppService(this.app);
+    await authMainAppService.load();
   }
   async install() {
   }

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

@@ -1,10 +1,17 @@
-import { Application, Database } from '@tego/server';
+import { Application } from '@tego/server';
+/**
+ * 主应用登录配置管理器
+ *
+ * 注意: 不使用 @Service() + @App() 装饰器, 因为全局 DI Container 在多子应用并发启动时
+ * 存在竞态条件, 会导致 @App() 注入错误的 Application 实例.
+ * 改为由 Plugin 传入正确的 app/db 引用.
+ */
 export declare class AuthMainAppService {
-    db: Database;
-    app: Application;
-    private logger;
+    private db;
+    private app;
     private selfSignIn;
     private authMainApp;
+    constructor(app: Application);
     load(): Promise<void>;
     checkInstall(): Promise<void>;
     addMiddleWare(): void;

package/dist/server/service/authMainAppService.js

@@ -1,14 +1,7 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -22,63 +15,19 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __decoratorStart = (base) => [, , , __create((base == null ? void 0 : base[__knownSymbol("metadata")]) ?? null)];
-var __decoratorStrings = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
-var __expectFn = (fn) => fn !== void 0 && typeof fn !== "function" ? __typeError("Function expected") : fn;
-var __decoratorContext = (kind, name, done, metadata, fns) => ({ kind: __decoratorStrings[kind], name, metadata, addInitializer: (fn) => done._ ? __typeError("Already initialized") : fns.push(__expectFn(fn || null)) });
-var __decoratorMetadata = (array, target) => __defNormalProp(target, __knownSymbol("metadata"), array[3]);
-var __runInitializers = (array, flags, self, value) => {
-  for (var i = 0, fns = array[flags >> 1], n = fns && fns.length; i < n; i++) flags & 1 ? fns[i].call(self) : value = fns[i].call(self, value);
-  return value;
-};
-var __decorateElement = (array, flags, name, decorators, target, extra) => {
-  var fn, it, done, ctx, access, k = flags & 7, s = !!(flags & 8), p = !!(flags & 16);
-  var j = k > 3 ? array.length + 1 : k ? s ? 1 : 2 : 0, key = __decoratorStrings[k + 5];
-  var initializers = k > 3 && (array[j - 1] = []), extraInitializers = array[j] || (array[j] = []);
-  var desc = k && (!p && !s && (target = target.prototype), k < 5 && (k > 3 || !p) && __getOwnPropDesc(k < 4 ? target : { get [name]() {
-    return __privateGet(this, extra);
-  }, set [name](x) {
-    return __privateSet(this, extra, x);
-  } }, name));
-  k ? p && k < 4 && __name(extra, (k > 2 ? "set " : k > 1 ? "get " : "") + name) : __name(target, name);
-  for (var i = decorators.length - 1; i >= 0; i--) {
-    ctx = __decoratorContext(k, name, done = {}, array[3], extraInitializers);
-    if (k) {
-      ctx.static = s, ctx.private = p, access = ctx.access = { has: p ? (x) => __privateIn(target, x) : (x) => name in x };
-      if (k ^ 3) access.get = p ? (x) => (k ^ 1 ? __privateGet : __privateMethod)(x, target, k ^ 4 ? extra : desc.get) : (x) => x[name];
-      if (k > 2) access.set = p ? (x, y) => __privateSet(x, target, y, k ^ 4 ? extra : desc.set) : (x, y) => x[name] = y;
-    }
-    it = (0, decorators[i])(k ? k < 4 ? p ? extra : desc[key] : k > 4 ? void 0 : { get: desc.get, set: desc.set } : target, ctx), done._ = 1;
-    if (k ^ 4 || it === void 0) __expectFn(it) && (k > 4 ? initializers.unshift(it) : k ? p ? extra = it : desc[key] = it : target = it);
-    else if (typeof it !== "object" || it === null) __typeError("Object expected");
-    else __expectFn(fn = it.get) && (desc.get = fn), __expectFn(fn = it.set) && (desc.set = fn), __expectFn(fn = it.init) && initializers.unshift(fn);
-  }
-  return k || __decoratorMetadata(array, target), desc && __defProp(target, name, desc), p ? k ^ 4 ? extra : desc : target;
-};
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateIn = (member, obj) => Object(obj) !== obj ? __typeError('Cannot use the "in" operator on this value') : member.has(obj);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 var authMainAppService_exports = {};
 __export(authMainAppService_exports, {
   AuthMainAppService: () => AuthMainAppService
 });
 module.exports = __toCommonJS(authMainAppService_exports);
-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_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);
-    this.app = __runInitializers(_init, 12, this), __runInitializers(_init, 15, this);
-    this.logger = __runInitializers(_init, 16, this), __runInitializers(_init, 19, this);
+  constructor(app) {
     this.selfSignIn = true;
-    //子应用本身登录
     this.authMainApp = true;
+    this.app = app;
+    this.db = app.db;
   }
-  //通过主应用登录
   async load() {
     this.addMiddleWare();
     this.app.on("afterStart", async () => {
@@ -122,27 +71,25 @@ class AuthMainAppService {
             ctx.body = [];
           }
           if (this.authMainApp) {
-            ctx.body.unshift({
-              name: ctx.t("Main app signIn", { ns: import_constants.NAMESPACE }),
-              authType: "mainApp",
-              authTypeTitle: "main app"
-            });
+            const alreadyHasMainApp = Array.isArray(ctx.body) && ctx.body.some((item) => item.authType === "mainApp");
+            if (!alreadyHasMainApp) {
+              ctx.body.unshift({
+                name: ctx.t("Main app signIn", { ns: import_constants.NAMESPACE }),
+                authType: "mainApp",
+                authTypeTitle: "main app"
+              });
+            }
           }
         }
       },
       {
         tag: "forbidSignIn",
-        after: "acl"
+        after: "acl",
+        unique: true
       }
     );
   }
 }
-_init = __decoratorStart(null);
-__decorateElement(_init, 5, "db", _db_dec, AuthMainAppService);
-__decorateElement(_init, 5, "app", _app_dec, AuthMainAppService);
-__decorateElement(_init, 5, "logger", _logger_dec, AuthMainAppService);
-AuthMainAppService = __decorateElement(_init, 0, "AuthMainAppService", _AuthMainAppService_decorators, AuthMainAppService);
-__runInitializers(_init, 1, AuthMainAppService);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AuthMainAppService

package/package.json

@@ -1,20 +1,29 @@
 {
   "name": "@tachybase/plugin-auth-main-app",
   "displayName": "Single Sign-On on multi app (SSO)",
-  "version": "1.6.6",
+  "version": "1.6.8-alpha.1",
   "description": "Users log in via the main application; sub-applications can disable their standalone login.",
   "keywords": [
     "Authentication"
   ],
+  "homepage": "https://github.com/tegojs/tego-standard#readme",
+  "bugs": {
+    "url": "https://github.com/tegojs/tego-standard/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tegojs/tego-standard",
+    "directory": "packages/plugin-auth-main-app"
+  },
   "main": "dist/server/index.js",
   "devDependencies": {
-    "@tachybase/schema": "1.6.2",
-    "@tachybase/test": "1.6.2",
-    "@tego/client": "1.6.2",
-    "@tego/server": "1.6.2",
+    "@tachybase/schema": "1.6.3",
+    "@tachybase/test": "1.6.3",
+    "@tego/client": "1.6.3",
+    "@tego/server": "1.6.3",
     "antd": "5.22.5",
-    "@tachybase/module-auth": "1.6.6",
-    "@tachybase/client": "1.6.6"
+    "@tachybase/client": "1.6.8-alpha.1",
+    "@tachybase/module-auth": "1.6.8-alpha.1"
   },
   "description.zh-CN": "通过主应用登录子应用,子应用可关闭登录",
   "displayName.zh-CN": "多应用统一登录"