@tachybase/plugin-auth-main-app 1.3.22 → 1.4.0

package/dist/externalVersion.js

@@ -1,8 +1,8 @@
 module.exports = {
-  "@tachybase/client": "1.3.24",
-  "@tachybase/module-auth": "1.3.24",
+  "@tachybase/client": "1.4.0",
+  "@tachybase/module-auth": "1.4.0",
   "react": "18.3.1",
-  "@tachybase/schema": "1.3.49",
+  "@tachybase/schema": "1.3.52",
   "antd": "5.22.5",
-  "@tego/server": "1.3.49"
+  "@tego/server": "1.3.52"
 };

package/dist/locale/zh-CN.json

@@ -3,11 +3,14 @@
   "Auth by main app": "通过主应用登录",
   "Can not manage this sub app!": "没有权限管理此应用",
   "Enable Single Sign-On (SSO)": "允许统一登录(SSO)",
+  "Failed to create or find current user": "创建或查找当前用户失败",
   "Failed to fetch authentication information. Please try again.": "获取认证信息失败。请再试一次。",
+  "Invalid token or user not found": "无效的令牌或用户未找到",
   "It is impossible to delete all login verification methods.": "无法删除所有登录验证方式",
   "Main app signIn": "主应用登录",
   "Please log in to the main application first": "请先登录主应用",
   "Single Sign-On (SSO) between applications": "跨应用的单点登录（SSO）",
+  "The user only has a username. Please enter the application to complete the password and other information.": "该用户只有用户名，请进入应用完善密码和其他信息",
   "Unable to disable all authenticators in the main application.": "无法在主应用禁用所有认证器",
   "Unable to manage this application, please exit the main application and change to a new account": "无法管理此应用,请在主应用退出换一个账号"
 }

package/dist/server/actions/authMainApp.js

@@ -87,6 +87,9 @@ class AuthMainAppController {
     } catch (err) {
       ctx.throw(401, ctx.t("Please log in to the main application first", { ns: import_constants.NAMESPACE }));
     }
+    if (!user || !user.userId) {
+      ctx.throw(401, ctx.t("Invalid token or user not found", { ns: import_constants.NAMESPACE }));
+    }
     const multiAppRepo = mainApp.db.getRepository("applications");
     const multiApp = await multiAppRepo.findOne({
       filter: {
@@ -101,17 +104,43 @@ class AuthMainAppController {
         })
       );
     }
+    const mainUserRepo = mainApp.db.getRepository("users");
+    const userInfo = await mainUserRepo.findOne({
+      fields: ["username", "nickname", "phone"],
+      filter: {
+        id: user.userId
+      },
+      raw: true
+    });
     const repo = ctx.db.getRepository("users");
-    const root = await repo.findOne({
+    let currentUser;
+    if (!userInfo) {
+      ctx.throw(403, ctx.t("User info not found in main application", { ns: import_constants.NAMESPACE }));
+    }
+    currentUser = await repo.findOne({
       filter: {
-        specialRole: "root"
+        $or: [
+          ...userInfo.username ? [{ username: userInfo.username }] : [],
+          ...userInfo.phone ? [{ phone: userInfo.phone }] : []
+        ]
       }
     });
-    const tokenInfo = await mainApp.authManager.tokenController.add({ userId: root.id });
+    if (!currentUser) {
+      const newUserData = {};
+      if (userInfo.username) newUserData.username = userInfo.username;
+      if (userInfo.nickname) newUserData.nickname = userInfo.nickname;
+      if (userInfo.phone) newUserData.phone = userInfo.phone;
+      currentUser = await repo.create({ values: newUserData });
+    }
+    if (!currentUser) {
+      ctx.throw(500, ctx.t("Failed to create or find current user", { ns: import_constants.NAMESPACE }));
+    }
+    const currentUserData = currentUser == null ? void 0 : currentUser.dataValues;
+    const tokenInfo = await mainApp.authManager.tokenController.add({ userId: currentUserData.id });
     const expiresIn = Math.floor((await mainApp.authManager.tokenController.getConfig()).tokenExpirationTime / 1e3);
     const newToken = ctx.app.authManager.jwt.sign(
       {
-        userId: root.id,
+        userId: currentUserData.id,
         temp: true,
         iat: Math.floor(tokenInfo.issuedTime / 1e3),
         signInTime: tokenInfo.signInTime
@@ -121,18 +150,15 @@ class AuthMainAppController {
         expiresIn
       }
     );
-    const mainUserRepo = mainApp.db.getRepository("users");
-    const userInfo = await mainUserRepo.findOne({
-      fields: ["username", "nickname", "phone"],
-      filter: {
-        id: user.userId
-      },
-      raw: true
-    });
     ctx.body = {
       ...userInfo,
       token: newToken
     };
+    if (userInfo.username && !userInfo.phone) {
+      console.log(
+        "The user only has a username. Please enter the application to complete the password and other information."
+      );
+    }
     return next();
   }
   async get(ctx, next) {

package/package.json

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