From 2469bfb8e4e4f106df0541c031fdf1c027f2527b Mon Sep 17 00:00:00 2001 From: valign Date: Fri, 5 Jul 2024 06:40:09 +0000 Subject: [PATCH 01/20] =?UTF-8?q?feat(mis):=20=E7=94=A8=E6=88=B7=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E4=BD=95?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81=E5=A4=87=E6=B3=A8,?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=8A=B6=E6=80=81=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/entities/Account.ts | 1 + apps/mis-server/src/entities/User.ts | 15 +++++++++ .../src/migrations/.snapshot-scow_server.json | 31 +++++++++++++++++-- .../src/migrations/Migration20240705054221.ts | 17 ++++++++++ 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 apps/mis-server/src/migrations/Migration20240705054221.ts diff --git a/apps/mis-server/src/entities/Account.ts b/apps/mis-server/src/entities/Account.ts index 862a977aa5..dd5feafec9 100644 --- a/apps/mis-server/src/entities/Account.ts +++ b/apps/mis-server/src/entities/Account.ts @@ -25,6 +25,7 @@ export enum AccountState { NORMAL = "NORMAL", FROZEN = "FROZEN", BLOCKED_BY_ADMIN = "BLOCKED_BY_ADMIN", + DELETED = "DELETED", } @Entity() diff --git a/apps/mis-server/src/entities/User.ts b/apps/mis-server/src/entities/User.ts index c83f619f1b..19f55abf03 100644 --- a/apps/mis-server/src/entities/User.ts +++ b/apps/mis-server/src/entities/User.ts @@ -26,6 +26,11 @@ export enum TenantRole { TENANT_ADMIN = "TENANT_ADMIN", } +export enum UserState { + NORMAL = "NORMAL", + DELETED = "DELETED", +} + @Entity() export class User { @PrimaryKey() @@ -58,6 +63,12 @@ export class User { @Enum({ items: () => PlatformRole, array: true, comment: Object.values(PlatformRole).join(", ") }) platformRoles: PlatformRole[]; + @Enum({ items: () => UserState, default: UserState.NORMAL, comment: Object.values(UserState).join(", ") }) + state: UserState = UserState.NORMAL; + + @Property({ nullable: true }) + deleteRemark?: string; + constructor(init: { userId: string; tenant: EntityOrRef; @@ -66,6 +77,8 @@ export class User { createTime?: Date; tenantRoles?: TenantRole[]; platformRoles?: PlatformRole[]; + state?: UserState; + deleteRemark?: string; }) { this.userId = init.userId; this.tenant = toRef(init.tenant); @@ -74,6 +87,8 @@ export class User { this.createTime = init.createTime ?? new Date(); this.tenantRoles = init.tenantRoles ?? []; this.platformRoles = init.platformRoles ?? []; + this.state = init.state ?? UserState.NORMAL; + this.deleteRemark = init.deleteRemark ?? ""; } } diff --git a/apps/mis-server/src/migrations/.snapshot-scow_server.json b/apps/mis-server/src/migrations/.snapshot-scow_server.json index 34bb434d46..263aad0e74 100644 --- a/apps/mis-server/src/migrations/.snapshot-scow_server.json +++ b/apps/mis-server/src/migrations/.snapshot-scow_server.json @@ -1346,7 +1346,7 @@ }, "state": { "name": "state", - "type": "enum('NORMAL','FROZEN','BLOCKED_BY_ADMIN')", + "type": "enum('NORMAL','FROZEN','BLOCKED_BY_ADMIN','DELETED')", "unsigned": false, "autoincrement": false, "primary": false, @@ -1355,9 +1355,10 @@ "enumItems": [ "NORMAL", "FROZEN", - "BLOCKED_BY_ADMIN" + "BLOCKED_BY_ADMIN", + "DELETED" ], - "comment": "NORMAL, FROZEN, BLOCKED_BY_ADMIN", + "comment": "NORMAL, FROZEN, BLOCKED_BY_ADMIN, DELETED", "mappedType": "enum" }, "create_time": { @@ -1529,6 +1530,30 @@ ], "comment": "PLATFORM_FINANCE, PLATFORM_ADMIN", "mappedType": "text" + }, + "state": { + "name": "state", + "type": "enum('NORMAL','DELETED')", + "unsigned": false, + "autoincrement": false, + "primary": false, + "nullable": false, + "default": "'NORMAL'", + "enumItems": [ + "NORMAL", + "DELETED" + ], + "comment": "NORMAL, DELETED", + "mappedType": "enum" + }, + "delete_remark": { + "name": "delete_remark", + "type": "varchar(255)", + "unsigned": false, + "autoincrement": false, + "primary": false, + "nullable": true, + "mappedType": "string" } }, "name": "user", diff --git a/apps/mis-server/src/migrations/Migration20240705054221.ts b/apps/mis-server/src/migrations/Migration20240705054221.ts new file mode 100644 index 0000000000..87fa90ca22 --- /dev/null +++ b/apps/mis-server/src/migrations/Migration20240705054221.ts @@ -0,0 +1,17 @@ +import { Migration } from '@mikro-orm/migrations'; + +export class Migration20240705054221 extends Migration { + + async up(): Promise { + this.addSql('alter table `account` modify `state` enum(\'NORMAL\', \'FROZEN\', \'BLOCKED_BY_ADMIN\', \'DELETED\') not null default \'NORMAL\' comment \'NORMAL, FROZEN, BLOCKED_BY_ADMIN, DELETED\';'); + + this.addSql('alter table `user` add `state` enum(\'NORMAL\', \'DELETED\') not null default \'NORMAL\' comment \'NORMAL, DELETED\', add `delete_remark` varchar(255) null;'); + } + + async down(): Promise { + this.addSql('alter table `account` modify `state` enum(\'NORMAL\', \'FROZEN\', \'BLOCKED_BY_ADMIN\') not null default \'NORMAL\' comment \'NORMAL, FROZEN, BLOCKED_BY_ADMIN\';'); + + this.addSql('alter table `user` drop column `state`, drop column `delete_remark`;'); + } + +} From a6a3605126b1ce8e34212cf0615783d0bb1a8669 Mon Sep 17 00:00:00 2001 From: valign Date: Tue, 9 Jul 2024 09:09:19 +0000 Subject: [PATCH 02/20] =?UTF-8?q?feat(mis):=20=E7=A7=9F=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E6=A8=A1?= =?UTF-8?q?=E6=80=81=E6=A1=86UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/entities/User.ts | 4 +- .../src/migrations/Migration20240705054221.ts | 35 ++++-- .../src/components/CannotDeleteModal.tsx | 42 +++++++ .../src/components/DeleteUserModal.tsx | 112 ++++++++++++++++++ apps/mis-web/src/i18n/en.ts | 12 ++ apps/mis-web/src/i18n/zh_cn.ts | 12 ++ .../pageComponents/tenant/AdminUserTable.tsx | 31 ++++- 7 files changed, 238 insertions(+), 10 deletions(-) create mode 100644 apps/mis-web/src/components/CannotDeleteModal.tsx create mode 100644 apps/mis-web/src/components/DeleteUserModal.tsx diff --git a/apps/mis-server/src/entities/User.ts b/apps/mis-server/src/entities/User.ts index aa18a5cd57..9036647068 100644 --- a/apps/mis-server/src/entities/User.ts +++ b/apps/mis-server/src/entities/User.ts @@ -64,10 +64,10 @@ export class User { platformRoles: PlatformRole[]; @Enum({ items: () => UserState, default: UserState.NORMAL, comment: Object.values(UserState).join(", ") }) - state: UserState = UserState.NORMAL; + state: UserState = UserState.NORMAL; @Property({ nullable: true }) - deleteRemark?: string; + deleteRemark?: string; constructor(init: { userId: string; diff --git a/apps/mis-server/src/migrations/Migration20240705054221.ts b/apps/mis-server/src/migrations/Migration20240705054221.ts index 87fa90ca22..d1fb71df42 100644 --- a/apps/mis-server/src/migrations/Migration20240705054221.ts +++ b/apps/mis-server/src/migrations/Migration20240705054221.ts @@ -1,17 +1,38 @@ -import { Migration } from '@mikro-orm/migrations'; +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ -export class Migration20240705054221 extends Migration { +import { Migration } from "@mikro-orm/migrations"; +export class Migration20240705054221 extends Migration { async up(): Promise { - this.addSql('alter table `account` modify `state` enum(\'NORMAL\', \'FROZEN\', \'BLOCKED_BY_ADMIN\', \'DELETED\') not null default \'NORMAL\' comment \'NORMAL, FROZEN, BLOCKED_BY_ADMIN, DELETED\';'); + this.addSql( + `alter table "account" modify "state" enum('NORMAL', 'FROZEN', 'BLOCKED_BY_ADMIN', 'DELETED') + not null default 'NORMAL' comment 'NORMAL, FROZEN, BLOCKED_BY_ADMIN, DELETED';`, + ); - this.addSql('alter table `user` add `state` enum(\'NORMAL\', \'DELETED\') not null default \'NORMAL\' comment \'NORMAL, DELETED\', add `delete_remark` varchar(255) null;'); + this.addSql( + `alter table "user" add "state" enum('NORMAL', 'DELETED') + not null default 'NORMAL' comment 'NORMAL, DELETED', add "delete_remark" varchar(255) null;`, + ); } async down(): Promise { - this.addSql('alter table `account` modify `state` enum(\'NORMAL\', \'FROZEN\', \'BLOCKED_BY_ADMIN\') not null default \'NORMAL\' comment \'NORMAL, FROZEN, BLOCKED_BY_ADMIN\';'); + this.addSql( + `alter table "account" modify "state" enum('NORMAL', 'FROZEN', 'BLOCKED_BY_ADMIN') + not null default 'NORMAL' comment 'NORMAL, FROZEN, BLOCKED_BY_ADMIN';`, + ); - this.addSql('alter table `user` drop column `state`, drop column `delete_remark`;'); + this.addSql( + "alter table \"user\" drop column \"state\", drop column \"delete_remark\";", + ); } - } diff --git a/apps/mis-web/src/components/CannotDeleteModal.tsx b/apps/mis-web/src/components/CannotDeleteModal.tsx new file mode 100644 index 0000000000..7e82495511 --- /dev/null +++ b/apps/mis-web/src/components/CannotDeleteModal.tsx @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +import { Modal } from "antd"; +import { ModalLink } from "src/components/ModalLink"; +import { prefix, useI18nTranslateToString } from "src/i18n"; + +interface Props { + onClose: () => void; + open: boolean; +} + +const p = prefix("component.others."); + +const CannotDeleteModal: React.FC = ({ onClose, open }) => { + const t = useI18nTranslateToString(); + + return ( + +

+ {t(p("cannotDeleteSelf"))} +

+ + ); +}; + +export const CannotDeleteModalLink = ModalLink(CannotDeleteModal); diff --git a/apps/mis-web/src/components/DeleteUserModal.tsx b/apps/mis-web/src/components/DeleteUserModal.tsx new file mode 100644 index 0000000000..1f77ccaaf2 --- /dev/null +++ b/apps/mis-web/src/components/DeleteUserModal.tsx @@ -0,0 +1,112 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +import { Form, Input, Modal } from "antd"; +import { useState } from "react"; +import { ModalLink } from "src/components/ModalLink"; +import { prefix, useI18n, useI18nTranslateToString } from "src/i18n"; + +interface Props { + name: string; + userId: string; + onClose: () => void; + onComplete: (userId: string, userName: string, comments: string) => Promise; + open: boolean; +} + +interface FormProps { + userId: string; + userName: string; + comments: string; +} + +const p = prefix("component.others."); + +const DeleteUserModal: React.FC = ({ name, userId, onClose, onComplete, open }) => { + const t = useI18nTranslateToString(); + + const [form] = Form.useForm(); + const [loading, setLoading] = useState(false); + + const onOK = async () => { + const { userId, userName, comments } = await form.validateFields(); + setLoading(true); + await onComplete(userId, userName, comments) + .then(() => { + form.resetFields(); + onClose(); + }) + .finally(() => setLoading(false)); + }; + + return ( + +
+
+ {t(p("confirmPermanentDeleteUser"), [ name, userId ])}
+ {t(p("deleteUserWarning1"))}
+ {t(p("deleteUserWarning2"))}
+ {t(p("deleteUserWarning3"))} +

+

{t(p("confirmDeleteUserPrompt"))}


+
+ + + + + + + + + +
+ + ); +}; + +export const DeleteUserModalLink = ModalLink(DeleteUserModal); diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts index 60302a3250..a4fd73c014 100644 --- a/apps/mis-web/src/i18n/en.ts +++ b/apps/mis-web/src/i18n/en.ts @@ -655,6 +655,7 @@ export default { changeSuccess: "Modification successful", changeFail: "Modification failed", changePassword: "Change Password", + deleteUser:"Delete User", }, jobPriceChangeModal: { tenantPrice: "Tenant Billing", @@ -805,6 +806,17 @@ export default { alreadyNot: "User is already not in this role", selectRole: "Select Role", customEventType: "Custom Event Type", + deleteUser:"Delete User", + deleteUser2: "Delete Current User", + userId:"User ID", + userName:"User Name", + comments:"Comments", + confirmPermanentDeleteUser: "Please confirm if you want to permanently delete the user {} (ID: {}). After deletion, the user will not be able to use it, including but not limited to:", + deleteUserWarning1: "1. Unable to use and log in to the account", + deleteUserWarning2: "2. Delete all personal information of the user", + deleteUserWarning3: "3. Unable to view assignments and consumption records", + confirmDeleteUserPrompt: "If you confirm the deletion of the user, please enter the user ID and name below", + cannotDeleteSelf: "Deleting the current user is not allowed", }, }, page: { diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index 81f93fa2d7..16b0651da6 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -653,6 +653,7 @@ export default { changeSuccess:"修改成功", changeFail:"修改失败", changePassword:"修改密码", + deleteUser:"删除用户", }, jobPriceChangeModal:{ tenantPrice:"租户计费", @@ -803,6 +804,17 @@ export default { alreadyNot:"用户已经不是该角色", selectRole:"选择角色", customEventType:"自定义操作类型", + deleteUser:"删除用户", + deleteUser2:"删除当前用户", + userId:"用户ID", + userName:"用户姓名", + comments:"备注", + confirmPermanentDeleteUser:"请确认是否永久删除用户{}（ID：{}）？删除后，该用户将无法使用，包括但不限于：", + deleteUserWarning1: "1、无法使用和登录该账号", + deleteUserWarning2: "2、删除该用户的所有个人信息", + deleteUserWarning3: "3、无法查看作业和消费记录", + confirmDeleteUserPrompt: "如果确认删除用户，请在下面输入用户ID和姓名", + cannotDeleteSelf:"不允许删除当前用户本身", }, }, page: { diff --git a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx index 04518b39a9..0e6799760f 100644 --- a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx +++ b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx @@ -17,7 +17,9 @@ import { App, Button, Divider, Form, Input, Space, Table } from "antd"; import { SortOrder } from "antd/es/table/interface"; import React, { useCallback, useMemo, useState } from "react"; import { api } from "src/apis"; +import { CannotDeleteModalLink } from "src/components/CannotDeleteModal"; import { ChangePasswordModalLink } from "src/components/ChangePasswordModal"; +import { DeleteUserModalLink } from "src/components/DeleteUserModal"; import { FilterFormContainer, FilterFormTabs } from "src/components/FilterFormContainer"; import { TenantRoleSelector } from "src/components/TenantRoleSelector"; import { prefix, useI18n, useI18nTranslateToString } from "src/i18n"; @@ -243,7 +245,7 @@ export const AdminUserTable: React.FC = ({ render={(_, r) => r.accountAffiliations.map((x) => x.accountName).join(", ")} /> - dataIndex="changePassword" + dataIndex="operation" title={t(pCommon("operation"))} width="8%" fixed="right" @@ -272,6 +274,33 @@ export const AdminUserTable: React.FC = ({ > {t(p("changePassword"))} + { user.identityId !== r.id ? { + await api.changePasswordAsTenantAdmin({ + body: { + identityId: r.id, + newPassword: newPassword, + }, + }) + .httpError(404, () => { message.error(t(p("notExist"))); }) + .httpError(501, () => { message.error(t(p("notAvailable"))); }) + .httpError(400, (e) => { + if (e.code === "PASSWORD_NOT_VALID") { + message.error(getRuntimeI18nConfigText(languageId, "passwordPatternMessage")); + }; + }) + .then(() => { message.success(t(p("changeSuccess"))); }) + .catch(() => { message.error(t(p("changeFail"))); }); + }} + > + {t(p("deleteUser"))} + : + + {t(p("deleteUser"))} + } )} /> From 25df93e97375810f8aca0e94c2c0ac6d529abb06 Mon Sep 17 00:00:00 2001 From: valign Date: Wed, 10 Jul 2024 01:42:47 +0000 Subject: [PATCH 03/20] =?UTF-8?q?feat(mis):=20=E5=88=A0=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-web/src/apis/api.mock.ts | 2 +- apps/mis-web/src/apis/api.ts | 3 +- .../src/components/DeleteUserModal.tsx | 34 ++++--- apps/mis-web/src/i18n/en.ts | 3 + apps/mis-web/src/i18n/zh_cn.ts | 3 + .../pageComponents/tenant/AdminUserTable.tsx | 42 +++++--- apps/mis-web/src/pages/api/users/delete.ts | 95 +++++++++++++++++++ 7 files changed, 152 insertions(+), 30 deletions(-) create mode 100644 apps/mis-web/src/pages/api/users/delete.ts diff --git a/apps/mis-web/src/apis/api.mock.ts b/apps/mis-web/src/apis/api.mock.ts index 135ddacafc..1df4e96611 100644 --- a/apps/mis-web/src/apis/api.mock.ts +++ b/apps/mis-web/src/apis/api.mock.ts @@ -456,7 +456,7 @@ export const mockApi: MockApi = { createTenant: async () => ({ createdInAuth: true }), createTenantWithExistingUserAsAdmin: async () => null, validateToken: async () => MOCK_USER_INFO, - + deleteUser: async () => null, getOperationLogs: async () => ({ results: [{ operationLogId: 99, operatorUserId: "testUser", diff --git a/apps/mis-web/src/apis/api.ts b/apps/mis-web/src/apis/api.ts index 083c6dbff6..2be93ead52 100644 --- a/apps/mis-web/src/apis/api.ts +++ b/apps/mis-web/src/apis/api.ts @@ -118,7 +118,7 @@ import type { SetAdminSchema } from "src/pages/api/users/setAsAdmin"; import type { QueryStorageUsageSchema } from "src/pages/api/users/storageUsage"; import type { UnblockUserInAccountSchema } from "src/pages/api/users/unblockInAccount"; import type { UnsetAdminSchema } from "src/pages/api/users/unsetAdmin"; - +import type { DeleteUserSchema } from "src/pages/api/users/delete"; export const api = { activateCluster: apiClient.fromTypeboxRoute("PUT", "/api/admin/activateCluster"), @@ -226,4 +226,5 @@ export const api = { queryStorageUsage: apiClient.fromTypeboxRoute("GET", "/api/users/storageUsage"), unblockUserInAccount: apiClient.fromTypeboxRoute("PUT", "/api/users/unblockInAccount"), unsetAdmin: apiClient.fromTypeboxRoute("PUT", "/api/users/unsetAdmin"), + deleteUser: apiClient.fromTypeboxRoute("DELETE", "/api/users/delete"), }; diff --git a/apps/mis-web/src/components/DeleteUserModal.tsx b/apps/mis-web/src/components/DeleteUserModal.tsx index 1f77ccaaf2..b896eb66ba 100644 --- a/apps/mis-web/src/components/DeleteUserModal.tsx +++ b/apps/mis-web/src/components/DeleteUserModal.tsx @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -import { Form, Input, Modal } from "antd"; +import { Form, Input, Modal, message } from "antd"; import { useState } from "react"; import { ModalLink } from "src/components/ModalLink"; -import { prefix, useI18n, useI18nTranslateToString } from "src/i18n"; +import { prefix, useI18nTranslateToString } from "src/i18n"; interface Props { name: string; @@ -38,14 +38,22 @@ const DeleteUserModal: React.FC = ({ name, userId, onClose, onComplete, o const [loading, setLoading] = useState(false); const onOK = async () => { - const { userId, userName, comments } = await form.validateFields(); - setLoading(true); - await onComplete(userId, userName, comments) - .then(() => { - form.resetFields(); - onClose(); - }) - .finally(() => setLoading(false)); + try { + const { userId: inputUserId, userName: inputUserName, comments } = await form.validateFields(); + if (inputUserId !== userId || inputUserName !== name) { + message.error(t(p("incorrectUserIdOrName"))); + return; + } + setLoading(true); + await onComplete(inputUserId, inputUserName, comments) + .then(() => { + form.resetFields(); + onClose(); + }) + .finally(() => setLoading(false)); + } catch (error) { + console.log(error); + } }; return ( @@ -59,7 +67,7 @@ const DeleteUserModal: React.FC = ({ name, userId, onClose, onComplete, o >
- {t(p("confirmPermanentDeleteUser"), [ name, userId ])}
+ {t(p("confirmPermanentDeleteUser"), [name, userId])}
{t(p("deleteUserWarning1"))}
{t(p("deleteUserWarning2"))}
{t(p("deleteUserWarning3"))} @@ -75,7 +83,7 @@ const DeleteUserModal: React.FC = ({ name, userId, onClose, onComplete, o = ({ name, userId, onClose, onComplete, o = ({ { user.identityId !== r.id ? { - await api.changePasswordAsTenantAdmin({ - body: { - identityId: r.id, - newPassword: newPassword, - }, + onComplete={async (inputUserId, inputUserName, comments) => { + await api.deleteUser({ query: { + userId:inputUserId, + userName:inputUserName, + comments: comments, + } }) + .httpError(400, (e) => { + message.destroy("removeUser"); + message.error({ + content: `${t("page._app.multiClusterOpErrorContent")}(${ + e.message + })`, + duration: 4, + }); }) - .httpError(404, () => { message.error(t(p("notExist"))); }) - .httpError(501, () => { message.error(t(p("notAvailable"))); }) - .httpError(400, (e) => { - if (e.code === "PASSWORD_NOT_VALID") { - message.error(getRuntimeI18nConfigText(languageId, "passwordPatternMessage")); - }; - }) - .then(() => { message.success(t(p("changeSuccess"))); }) - .catch(() => { message.error(t(p("changeFail"))); }); + .httpError(409, () => { + message.destroy("removeUser"); + message.error({ + content: "删除有问题", + duration: 4, + }); + reload(); + }) + .then(() => { + message.destroy("removeUser"); + reload(); + }) + .catch(() => { message.error(t(p("changeFail"))); }); }} > {t(p("deleteUser"))} diff --git a/apps/mis-web/src/pages/api/users/delete.ts b/apps/mis-web/src/pages/api/users/delete.ts new file mode 100644 index 0000000000..ec5d2e040b --- /dev/null +++ b/apps/mis-web/src/pages/api/users/delete.ts @@ -0,0 +1,95 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +import { typeboxRouteSchema } from "@ddadaal/next-typed-api-routes-runtime"; +import { asyncClientCall } from "@ddadaal/tsgrpc-client"; +import { Status } from "@grpc/grpc-js/build/src/constants"; +import { UserServiceClient } from "@scow/protos/build/server/user"; +import { Type } from "@sinclair/typebox"; +import { authenticate } from "src/auth/server"; +import { OperationResult, OperationType } from "src/models/operationLog"; +import { PlatformRole, TenantRole, UserRole } from "src/models/User"; +import { callLog } from "src/server/operationLog"; +import { getClient } from "src/utils/client"; +import { route } from "src/utils/route"; +import { handlegRPCError, parseIp } from "src/utils/server"; + +export const DeleteUserSchema = typeboxRouteSchema({ + method: "DELETE", + + query: Type.Object({ + userId: Type.String(), + userName: Type.String(), + comments: Type.Optional(Type.String()), + }), + + responses: { + 204: Type.Null(), + // 用户不存在 + 404: Type.Null(), + + // 操作集群失败 + 400: Type.Object({ message: Type.String() }), + + // 不能移出账户拥有者 + 406: Type.Null(), + + // 不能移出有正在运行作业的用户，只能先封锁 + 409: Type.Null(), + }, +}); + +export default /* #__PURE__*/route(DeleteUserSchema, async (req, res) => { + const { userId, userName , comments } = req.query; + console.log("这里是访问到了DeleteUserSchema内部",userId, userName , comments); + // const auth = authenticate((u) => { + // const acccountBelonged = u.accountAffiliations.find((x) => x.accountName === accountName); + + // return u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN) || + // (acccountBelonged && acccountBelonged.role !== UserRole.USER) || + // u.tenantRoles.includes(TenantRole.TENANT_ADMIN); + // }); + + // const info = await auth(req, res); + + // if (!info) { return; } + + // // call ua service to add user + // const client = getClient(UserServiceClient); + + // const logInfo = { + // operatorUserId: info.identityId, + // operatorIp: parseIp(req) ?? "", + // operationTypeName: OperationType.removeUserFromAccount, + // operationTypePayload:{ + // accountName, userId: identityId, + // }, + // }; + + // return await asyncClientCall(client, "removeUserFromAccount", { + // tenantName: info.tenant, + // accountName, + // userId: identityId, + // }) + // .then(async () => { + // await callLog(logInfo, OperationResult.SUCCESS); + // return { 204: null }; + // }) + // .catch(handlegRPCError({ + // [Status.INTERNAL]: (e) => ({ 400: { message: e.details } }), + // [Status.NOT_FOUND]: () => ({ 404: null }), + // [Status.OUT_OF_RANGE]: () => ({ 406: null }), + // [Status.FAILED_PRECONDITION]: () => ({ 409: null }), + // }, + // async () => await callLog(logInfo, OperationResult.FAIL), + // )); +}); From 00d70e5d73039f051362dfe31ee97f475e5bfa67 Mon Sep 17 00:00:00 2001 From: valign Date: Tue, 16 Jul 2024 02:04:42 +0000 Subject: [PATCH 04/20] =?UTF-8?q?feat(mis):=20=E5=88=A0=E9=99=A4=E5=89=8D?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9C=89=E6=97=A0=E6=9C=AA=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=B9=B6=E4=B8=80=E9=94=AE=E5=B0=81=E9=94=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=89=80=E6=9C=89=E8=B4=A6=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/services/user.ts | 137 +++++++++++++----- apps/mis-web/src/i18n/en.ts | 2 + apps/mis-web/src/i18n/zh_cn.ts | 2 + apps/mis-web/src/models/operationLog.ts | 5 + .../pageComponents/tenant/AdminUserTable.tsx | 12 +- apps/mis-web/src/pages/api/users/delete.ts | 96 ++++++------ protos/audit/operation_log.proto | 6 + protos/server/user.proto | 1 + 8 files changed, 172 insertions(+), 89 deletions(-) diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index 490113dea7..5943504101 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -100,6 +100,8 @@ export const userServiceServer = plugin((server) => { populate: ["storageQuotas", "accounts", "accounts.account"], }); + console.log("现在是getUserStatus的user",user); + if (!user) { throw { code: Status.NOT_FOUND, message: `User ${userId}, tenant ${tenantName} is not found`, @@ -110,26 +112,31 @@ export const userServiceServer = plugin((server) => { if (!tenant) { throw { code:Status.NOT_FOUND, message: `Tenant ${tenantName} is not found.` } as ServiceError; } - + const accountStatuses = user.accounts.getItems().reduce((prev, curr) => { + const account = curr.account.getEntity(); + prev[account.accountName] = { + accountBlocked: Boolean(account.blockedInCluster), + userStatus: PFUserStatus[curr.blockedInCluster], + jobChargeLimit: curr.jobChargeLimit ? decimalToMoney(curr.jobChargeLimit) : undefined, + usedJobCharge: curr.usedJobCharge ? decimalToMoney(curr.usedJobCharge) : undefined, + balance: decimalToMoney(curr.account.getEntity().balance), + isInWhitelist: Boolean(account.whitelist), + blockThresholdAmount:account.blockThresholdAmount ? + decimalToMoney(account.blockThresholdAmount) : decimalToMoney(tenant.defaultAccountBlockThreshold), + } as AccountStatus; + return prev; + }, {}); + + const storageQuotas = user.storageQuotas.getItems().reduce((prev, curr) => { + prev[curr.cluster] = curr.storageQuota; + return prev; + }, {}); + + console.log("这是返回的accountStatuses,storageQuotas",accountStatuses, + storageQuotas); return [{ - accountStatuses: user.accounts.getItems().reduce((prev, curr) => { - const account = curr.account.getEntity(); - prev[account.accountName] = { - accountBlocked: Boolean(account.blockedInCluster), - userStatus: PFUserStatus[curr.blockedInCluster], - jobChargeLimit: curr.jobChargeLimit ? decimalToMoney(curr.jobChargeLimit) : undefined, - usedJobCharge: curr.usedJobCharge ? decimalToMoney(curr.usedJobCharge) : undefined, - balance: decimalToMoney(curr.account.getEntity().balance), - isInWhitelist: Boolean(account.whitelist), - blockThresholdAmount:account.blockThresholdAmount ? - decimalToMoney(account.blockThresholdAmount) : decimalToMoney(tenant.defaultAccountBlockThreshold), - } as AccountStatus; - return prev; - }, {}), - storageQuotas: user.storageQuotas.getItems().reduce((prev, curr) => { - prev[curr.cluster] = curr.storageQuota; - return prev; - }, {}), + accountStatuses, + storageQuotas, }]; }, @@ -495,28 +502,92 @@ export const userServiceServer = plugin((server) => { }]; }, - deleteUser: async ({ request, em }) => { - const { userId, tenantName } = request; + deleteUser: async ({ request, em, logger }) => { + const { userId, tenantName, deleteRemark } = ensureNotUndefined(request, ["userId", "tenantName"]); + + const user = await em.findOne(User, { userId, tenant: { name: tenantName } }, { + populate: ["accounts", "accounts.account"], + }); + + const tenant = await em.findOne(Tenant, { name: tenantName }); - const user = await em.findOne(User, { userId, tenant: { name: tenantName } }); if (!user) { throw { code: Status.NOT_FOUND, message:`User ${userId} is not found.` } as ServiceError; } - // find if the user is an owner of any account - const accountUser = await em.findOne(UserAccount, { - user, - role: UserRole.OWNER, + if (!tenant) { + throw { code:Status.NOT_FOUND, message: `Tenant ${tenantName} is not found.` } as ServiceError; + } + + const currentActivatedClusters = await getActivatedClusters(em, logger); + // 查询用户是否有RUNNING、PENDING的作业与交互式应用，有则抛出异常 + const jobs = await server.ext.clusters.callOnAll( + currentActivatedClusters, + logger, + async (client) => { + const fields = ["job_id", "user", "state", "account"]; + + return await asyncClientCall(client.job, "getJobs", { + fields, + filter: { users: [userId], accounts: [], states: ["RUNNING", "PENDING"]}, + }); + }, + ); + // 这个记得最后解除注释 + // if (jobs.filter((i) => i.result.jobs.length > 0).length > 0) { + // throw { + // code: Status.FAILED_PRECONDITION, + // message: `User ${userId} has jobs running or pending and cannot remove. + // Please wait for the job to end or end the job manually before moving out.`, + // } as ServiceError; + // }; + const processAccountStatuses = async () => { + const accountItems = user.accounts.getItems(); + + for (const item of accountItems) { + const account = item.account.getEntity(); + const { accountName } = account; + + const userAccount = await em.findOne(UserAccount, { + user: { userId, tenant: { name: tenantName } }, + account: { accountName, tenant: { name: tenantName } }, + }, { populate: ["user", "account"]}); + + if (userAccount && userAccount.blockedInCluster === UserStatus.UNBLOCKED) { + userAccount.state = UserStateInAccount.BLOCKED_BY_ADMIN; + await blockUserInAccount(userAccount, currentActivatedClusters, server.ext, logger); + await em.flush(); + } + } + }; + + // 删除过程中封锁用户 + processAccountStatuses().catch((error) => { + console.error("Error processing blockUserInAccount:", error); }); - if (accountUser) { - throw { - code: Status.FAILED_PRECONDITION, - details: `User ${userId} is an owner of an account.`, - } as ServiceError; - } - await em.removeAndFlush(user); + // // find if the user is an owner of any account + // const accountUser = await em.findOne(UserAccount, { + // user, + // role: UserRole.OWNER, + // }); + + // if (userAccount.role === UserRole.OWNER) { + // throw { + // code: Status.OUT_OF_RANGE, + // message: `User ${userId} is the owner of the account ${accountName}。`, + // } as ServiceError; + // } + + // if (accountUser) { + // throw { + // code: Status.FAILED_PRECONDITION, + // details: `User ${userId} is an owner of an account.`, + // } as ServiceError; + // } + + // await em.removeAndFlush(user); return [{}]; }, diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts index 89933bff14..837fcb4ed6 100644 --- a/apps/mis-web/src/i18n/en.ts +++ b/apps/mis-web/src/i18n/en.ts @@ -1228,6 +1228,7 @@ export default { customEvent: "Custom Operation Event", activateCluster: "Activate Cluster", deactivateCluster: "Deactivate Cluster", + deleteUser:"Delete User", }, operationDetails: { login: "User Login", @@ -1264,6 +1265,7 @@ export default { setTenantFinance: "Set user {} as finance personnel of tenant {}", unsetTenantFinance: "Unset user {} as finance personnel of tenant {}", tenantChangePassword: "Reset login password for user {}", + deleteUser:"Delete User {}", createAccount: "Create account {}, owner {}", addAccountToWhitelist: "Add account {} to tenant {} whitelist", removeAccountFromWhitelist: "Remove account {} from tenant {} whitelist", diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index 3985b5716d..a7366c28e8 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -1226,6 +1226,7 @@ export default { customEvent: "自定义操作行为", activateCluster: "启用集群", deactivateCluster: "停用集群", + deleteUser:"删除用户", }, operationDetails: { login: "用户登录", @@ -1306,6 +1307,7 @@ export default { userChangeTenant: "用户{}切换租户，从租户{}切换到租户{}", activateCluster: "用户{}启用集群：{}", deactivateCluster: "用户{}停用集群：{}", + deleteUser:"删除用户{}", }, }, userRoles: { diff --git a/apps/mis-web/src/models/operationLog.ts b/apps/mis-web/src/models/operationLog.ts index 6c1e82a444..7792e0f807 100644 --- a/apps/mis-web/src/models/operationLog.ts +++ b/apps/mis-web/src/models/operationLog.ts @@ -62,6 +62,7 @@ export const OperationType: OperationTypeEnum = { setTenantFinance: "setTenantFinance", unsetTenantFinance: "unsetTenantFinance", tenantChangePassword: "tenantChangePassword", + deleteUser:"deleteUser", createAccount: "createAccount", addAccountToWhitelist: "addAccountToWhitelist", removeAccountFromWhitelist: "removeAccountFromWhitelist", @@ -180,6 +181,7 @@ export const getOperationTypeTexts = (t: OperationTextsTransType): {[key in LibO setTenantFinance: t(pTypes("setTenantFinance")), unsetTenantFinance: t(pTypes("unsetTenantFinance")), tenantChangePassword: t(pTypes("tenantChangePassword")), + deleteUser: t(pTypes("deleteUser")), createAccount: t(pTypes("createAccount")), addAccountToWhitelist: t(pTypes("addAccountToWhitelist")), removeAccountFromWhitelist: t(pTypes("removeAccountFromWhitelist")), @@ -247,6 +249,7 @@ export const OperationCodeMap: {[key in LibOperationType]: string } = { setTenantFinance: "030204", unsetTenantFinance: "030205", tenantChangePassword: "030206", + deleteUser:"030207", createAccount: "030301", addAccountToWhitelist: "030302", removeAccountFromWhitelist: "030303", @@ -395,6 +398,8 @@ export const getOperationDetail = ( [operationEvent[logEvent].userId, operationEvent[logEvent].tenantName]); case "tenantChangePassword": return t(pDetails("tenantChangePassword"), [operationEvent[logEvent].userId]); + case "deleteUser": + return t(pDetails("deleteUser"), [operationEvent[logEvent].userId]); case "createAccount": return t(pDetails("createAccount"), [operationEvent[logEvent].accountName, operationEvent[logEvent].accountOwner]); diff --git a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx index a56f193935..7b1e04c76c 100644 --- a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx +++ b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx @@ -283,20 +283,18 @@ export const AdminUserTable: React.FC = ({ userId:inputUserId, userName:inputUserName, comments: comments, - } }) - .httpError(400, (e) => { + } })// 待完善 + .httpError(404, (e) => { message.destroy("removeUser"); message.error({ - content: `${t("page._app.multiClusterOpErrorContent")}(${ - e.message - })`, + content: e.message, duration: 4, }); }) - .httpError(409, () => { + .httpError(409, (e) => { message.destroy("removeUser"); message.error({ - content: "删除有问题", + content: e.message, duration: 4, }); reload(); diff --git a/apps/mis-web/src/pages/api/users/delete.ts b/apps/mis-web/src/pages/api/users/delete.ts index ec0a0aecdf..d4dd23f234 100644 --- a/apps/mis-web/src/pages/api/users/delete.ts +++ b/apps/mis-web/src/pages/api/users/delete.ts @@ -11,8 +11,17 @@ */ import { typeboxRouteSchema } from "@ddadaal/next-typed-api-routes-runtime"; +import { asyncClientCall } from "@ddadaal/tsgrpc-client"; +import { status } from "@grpc/grpc-js"; +import { UserServiceClient } from "@scow/protos/build/server/user"; import { Type } from "@sinclair/typebox"; +import { authenticate } from "src/auth/server"; +import { OperationResult, OperationType } from "src/models/operationLog"; +import { PlatformRole, TenantRole } from "src/models/User"; +import { callLog } from "src/server/operationLog"; +import { getClient } from "src/utils/client"; import { route } from "src/utils/route"; +import { handlegRPCError, parseIp } from "src/utils/server"; export const DeleteUserSchema = typeboxRouteSchema({ method: "DELETE", @@ -26,61 +35,50 @@ export const DeleteUserSchema = typeboxRouteSchema({ responses: { 204: Type.Null(), // 用户不存在 - 404: Type.Null(), - - // 操作集群失败 - 400: Type.Object({ message: Type.String() }), - - // 不能移出账户拥有者 - 406: Type.Null(), - + 404: Type.Object({ message: Type.String() }), // 不能移出有正在运行作业的用户，只能先封锁 - 409: Type.Null(), + 409: Type.Object({ message: Type.String() }), + // 操作由于其他中止条件被中止 + 410: Type.Null(), }, }); -export default /* #__PURE__*/route(DeleteUserSchema, async (req) => { - const { userId, userName , comments } = req.query; - console.log("这里是访问到了DeleteUserSchema内部",userId, userName , comments); - // const auth = authenticate((u) => { - // const acccountBelonged = u.accountAffiliations.find((x) => x.accountName === accountName); - - // return u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN) || - // (acccountBelonged && acccountBelonged.role !== UserRole.USER) || - // u.tenantRoles.includes(TenantRole.TENANT_ADMIN); - // }); - - // const info = await auth(req, res); +export default /* #__PURE__*/route(DeleteUserSchema, async (req,res) => { + const { userId, comments } = req.query; + const auth = authenticate((u) => + (u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN) || + u.tenantRoles.includes(TenantRole.TENANT_ADMIN)) && u.identityId !== userId); + const info = await auth(req, res); + if (!info) { return; } - // if (!info) { return; } + // call ua service to add user + const client = getClient(UserServiceClient); - // // call ua service to add user - // const client = getClient(UserServiceClient); + const logInfo = { + operatorUserId: info.identityId, + operatorIp: parseIp(req) ?? "", + operationTypeName: OperationType.deleteUser, + operationTypePayload:{ + userId, + }, + }; - // const logInfo = { - // operatorUserId: info.identityId, - // operatorIp: parseIp(req) ?? "", - // operationTypeName: OperationType.removeUserFromAccount, - // operationTypePayload:{ - // accountName, userId: identityId, - // }, - // }; + console.log("这里测试的是delete内部", req); - // return await asyncClientCall(client, "removeUserFromAccount", { - // tenantName: info.tenant, - // accountName, - // userId: identityId, - // }) - // .then(async () => { - // await callLog(logInfo, OperationResult.SUCCESS); - // return { 204: null }; - // }) - // .catch(handlegRPCError({ - // [Status.INTERNAL]: (e) => ({ 400: { message: e.details } }), - // [Status.NOT_FOUND]: () => ({ 404: null }), - // [Status.OUT_OF_RANGE]: () => ({ 406: null }), - // [Status.FAILED_PRECONDITION]: () => ({ 409: null }), - // }, - // async () => await callLog(logInfo, OperationResult.FAIL), - // )); + return await asyncClientCall(client, "deleteUser", { + tenantName: info.tenant, + userId, + deleteRemark:comments, + }) + .then(async () => { + await callLog(logInfo, OperationResult.SUCCESS); + return { 204: null }; + }) + .catch(handlegRPCError({ + [status.NOT_FOUND]: (e) => ({ 404: { message: e.details } }), + [status.FAILED_PRECONDITION]: (e) => ({ 409: { message: e.details } }), + [status.ABORTED]: () => ({ 410: null }), + }, + async () => await callLog(logInfo, OperationResult.FAIL), + )); }); diff --git a/protos/audit/operation_log.proto b/protos/audit/operation_log.proto index d2e9a8fa55..ea541b66aa 100644 --- a/protos/audit/operation_log.proto +++ b/protos/audit/operation_log.proto @@ -169,6 +169,10 @@ message CreateUser { string user_id = 1; } +message DeleteUser { + string user_id = 1; +} + message AddUserToAccount { string account_name = 1; string user_id = 2; @@ -507,6 +511,7 @@ message CreateOperationLogRequest { CustomEvent custom_event = 62; ActivateCluster activate_cluster = 63; DeactivateCluster deactivate_cluster = 64; + DeleteUser delete_user = 65; } } @@ -579,6 +584,7 @@ message OperationLog { CustomEvent custom_event = 64; ActivateCluster activate_cluster = 65; DeactivateCluster deactivate_cluster = 66; + DeleteUser delete_user=67; } } diff --git a/protos/server/user.proto b/protos/server/user.proto index a759258255..532deb6644 100644 --- a/protos/server/user.proto +++ b/protos/server/user.proto @@ -203,6 +203,7 @@ message AddUserResponse { message DeleteUserRequest { string tenant_name = 1; string user_id = 2; + optional string delete_remark = 3; } // FAILED_PRECONDITION: the user is an owner of an account. From dc7b4fdd19e805c45a2d99dd6aa8c61f70adb591 Mon Sep 17 00:00:00 2001 From: valign Date: Wed, 17 Jul 2024 06:51:15 +0000 Subject: [PATCH 05/20] =?UTF-8?q?feat(mis):=20=E4=B8=80=E9=94=AE=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=94=A8=E6=88=B7=E6=89=80=E6=9C=89=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/services/user.ts | 102 +++++++++++------- .../src/components/DeleteUserModal.tsx | 10 +- apps/mis-web/src/i18n/en.ts | 11 +- apps/mis-web/src/i18n/zh_cn.ts | 11 +- apps/mis-web/src/pages/api/users/delete.ts | 2 - 5 files changed, 76 insertions(+), 60 deletions(-) diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index 5943504101..bf0a4a715d 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -36,7 +36,7 @@ import { getActivatedClusters } from "src/bl/clustersUtils"; import { authUrl } from "src/config"; import { Account } from "src/entities/Account"; import { Tenant } from "src/entities/Tenant"; -import { PlatformRole, TenantRole, User } from "src/entities/User"; +import { PlatformRole, TenantRole, User, UserState } from "src/entities/User"; import { UserAccount, UserRole, UserStateInAccount, UserStatus } from "src/entities/UserAccount"; import { callHook } from "src/plugins/hookClient"; import { getUserStateInfo } from "src/utils/accountUserState"; @@ -100,8 +100,6 @@ export const userServiceServer = plugin((server) => { populate: ["storageQuotas", "accounts", "accounts.account"], }); - console.log("现在是getUserStatus的user",user); - if (!user) { throw { code: Status.NOT_FOUND, message: `User ${userId}, tenant ${tenantName} is not found`, @@ -132,8 +130,6 @@ export const userServiceServer = plugin((server) => { return prev; }, {}); - console.log("这是返回的accountStatuses,storageQuotas",accountStatuses, - storageQuotas); return [{ accountStatuses, storageQuotas, @@ -504,7 +500,7 @@ export const userServiceServer = plugin((server) => { deleteUser: async ({ request, em, logger }) => { const { userId, tenantName, deleteRemark } = ensureNotUndefined(request, ["userId", "tenantName"]); - + console.log("deleteUser后端 userId, tenantName, deleteRemark ", userId, tenantName, deleteRemark); const user = await em.findOne(User, { userId, tenant: { name: tenantName } }, { populate: ["accounts", "accounts.account"], }); @@ -516,7 +512,7 @@ export const userServiceServer = plugin((server) => { } if (!tenant) { - throw { code:Status.NOT_FOUND, message: `Tenant ${tenantName} is not found.` } as ServiceError; + throw { code: Status.NOT_FOUND, message: `Tenant ${tenantName} is not found.` } as ServiceError; } const currentActivatedClusters = await getActivatedClusters(em, logger); @@ -533,16 +529,19 @@ export const userServiceServer = plugin((server) => { }); }, ); - // 这个记得最后解除注释 - // if (jobs.filter((i) => i.result.jobs.length > 0).length > 0) { - // throw { - // code: Status.FAILED_PRECONDITION, - // message: `User ${userId} has jobs running or pending and cannot remove. - // Please wait for the job to end or end the job manually before moving out.`, - // } as ServiceError; - // }; + + if (jobs.filter((i) => i.result.jobs.length > 0).length > 0) { + throw { + code: Status.FAILED_PRECONDITION, + message: `User ${userId} has jobs running or pending and cannot remove. + Please wait for the job to end or end the job manually before moving out.`, + } as ServiceError; + } + + // 查看是否用户有未封锁的账户 + const accountItems = user.accounts.getItems(); const processAccountStatuses = async () => { - const accountItems = user.accounts.getItems(); + const unblockedAccounts: string[] = []; for (const item of accountItems) { const account = item.account.getEntity(); @@ -554,43 +553,68 @@ export const userServiceServer = plugin((server) => { }, { populate: ["user", "account"]}); if (userAccount && userAccount.blockedInCluster === UserStatus.UNBLOCKED) { - userAccount.state = UserStateInAccount.BLOCKED_BY_ADMIN; - await blockUserInAccount(userAccount, currentActivatedClusters, server.ext, logger); - await em.flush(); + // 收集未被封锁的账户 + unblockedAccounts.push(accountName); + // userAccount.state = UserStateInAccount.BLOCKED_BY_ADMIN; //封锁当前用户账户 + // await blockUserInAccount(userAccount, currentActivatedClusters, server.ext, logger); + // await em.flush(); } } + return unblockedAccounts; }; - // 删除过程中封锁用户 - processAccountStatuses().catch((error) => { + const unblockedAccounts = await processAccountStatuses().catch((error) => { console.error("Error processing blockUserInAccount:", error); + return []; // 处理错误时返回空数组 }); + console.log("这里是unblockedAccounts", unblockedAccounts); + + if (unblockedAccounts.length > 0) { + const accountsString = unblockedAccounts.join(", "); + throw { + code: Status.FAILED_PRECONDITION, + message: `User ${userId} has unblocked accounts: ${accountsString}. + Please block the user in these accounts first.`, + } as ServiceError; + } + + // 表示用户为删除状态，记得取消注释 + // user.state = UserState.DELETED; - // // find if the user is an owner of any account - // const accountUser = await em.findOne(UserAccount, { - // user, - // role: UserRole.OWNER, - // }); + console.log("开始删除的是user", user); - // if (userAccount.role === UserRole.OWNER) { - // throw { - // code: Status.OUT_OF_RANGE, - // message: `User ${userId} is the owner of the account ${accountName}。`, - // } as ServiceError; - // } + // 处理用户账户关系表，删除用户与所有账户的关系 + const hasCapabilities = server.ext.capabilities.accountUserRelation; + console.log("hasCapabilities",hasCapabilities); - // if (accountUser) { - // throw { - // code: Status.FAILED_PRECONDITION, - // details: `User ${userId} is an owner of an account.`, - // } as ServiceError; - // } + for (const userAccount of accountItems) { + const accountName = userAccount.account.getEntity().accountName; + await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { + return await asyncClientCall(client.user, "removeUserFromAccount", + { userId, accountName }); + }).catch(async (e) => { + // 如果每个适配器返回的Error都是NOT_FOUND，说明所有集群均已将此用户移出账户，可以在scow数据库及认证系统中删除该条关系， + // 除此以外，都抛出异常 + if (countSubstringOccurrences(e.details, "Error: 5 NOT_FOUND") + !== Object.keys(currentActivatedClusters).length) { + throw e; + } + }); + await em.removeAndFlush(userAccount); + if (hasCapabilities) { + await removeUserFromAccount(authUrl, { accountName, userId }, logger); + } + } + + + await em.flush(); - // await em.removeAndFlush(user); return [{}]; + }, + checkUserNameMatch: async ({ request, em }) => { const { userId, name } = request; diff --git a/apps/mis-web/src/components/DeleteUserModal.tsx b/apps/mis-web/src/components/DeleteUserModal.tsx index 5b95e2705b..e02fa42e79 100644 --- a/apps/mis-web/src/components/DeleteUserModal.tsx +++ b/apps/mis-web/src/components/DeleteUserModal.tsx @@ -66,13 +66,9 @@ const DeleteUserModal: React.FC = ({ name, userId, onClose, onComplete, o width={"620px"} // 设置Modal宽度 >
-
- {t(p("confirmPermanentDeleteUser"), [name, userId])}
- {t(p("deleteUserWarning1"))}
- {t(p("deleteUserWarning2"))}
- {t(p("deleteUserWarning3"))} -

-

{t(p("confirmDeleteUserPrompt"))}


+

+

+


{} and name {}?", + confirmDeleteUserPrompt1: "If deleting a user, please ensure that the user is blocked in all accounts " + + "and enter the user ID and name below.", + confirmDeleteUserPrompt2: "Warning: This action is irreversible, and the user " + + "will be unavailable!", cannotDeleteSelf: "Deleting the current user is not allowed", userIdRequired: "Please enter the user ID", userNameRequired: "Please enter the user name", diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index a7366c28e8..607e7677dd 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -809,12 +809,11 @@ export default { userId:"用户ID", userName:"用户姓名", comments:"备注", - confirmPermanentDeleteUser:"请确认是否永久删除用户{}（ID：{}）？" - + "删除后，该用户将无法使用，包括但不限于：", - deleteUserWarning1: "1、无法使用和登录该账号", - deleteUserWarning2: "2、删除该用户的所有个人信息", - deleteUserWarning3: "3、无法查看作业和消费记录", - confirmDeleteUserPrompt: "如果确认删除用户，请在下面输入用户ID和姓名", + confirmPermanentDeleteUser:"请确认是否删除ID是{}，姓名是{}的用户？", + confirmDeleteUserPrompt1: "如果删除用户，请确认该用户在所有账户中已处于封锁状态，并在下方输入用户ID和姓名。", + + confirmDeleteUserPrompt2: "注意：删除后不可恢复，用户将不可用！", + cannotDeleteSelf:"不允许删除当前用户本身", userIdRequired:"请输入用户ID", userNameRequired:"请输入用户姓名", diff --git a/apps/mis-web/src/pages/api/users/delete.ts b/apps/mis-web/src/pages/api/users/delete.ts index d4dd23f234..97135aeade 100644 --- a/apps/mis-web/src/pages/api/users/delete.ts +++ b/apps/mis-web/src/pages/api/users/delete.ts @@ -63,8 +63,6 @@ export default /* #__PURE__*/route(DeleteUserSchema, async (req,res) => { }, }; - console.log("这里测试的是delete内部", req); - return await asyncClientCall(client, "deleteUser", { tenantName: info.tenant, userId, From 132c629f1b6371c01753d46bee4f3d28505cbf06 Mon Sep 17 00:00:00 2001 From: valign Date: Thu, 18 Jul 2024 08:07:41 +0000 Subject: [PATCH 06/20] =?UTF-8?q?feat(mis):=20=E5=88=A0=E9=99=A4=E5=89=8D?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E4=B8=BA?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=8B=A5=E6=9C=89=E8=80=85=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E4=BF=9D=E7=95=99=E4=B8=80=E9=94=AE=E5=B0=81=E9=94=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BB=A5=E5=8F=8A=E6=A3=80=E6=B5=8B=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E6=98=AF=E5=90=A6=E5=B0=81=E9=94=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/services/user.ts | 85 ++++++++++++---------------- 1 file changed, 35 insertions(+), 50 deletions(-) diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index bf0a4a715d..ba2f033447 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -515,9 +515,41 @@ export const userServiceServer = plugin((server) => { throw { code: Status.NOT_FOUND, message: `Tenant ${tenantName} is not found.` } as ServiceError; } + const accountItems = user.accounts.getItems(); + // 这里商量是不要管有没有封锁直接删，但要不要先封锁了再删？ + + // 如果用户为账户拥有者，提示管理员需要先删除拥有的账户再删除用户 + const countAccountOwner = async () => { + const ownedAccounts: string[] = []; + + for (const userAccount of accountItems) { + if (PFUserRole[userAccount.role] === PFUserRole.OWNER) { + const account = userAccount.account.getEntity(); + const { accountName } = account; + ownedAccounts.push(accountName); + } + } + return ownedAccounts; + }; + + const needDeleteAccounts = await countAccountOwner().catch((error) => { + console.error("Error processing countAccountOwner:", error); + return []; + }); + + if (needDeleteAccounts.length > 0) { + const accountsString = needDeleteAccounts.join(", "); + throw { + code: Status.FAILED_PRECONDITION, + message: `User ${userId} owns the following accounts: ${accountsString}. Please delete these accounts first.`, + } as ServiceError; + } + + user.state = UserState.DELETED; + const currentActivatedClusters = await getActivatedClusters(em, logger); // 查询用户是否有RUNNING、PENDING的作业与交互式应用，有则抛出异常 - const jobs = await server.ext.clusters.callOnAll( + const runningJobs = await server.ext.clusters.callOnAll( currentActivatedClusters, logger, async (client) => { @@ -530,7 +562,7 @@ export const userServiceServer = plugin((server) => { }, ); - if (jobs.filter((i) => i.result.jobs.length > 0).length > 0) { + if (runningJobs.filter((i) => i.result.jobs.length > 0).length > 0) { throw { code: Status.FAILED_PRECONDITION, message: `User ${userId} has jobs running or pending and cannot remove. @@ -538,57 +570,11 @@ export const userServiceServer = plugin((server) => { } as ServiceError; } - // 查看是否用户有未封锁的账户 - const accountItems = user.accounts.getItems(); - const processAccountStatuses = async () => { - const unblockedAccounts: string[] = []; - - for (const item of accountItems) { - const account = item.account.getEntity(); - const { accountName } = account; - - const userAccount = await em.findOne(UserAccount, { - user: { userId, tenant: { name: tenantName } }, - account: { accountName, tenant: { name: tenantName } }, - }, { populate: ["user", "account"]}); - - if (userAccount && userAccount.blockedInCluster === UserStatus.UNBLOCKED) { - // 收集未被封锁的账户 - unblockedAccounts.push(accountName); - // userAccount.state = UserStateInAccount.BLOCKED_BY_ADMIN; //封锁当前用户账户 - // await blockUserInAccount(userAccount, currentActivatedClusters, server.ext, logger); - // await em.flush(); - } - } - return unblockedAccounts; - }; - - const unblockedAccounts = await processAccountStatuses().catch((error) => { - console.error("Error processing blockUserInAccount:", error); - return []; // 处理错误时返回空数组 - }); - - console.log("这里是unblockedAccounts", unblockedAccounts); - - if (unblockedAccounts.length > 0) { - const accountsString = unblockedAccounts.join(", "); - throw { - code: Status.FAILED_PRECONDITION, - message: `User ${userId} has unblocked accounts: ${accountsString}. - Please block the user in these accounts first.`, - } as ServiceError; - } - - // 表示用户为删除状态，记得取消注释 - // user.state = UserState.DELETED; - - console.log("开始删除的是user", user); - // 处理用户账户关系表，删除用户与所有账户的关系 const hasCapabilities = server.ext.capabilities.accountUserRelation; - console.log("hasCapabilities",hasCapabilities); for (const userAccount of accountItems) { + console.log("单个userAccount",PFUserRole[userAccount.role] === PFUserRole.OWNER); const accountName = userAccount.account.getEntity().accountName; await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { return await asyncClientCall(client.user, "removeUserFromAccount", @@ -607,7 +593,6 @@ export const userServiceServer = plugin((server) => { } } - await em.flush(); return [{}]; From 615ae1738dd0218d4847c1efdbf31ade5ee8e3c6 Mon Sep 17 00:00:00 2001 From: valign Date: Mon, 22 Jul 2024 12:07:48 +0000 Subject: [PATCH 07/20] =?UTF-8?q?feat(mis):=20=E6=A0=B9=E6=8D=AE7.18?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4UI?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/services/user.ts | 17 ++++-- apps/mis-web/src/apis/api.mock.ts | 3 +- ...eleteModal.tsx => CannotDeleteTooltip.tsx} | 27 ++++------ .../src/components/DeleteUserFailedModal.tsx | 47 ++++++++++++++++ .../src/components/DeleteUserModal.tsx | 12 +++-- apps/mis-web/src/i18n/en.ts | 5 ++ apps/mis-web/src/i18n/zh_cn.ts | 5 ++ apps/mis-web/src/models/User.ts | 13 +++++ .../pageComponents/tenant/AdminUserTable.tsx | 54 +++++++++++++------ .../src/pages/api/admin/getTenantUsers.ts | 3 +- apps/mis-web/src/stores/UserStore.ts | 5 +- protos/server/user.proto | 6 +++ 12 files changed, 150 insertions(+), 47 deletions(-) rename apps/mis-web/src/components/{CannotDeleteModal.tsx => CannotDeleteTooltip.tsx} (61%) create mode 100644 apps/mis-web/src/components/DeleteUserFailedModal.tsx diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index ba2f033447..3d7fa59d43 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -30,6 +30,7 @@ import { tenantRoleToJSON, UserRole as PFUserRole, UserServiceServer, UserServiceService, + userStateFromJSON, UserStatus as PFUserStatus } from "@scow/protos/build/server/user"; import { blockUserInAccount, unblockUserInAccount } from "src/bl/block"; import { getActivatedClusters } from "src/bl/clustersUtils"; @@ -538,10 +539,14 @@ export const userServiceServer = plugin((server) => { }); if (needDeleteAccounts.length > 0) { - const accountsString = needDeleteAccounts.join(", "); + const needDeleteAccountsObj = { + userId, + accounts:needDeleteAccounts, + type:"ACCOUNTS_OWNER", + }; throw { code: Status.FAILED_PRECONDITION, - message: `User ${userId} owns the following accounts: ${accountsString}. Please delete these accounts first.`, + message: JSON.stringify(needDeleteAccountsObj), } as ServiceError; } @@ -563,10 +568,13 @@ export const userServiceServer = plugin((server) => { ); if (runningJobs.filter((i) => i.result.jobs.length > 0).length > 0) { + const runningJobsObj = { + userId, + type:"RUNNING_JOBS", + }; throw { code: Status.FAILED_PRECONDITION, - message: `User ${userId} has jobs running or pending and cannot remove. - Please wait for the job to end or end the job manually before moving out.`, + message: JSON.stringify(runningJobsObj), } as ServiceError; } @@ -646,6 +654,7 @@ export const userServiceServer = plugin((server) => { role: PFUserRole[x.role], })), platformRoles: x.platformRoles.map(platformRoleFromJSON), + state:userStateFromJSON(x.state), })) } ]; }, diff --git a/apps/mis-web/src/apis/api.mock.ts b/apps/mis-web/src/apis/api.mock.ts index daab14efe3..f5ca0423ae 100644 --- a/apps/mis-web/src/apis/api.mock.ts +++ b/apps/mis-web/src/apis/api.mock.ts @@ -21,7 +21,7 @@ import { type api } from "src/apis/api"; import { ClusterConnectionStatus } from "src/models/cluster"; import { OperationResult } from "src/models/operationLog"; import { AccountState, ClusterAccountInfo_ImportStatus, DisplayedAccountState, PlatformRole, - TenantRole, UserInfo, UserRole, UserStatus } from "src/models/User"; + TenantRole, UserInfo, UserRole, UserState,UserStatus } from "src/models/User"; import { DEFAULT_TENANT_NAME } from "src/utils/constants"; export type MockApi void; - open: boolean; + tooltipType: "cannotDeleteSelf" | "userDeleted"; } const p = prefix("component.others."); -const CannotDeleteModal: React.FC = ({ onClose, open }) => { +export const CannotDeleteTooltip: React.FC = ({ tooltipType }) => { const t = useI18nTranslateToString(); return ( - -

- {t(p("cannotDeleteSelf"))} -

- + + + {t(p("deleteUser"))} + + ); }; - -export const CannotDeleteModalLink = ModalLink(CannotDeleteModal); diff --git a/apps/mis-web/src/components/DeleteUserFailedModal.tsx b/apps/mis-web/src/components/DeleteUserFailedModal.tsx new file mode 100644 index 0000000000..3eeca8a457 --- /dev/null +++ b/apps/mis-web/src/components/DeleteUserFailedModal.tsx @@ -0,0 +1,47 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +import { Modal } from "antd"; +import { prefix, useI18nTranslateToString } from "src/i18n"; +import { DeleteFailedReason } from "src/models/User"; +interface Message { + type: DeleteFailedReason; + userId: string; + accounts: string[]; +} + +interface Props { + message: Message; + onClose: () => void; + open: boolean; +} + +const p = prefix("component.others."); + +export const DeleteUserFailedModal: React.FC = ({ message,onClose,open }) => { + const t = useI18nTranslateToString(); + const { userId,accounts } = message; + return ( + + {(message.type === DeleteFailedReason.ACCOUNTS_OWNER ? +
: +
{t(p("runningJobsPrompt"))}
+ )} + + ); +}; diff --git a/apps/mis-web/src/components/DeleteUserModal.tsx b/apps/mis-web/src/components/DeleteUserModal.tsx index e02fa42e79..0be17d396f 100644 --- a/apps/mis-web/src/components/DeleteUserModal.tsx +++ b/apps/mis-web/src/components/DeleteUserModal.tsx @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -import { Form, Input, message,Modal } from "antd"; +import { Form, Input, message, Modal } from "antd"; import { useState } from "react"; import { ModalLink } from "src/components/ModalLink"; import { prefix, useI18nTranslateToString } from "src/i18n"; @@ -39,13 +39,17 @@ const DeleteUserModal: React.FC = ({ name, userId, onClose, onComplete, o const onOK = async () => { try { - const { userId: inputUserId, userName: inputUserName, comments } = await form.validateFields(); - if (inputUserId !== userId || inputUserName !== name) { + const { userId: inputUserId, userName: inputUserName, comments = "" } = await form.validateFields(); + const trimmedUserId = inputUserId.trim(); + const trimmedUserName = inputUserName.trim(); + const trimmedComments = comments.trim(); + + if (trimmedUserId !== userId || trimmedUserName !== name) { message.error(t(p("incorrectUserIdOrName"))); return; } setLoading(true); - await onComplete(inputUserId, inputUserName, comments) + await onComplete(trimmedUserId, trimmedUserName, trimmedComments) .then(() => { form.resetFields(); onClose(); diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts index fde8092f44..b2f0fbf429 100644 --- a/apps/mis-web/src/i18n/en.ts +++ b/apps/mis-web/src/i18n/en.ts @@ -818,6 +818,11 @@ export default { userIdRequired: "Please enter the user ID", userNameRequired: "Please enter the user name", incorrectUserIdOrName: "The user ID or name you entered does not match", + userDeleted: "The user has been deleted", + deleteFailed: "Delete failed", + accountsOwnerPrompt: "The user {} is the owner of account(s) {}." + + "You need to delete the above account(s) before deleting this user.", + runningJobsPrompt: "The user has unfinished jobs and cannot be deleted.", }, }, page: { diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index 211281ba61..a5f0a9e2ef 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -818,6 +818,11 @@ export default { userIdRequired:"请输入用户ID", userNameRequired:"请输入用户姓名", incorrectUserIdOrName:"您输入的用户ID或姓名不匹配", + userDeleted: "该用户已被删除", + deleteFailed:"删除失败", + accountsOwnerPrompt:"用户{}是账户{}的拥有者，您需要先删除以上账户后才能删除该用户", + + runningJobsPrompt:"该用户还有未完成的作业，无法删除", }, }, page: { diff --git a/apps/mis-web/src/models/User.ts b/apps/mis-web/src/models/User.ts index 4677126c97..504f6befdb 100644 --- a/apps/mis-web/src/models/User.ts +++ b/apps/mis-web/src/models/User.ts @@ -84,6 +84,12 @@ export const AccountAffiliationSchema = Type.Object({ export type AccountAffiliation = Static; +export const UserState = { + NORMAL: 0, + DELETED: 1, +} as const; +export type UserState = ValueOf; + export const UserInfoSchema = Type.Object({ tenant: Type.String(), name: Type.Optional(Type.String()), @@ -106,6 +112,7 @@ export const FullUserInfo = Type.Object({ Type.Object({ accountName: Type.String(), role: Type.Enum(UserRole) }), ), tenantRoles: Type.Array(Type.Enum(TenantRole)), + state:Type.Enum(UserState), }); export type FullUserInfo = Static; @@ -134,6 +141,7 @@ export const AccountState = { NORMAL: 0, FROZEN: 1, BLOCKED_BY_ADMIN: 2, + DELETED: 3, } as const; export type AccountState = ValueOf; @@ -172,3 +180,8 @@ export const ChargesSortOrder = Type.Union([ ]); export type ChargesSortOrder = Static; + +export enum DeleteFailedReason { + ACCOUNTS_OWNER = "ACCOUNTS_OWNER", + RUNNING_JOBS = "RUNNING_JOBS", +} diff --git a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx index 7b1e04c76c..18e9b4ef9a 100644 --- a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx +++ b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx @@ -17,14 +17,15 @@ import { App, Button, Divider, Form, Input, Space, Table } from "antd"; import { SortOrder } from "antd/es/table/interface"; import React, { useCallback, useMemo, useState } from "react"; import { api } from "src/apis"; -import { CannotDeleteModalLink } from "src/components/CannotDeleteModal"; +import { CannotDeleteTooltip } from "src/components/CannotDeleteTooltip"; import { ChangePasswordModalLink } from "src/components/ChangePasswordModal"; +import { DeleteUserFailedModal } from "src/components/DeleteUserFailedModal"; import { DeleteUserModalLink } from "src/components/DeleteUserModal"; import { FilterFormContainer, FilterFormTabs } from "src/components/FilterFormContainer"; import { TenantRoleSelector } from "src/components/TenantRoleSelector"; import { prefix, useI18n, useI18nTranslateToString } from "src/i18n"; import { Encoding } from "src/models/exportFile"; -import { FullUserInfo, TenantRole } from "src/models/User"; +import { DeleteFailedReason, FullUserInfo, TenantRole, UserState } from "src/models/User"; import { ExportFileModaLButton } from "src/pageComponents/common/exportFileModal"; import { MAX_EXPORT_COUNT, urlToExport } from "src/pageComponents/file/apis"; import { type GetTenantUsersSchema } from "src/pages/api/admin/getTenantUsers"; @@ -52,8 +53,6 @@ const filteredRoles = { } as const; type FilteredRole = keyof typeof filteredRoles; - - export const AdminUserTable: React.FC = ({ data, isLoading, reload, user, }) => { @@ -149,6 +148,13 @@ export const AdminUserTable: React.FC = ({ ]; }, [t]); + const [failedModalVisible, setFailedModalVisible] = useState(false); + const [failedDeletedMessage, setFailedDeletedMessage] = useState({ + type: DeleteFailedReason.ACCOUNTS_OWNER, + userId: "", + accounts: [], + }); + return (
@@ -247,7 +253,7 @@ export const AdminUserTable: React.FC = ({ dataIndex="operation" title={t(pCommon("operation"))} - width="8%" + width="13%" fixed="right" render={(_, r) => ( }> @@ -274,33 +280,43 @@ export const AdminUserTable: React.FC = ({ > {t(p("changePassword"))} - { user.identityId !== r.id ? ( + { user.identityId === r.id ? ( + + ) : r.state === UserState.DELETED ? ( + + ) : ( { + + message.open({ + type: "loading", + content: t("common.waitingMessage"), + duration: 0, + key: "deleteUser" }); + await api.deleteUser({ query: { userId:inputUserId, userName:inputUserName, comments: comments, } })// 待完善 .httpError(404, (e) => { - message.destroy("removeUser"); + message.destroy("deleteUser"); message.error({ content: e.message, duration: 4, }); }) .httpError(409, (e) => { - message.destroy("removeUser"); - message.error({ - content: e.message, - duration: 4, - }); + message.destroy("deleteUser"); + const { type,userId,accounts } = JSON.parse(e.message); + setFailedModalVisible(true); + setFailedDeletedMessage({ type,userId,accounts }); reload(); }) .then(() => { - message.destroy("removeUser"); + message.destroy("deleteUser"); reload(); }) .catch(() => { message.error(t(p("changeFail"))); }); @@ -308,15 +324,19 @@ export const AdminUserTable: React.FC = ({ > {t(p("deleteUser"))} - ) : ( - - {t(p("deleteUser"))} - )} )} /> + { + setFailedModalVisible(false); + }} + > +
); }; diff --git a/apps/mis-web/src/pages/api/admin/getTenantUsers.ts b/apps/mis-web/src/pages/api/admin/getTenantUsers.ts index cff80f3cfa..35c63be15c 100644 --- a/apps/mis-web/src/pages/api/admin/getTenantUsers.ts +++ b/apps/mis-web/src/pages/api/admin/getTenantUsers.ts @@ -15,7 +15,7 @@ import { asyncClientCall } from "@ddadaal/tsgrpc-client"; import { UserServiceClient } from "@scow/protos/build/server/user"; import { Type } from "@sinclair/typebox"; import { authenticate } from "src/auth/server"; -import { FullUserInfo, TenantRole } from "src/models/User"; +import { FullUserInfo, TenantRole,UserState } from "src/models/User"; import { getClient } from "src/utils/client"; export const GetTenantUsersSchema = typeboxRouteSchema({ @@ -51,6 +51,7 @@ export default typeboxRoute(GetTenantUsersSchema, id: x.userId, name: x.name, tenantRoles: x.tenantRoles, + state:x.state || UserState.NORMAL, })); diff --git a/apps/mis-web/src/stores/UserStore.ts b/apps/mis-web/src/stores/UserStore.ts index daa3f57c4e..bd74629e2f 100644 --- a/apps/mis-web/src/stores/UserStore.ts +++ b/apps/mis-web/src/stores/UserStore.ts @@ -13,7 +13,7 @@ import { useCallback, useState } from "react"; import { api } from "src/apis"; import { destroyUserInfoCookie } from "src/auth/cookie"; -import { AccountAffiliation, PlatformRole, TenantRole } from "src/models/User"; +import { AccountAffiliation, PlatformRole, TenantRole, UserState } from "src/models/User"; export interface User { tenant: string; @@ -24,7 +24,8 @@ export interface User { platformRoles: PlatformRole[]; accountAffiliations: AccountAffiliation[]; email?: string; - createTime?: string + createTime?: string; + state: UserState; } export function UserStore(initialUser: User | undefined = undefined) { diff --git a/protos/server/user.proto b/protos/server/user.proto index 532deb6644..7221983606 100644 --- a/protos/server/user.proto +++ b/protos/server/user.proto @@ -234,6 +234,7 @@ message User { repeated AccountAffiliation account_affiliations = 6; repeated PlatformRole platform_roles = 7; repeated TenantRole tenant_roles = 8; + optional UserState state = 9; } message GetUserInfoRequest { @@ -261,6 +262,11 @@ enum TenantRole { TENANT_FINANCE = 1; } +enum UserState { + NORMAL = 0; + DELETED = 1; +} + message GetUserInfoResponse { repeated AccountAffiliation affiliations = 1; repeated PlatformRole platform_roles = 2; From d5939474afc2ef44298b453765a5dbf1d5ccb68b Mon Sep 17 00:00:00 2001 From: valign Date: Tue, 23 Jul 2024 11:00:55 +0000 Subject: [PATCH 08/20] =?UTF-8?q?feat(mis):=20=E6=96=B0=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=B4=A6=E6=88=B7=E5=8A=9F=E8=83=BD=E4=B8=8EUI?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=EF=BC=8C=E5=90=88=E5=B9=B6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8E=E8=B4=A6=E6=88=B7UI=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=95=B4=E5=90=88=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=A8=A1=E6=80=81=E6=A1=86=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/audit-server/src/services/statistic.ts | 2 + apps/mis-server/src/services/account.ts | 110 ++++++++++++ apps/mis-server/src/utils/accountUserState.ts | 7 + apps/mis-web/src/apis/api.mock.ts | 1 + apps/mis-web/src/apis/api.ts | 2 + .../src/components/CannotDeleteTooltip.tsx | 33 ---- .../components/DeleteEntityFailedModal.tsx | 69 ++++++++ .../src/components/DeleteEntityModal.tsx | 167 ++++++++++++++++++ .../src/components/DeleteUserFailedModal.tsx | 47 ----- .../src/components/DeleteUserModal.tsx | 120 ------------- apps/mis-web/src/i18n/en.ts | 64 ++++--- apps/mis-web/src/i18n/zh_cn.ts | 64 ++++--- apps/mis-web/src/models/User.ts | 7 + apps/mis-web/src/models/operationLog.ts | 5 + .../pageComponents/accounts/AccountTable.tsx | 70 ++++++++ .../pageComponents/tenant/AdminUserTable.tsx | 28 +-- .../src/pages/api/tenant/deleteAccount.ts | 81 +++++++++ dev/test-adapter/src/services/account.ts | 5 +- libs/auth/src/accountUserRelation.ts | 16 ++ libs/operation-log/src/constant.ts | 1 + protos/audit/operation_log.proto | 6 + protos/server/account.proto | 15 ++ 22 files changed, 665 insertions(+), 255 deletions(-) delete mode 100644 apps/mis-web/src/components/CannotDeleteTooltip.tsx create mode 100644 apps/mis-web/src/components/DeleteEntityFailedModal.tsx create mode 100644 apps/mis-web/src/components/DeleteEntityModal.tsx delete mode 100644 apps/mis-web/src/components/DeleteUserFailedModal.tsx delete mode 100644 apps/mis-web/src/components/DeleteUserModal.tsx create mode 100644 apps/mis-web/src/pages/api/tenant/deleteAccount.ts diff --git a/apps/audit-server/src/services/statistic.ts b/apps/audit-server/src/services/statistic.ts index 49dc438e72..3a5d9f43c6 100644 --- a/apps/audit-server/src/services/statistic.ts +++ b/apps/audit-server/src/services/statistic.ts @@ -94,6 +94,7 @@ export const statisticServiceServer = plugin((server) => { const misOperationType: OperationType[] = [ "setJobTimeLimit", "createUser", + "deleteUser", "addUserToAccount", "removeUserFromAccount", "setAccountAdmin", @@ -109,6 +110,7 @@ export const statisticServiceServer = plugin((server) => { "unsetTenantFinance", "tenantChangePassword", "createAccount", + "deleteAccount", "addAccountToWhitelist", "removeAccountFromWhitelist", "accountPay", diff --git a/apps/mis-server/src/services/account.ts b/apps/mis-server/src/services/account.ts index 7fd5408267..36c7458f01 100644 --- a/apps/mis-server/src/services/account.ts +++ b/apps/mis-server/src/services/account.ts @@ -12,6 +12,7 @@ import { asyncClientCall } from "@ddadaal/tsgrpc-client"; import { plugin } from "@ddadaal/tsgrpc-server"; +import { ensureNotUndefined } from "@ddadaal/tsgrpc-server"; import { ServiceError } from "@grpc/grpc-js"; import { Status } from "@grpc/grpc-js/build/src/constants"; import { LockMode, UniqueConstraintViolationException } from "@mikro-orm/core"; @@ -495,6 +496,115 @@ export const accountServiceServer = plugin((server) => { return [{}]; }, + + deleteAccount: async ({ request, em, logger }) => { + const { accountName, tenantName, comment } = ensureNotUndefined(request, ["accountName", "tenantName"]); + console.log("deleteAccount后端 accountName, tenantName, comment ", accountName, tenantName, comment); + + // const user = await em.findOne(User, { userId, tenant: { name: tenantName } }, { + // populate: ["accounts", "accounts.account"], + // }); + + // const tenant = await em.findOne(Tenant, { name: tenantName }); + + // if (!user) { + // throw { code: Status.NOT_FOUND, message:`User ${userId} is not found.` } as ServiceError; + // } + + // if (!tenant) { + // throw { code: Status.NOT_FOUND, message: `Tenant ${tenantName} is not found.` } as ServiceError; + // } + + // const accountItems = user.accounts.getItems(); + // // 这里商量是不要管有没有封锁直接删，但要不要先封锁了再删？ + + // // 如果用户为账户拥有者，提示管理员需要先删除拥有的账户再删除用户 + // const countAccountOwner = async () => { + // const ownedAccounts: string[] = []; + + // for (const userAccount of accountItems) { + // if (PFUserRole[userAccount.role] === PFUserRole.OWNER) { + // const account = userAccount.account.getEntity(); + // const { accountName } = account; + // ownedAccounts.push(accountName); + // } + // } + // return ownedAccounts; + // }; + + // const needDeleteAccounts = await countAccountOwner().catch((error) => { + // console.error("Error processing countAccountOwner:", error); + // return []; + // }); + + // if (needDeleteAccounts.length > 0) { + // const needDeleteAccountsObj = { + // userId, + // accounts:needDeleteAccounts, + // type:"ACCOUNTS_OWNER", + // }; + // throw { + // code: Status.FAILED_PRECONDITION, + // message: JSON.stringify(needDeleteAccountsObj), + // } as ServiceError; + // } + + // user.state = UserState.DELETED; + + // const currentActivatedClusters = await getActivatedClusters(em, logger); + // // 查询用户是否有RUNNING、PENDING的作业与交互式应用，有则抛出异常 + // const runningJobs = await server.ext.clusters.callOnAll( + // currentActivatedClusters, + // logger, + // async (client) => { + // const fields = ["job_id", "user", "state", "account"]; + + // return await asyncClientCall(client.job, "getJobs", { + // fields, + // filter: { users: [userId], accounts: [], states: ["RUNNING", "PENDING"]}, + // }); + // }, + // ); + + // if (runningJobs.filter((i) => i.result.jobs.length > 0).length > 0) { + // const runningJobsObj = { + // userId, + // type:"RUNNING_JOBS", + // }; + // throw { + // code: Status.FAILED_PRECONDITION, + // message: JSON.stringify(runningJobsObj), + // } as ServiceError; + // } + + // // 处理用户账户关系表，删除用户与所有账户的关系 + // const hasCapabilities = server.ext.capabilities.accountUserRelation; + + // for (const userAccount of accountItems) { + // console.log("单个userAccount",PFUserRole[userAccount.role] === PFUserRole.OWNER); + // const accountName = userAccount.account.getEntity().accountName; + // await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { + // return await asyncClientCall(client.user, "removeUserFromAccount", + // { userId, accountName }); + // }).catch(async (e) => { + // // 如果每个适配器返回的Error都是NOT_FOUND，说明所有集群均已将此用户移出账户，可以在scow数据库及认证系统中删除该条关系， + // // 除此以外，都抛出异常 + // if (countSubstringOccurrences(e.details, "Error: 5 NOT_FOUND") + // !== Object.keys(currentActivatedClusters).length) { + // throw e; + // } + // }); + // await em.removeAndFlush(userAccount); + // if (hasCapabilities) { + // await removeUserFromAccount(authUrl, { accountName, userId }, logger); + // } + // } + + // await em.flush(); + + return [{}]; + + }, }); }); diff --git a/apps/mis-server/src/utils/accountUserState.ts b/apps/mis-server/src/utils/accountUserState.ts index c5f3d35fa0..cda939967d 100644 --- a/apps/mis-server/src/utils/accountUserState.ts +++ b/apps/mis-server/src/utils/accountUserState.ts @@ -44,6 +44,13 @@ export const getAccountStateInfo = ( balance: Decimal, thresholdAmount: Decimal): AccountStateInfo => { + if (state === AccountState.DELETED) { + return { + displayedState: DisplayedAccountState.DISPLAYED_DELETED, + shouldBlockInCluster: true, + }; + } + if (state === AccountState.FROZEN) { return { displayedState: DisplayedAccountState.DISPLAYED_FROZEN, diff --git a/apps/mis-web/src/apis/api.mock.ts b/apps/mis-web/src/apis/api.mock.ts index f5ca0423ae..dae6db3f9f 100644 --- a/apps/mis-web/src/apis/api.mock.ts +++ b/apps/mis-web/src/apis/api.mock.ts @@ -433,6 +433,7 @@ export const mockApi: MockApi = { queryJobTimeLimit: async () => ({ result: 10 }), cancelJob: async () => null, createAccount: async () => { return {}; }, + deleteAccount: async () => null, dewhitelistAccount: async () => null, whitelistAccount: async () => null, getWhitelistedAccounts: async () => ({ results: [{ diff --git a/apps/mis-web/src/apis/api.ts b/apps/mis-web/src/apis/api.ts index 82e80a5a9a..e526e9cb31 100644 --- a/apps/mis-web/src/apis/api.ts +++ b/apps/mis-web/src/apis/api.ts @@ -102,6 +102,7 @@ import type { ChangePasswordAsTenantAdminSchema } from "src/pages/api/tenant/cha import type { CreateTenantSchema } from "src/pages/api/tenant/create"; import type { CreateAccountSchema } from "src/pages/api/tenant/createAccount"; import type { CreateTenantWithExistingUserAsAdminSchema } from "src/pages/api/tenant/createTenantWithExistingUserAsAdmin"; +import type { DeleteAccountSchema } from "src/pages/api/tenant/deleteAccount"; import type { GetAccountsSchema } from "src/pages/api/tenant/getAccounts"; import type { GetTenantsSchema } from "src/pages/api/tenant/getTenants"; import type { SetBlockThresholdSchema } from "src/pages/api/tenant/setBlockThreshold"; @@ -229,4 +230,5 @@ export const api = { unsetAdmin: apiClient.fromTypeboxRoute("PUT", "/api/users/unsetAdmin"), getSimpleClustersInfoFromConfigFiles: apiClient.fromTypeboxRoute("GET", "/api//simpleClustersInfo"), deleteUser: apiClient.fromTypeboxRoute("DELETE", "/api/users/delete"), + deleteAccount: apiClient.fromTypeboxRoute("DELETE", "/api/tenant/deleteAccount"), }; diff --git a/apps/mis-web/src/components/CannotDeleteTooltip.tsx b/apps/mis-web/src/components/CannotDeleteTooltip.tsx deleted file mode 100644 index 46415dfa02..0000000000 --- a/apps/mis-web/src/components/CannotDeleteTooltip.tsx +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy - * SCOW is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -import { Tooltip } from "antd"; -import React from "react"; -import { prefix, useI18nTranslateToString } from "src/i18n"; - -interface Props { - tooltipType: "cannotDeleteSelf" | "userDeleted"; -} - -const p = prefix("component.others."); - -export const CannotDeleteTooltip: React.FC = ({ tooltipType }) => { - const t = useI18nTranslateToString(); - - return ( - - - {t(p("deleteUser"))} - - - ); -}; diff --git a/apps/mis-web/src/components/DeleteEntityFailedModal.tsx b/apps/mis-web/src/components/DeleteEntityFailedModal.tsx new file mode 100644 index 0000000000..9cc36a9570 --- /dev/null +++ b/apps/mis-web/src/components/DeleteEntityFailedModal.tsx @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +import { Modal } from "antd"; +import { prefix, useI18nTranslateToString } from "src/i18n"; +import { DeleteFailedReason, EntityType } from "src/models/User"; + +interface Message { + type: DeleteFailedReason; + userId?: string; + accounts?: string[]; +} + +interface Props { + message: Message; + onClose: () => void; + open: boolean; + entityType?: EntityType +} + +const p = prefix("component.deleteModals."); + +export const DeleteEntityFailedModal: React.FC = ({ message, onClose, open , entityType = EntityType.USER }) => { + const t = useI18nTranslateToString(); + const { userId = "", accounts = []} = message; + + const renderContent = () => { + if (message.type === DeleteFailedReason.ACCOUNTS_OWNER) { + if (entityType === EntityType.USER) { + return ( +
+ ); + } + return null; + } else if (message.type === DeleteFailedReason.RUNNING_JOBS) { + return entityType === EntityType.ACCOUNT ? ( +
{t(p("accountRunningJobsPrompt"))}
+ ) : ( +
{t(p("userRunningJobsPrompt"))}
+ ); + } + return null; + }; + + return ( + + {renderContent()} + + ); +}; diff --git a/apps/mis-web/src/components/DeleteEntityModal.tsx b/apps/mis-web/src/components/DeleteEntityModal.tsx new file mode 100644 index 0000000000..7238b9b096 --- /dev/null +++ b/apps/mis-web/src/components/DeleteEntityModal.tsx @@ -0,0 +1,167 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +import { Form, Input, message, Modal } from "antd"; +import { useState } from "react"; +import { ModalLink } from "src/components/ModalLink"; +import { prefix, useI18nTranslateToString } from "src/i18n"; + +interface Props { + name: string; + id: string; + onClose: () => void; + onComplete: (id: string, name: string, comments: string) => Promise; + open: boolean; + type: "USER" | "ACCOUNT"; +} + +interface FormProps { + id: string; + name: string; + comments: string; +} + +const p = prefix("component.deleteModals."); + +const DeleteEntityModal: React.FC = ({ name, id, onClose, onComplete, open, type }) => { + const t = useI18nTranslateToString(); + + const [form] = Form.useForm(); + const [loading, setLoading] = useState(false); + + const formItems = { + USER: [ + { + label: t(p("userId")), + name: "id", + rules: [{ required: true, message: t(p("userIdRequired")) }], + }, + { + label: t(p("userName")), + name: "name", + rules: [{ required: true, message: t(p("userNameRequired")) }], + }, + ], + ACCOUNT: [ + { + label: t(p("accountName")), + name: "name", + rules: [{ required: true, message: t(p("accountNameRequired")) }], + }, + { + label: t(p("accountOwnerId")), + name: "id", + rules: [{ required: true, message: t(p("ownerIdRequired")) }], + }, + ], + }; + + type DeletePrompt1Type = "confirmDeleteUserPrompt1" | "confirmDeleteAccountPrompt1"; + type DeletePrompt2Type = "confirmDeleteUserPrompt2" | "confirmDeleteAccountPrompt2"; + + const formParams: Record = { + USER: { + labelCol: 4, + wrapperCol: 20, + deletePrompt1: "confirmDeleteUserPrompt1", + deletePrompt2: "confirmDeleteUserPrompt2", + }, + ACCOUNT: { + labelCol: 6, + wrapperCol: 16, + deletePrompt1: "confirmDeleteAccountPrompt1", + deletePrompt2: "confirmDeleteAccountPrompt2", + }, + }; + + const { labelCol, wrapperCol, deletePrompt1, deletePrompt2 } = formParams[type]; + + const onOK = async () => { + try { + const { id: inputId, name: inputName, comments = "" } = await form.validateFields(); + const trimmedId = inputId.trim(); + const trimmedName = inputName.trim(); + const trimmedComments = comments.trim(); + + if (trimmedId !== id || trimmedName !== name) { + message.error(t(p("incorrectUserIdOrName"))); + return; + } + setLoading(true); + await onComplete(trimmedId, trimmedName, trimmedComments) + .then(() => { + form.resetFields(); + onClose(); + }) + .finally(() => setLoading(false)); + } catch (error) { + console.log(error); + } + }; + + return ( + +
+

+

+


+ + {formItems[type].map((item) => ( + + + + ))} + + + + + + ); +}; + +export const DeleteEntityModalLink = ModalLink(DeleteEntityModal); diff --git a/apps/mis-web/src/components/DeleteUserFailedModal.tsx b/apps/mis-web/src/components/DeleteUserFailedModal.tsx deleted file mode 100644 index 3eeca8a457..0000000000 --- a/apps/mis-web/src/components/DeleteUserFailedModal.tsx +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy - * SCOW is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -import { Modal } from "antd"; -import { prefix, useI18nTranslateToString } from "src/i18n"; -import { DeleteFailedReason } from "src/models/User"; -interface Message { - type: DeleteFailedReason; - userId: string; - accounts: string[]; -} - -interface Props { - message: Message; - onClose: () => void; - open: boolean; -} - -const p = prefix("component.others."); - -export const DeleteUserFailedModal: React.FC = ({ message,onClose,open }) => { - const t = useI18nTranslateToString(); - const { userId,accounts } = message; - return ( - - {(message.type === DeleteFailedReason.ACCOUNTS_OWNER ? -
: -
{t(p("runningJobsPrompt"))}
- )} - - ); -}; diff --git a/apps/mis-web/src/components/DeleteUserModal.tsx b/apps/mis-web/src/components/DeleteUserModal.tsx deleted file mode 100644 index 0be17d396f..0000000000 --- a/apps/mis-web/src/components/DeleteUserModal.tsx +++ /dev/null @@ -1,120 +0,0 @@ -/** - * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy - * SCOW is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -import { Form, Input, message, Modal } from "antd"; -import { useState } from "react"; -import { ModalLink } from "src/components/ModalLink"; -import { prefix, useI18nTranslateToString } from "src/i18n"; - -interface Props { - name: string; - userId: string; - onClose: () => void; - onComplete: (userId: string, userName: string, comments: string) => Promise; - open: boolean; -} - -interface FormProps { - userId: string; - userName: string; - comments: string; -} - -const p = prefix("component.others."); - -const DeleteUserModal: React.FC = ({ name, userId, onClose, onComplete, open }) => { - const t = useI18nTranslateToString(); - - const [form] = Form.useForm(); - const [loading, setLoading] = useState(false); - - const onOK = async () => { - try { - const { userId: inputUserId, userName: inputUserName, comments = "" } = await form.validateFields(); - const trimmedUserId = inputUserId.trim(); - const trimmedUserName = inputUserName.trim(); - const trimmedComments = comments.trim(); - - if (trimmedUserId !== userId || trimmedUserName !== name) { - message.error(t(p("incorrectUserIdOrName"))); - return; - } - setLoading(true); - await onComplete(trimmedUserId, trimmedUserName, trimmedComments) - .then(() => { - form.resetFields(); - onClose(); - }) - .finally(() => setLoading(false)); - } catch (error) { - console.log(error); - } - }; - - return ( - -
-

-

-


-
- - - - - - - - - -
- - ); -}; - -export const DeleteUserModalLink = ModalLink(DeleteUserModal); diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts index b2f0fbf429..ce08327402 100644 --- a/apps/mis-web/src/i18n/en.ts +++ b/apps/mis-web/src/i18n/en.ts @@ -253,6 +253,7 @@ export default { frozen:"Frozen", debt: "Debt", normal: "Available", + deleted:"Deleted", unit: "CNY", unblockConfirmTitle: "Confirm Unblock of User?", unblockConfirmContent: "Do you wish to unblock account {} within tenant {}?", @@ -266,6 +267,9 @@ export default { blockConfirmContent: "Do you wish to block account {} within tenant {}?", blockSuccess: "Account blocking successful!", blockFail: "Account blocking failed!", + + delete:"Delete", + changeFail: "Modification failed", }, setBlockThresholdAmountModal: { setSuccess: "Set Successfully", @@ -653,7 +657,7 @@ export default { changeSuccess: "Modification successful", changeFail: "Modification failed", changePassword: "Change Password", - deleteUser:"Delete User", + delete:"Delete", }, jobPriceChangeModal: { tenantPrice: "Tenant Billing", @@ -773,6 +777,41 @@ export default { clusterNotAvailable: "The cluster you are currently accessing is unavailable or there are no available clusters. " + " Please try again later or contact the administrator.", }, + deleteModals:{ + deleteUser:"Delete User", + userId:"User ID", + userName:"User Name", + comments:"Comments", + confirmPermanentDeleteUser: "Please confirm if you want to delete the user with ID {} and name {}?", + confirmDeleteUserPrompt1: "If deleting a user, please ensure that the user is blocked in all accounts " + + "and enter the user ID and name below.", + confirmDeleteUserPrompt2: "Warning: This action is irreversible, and the user " + + "will be unavailable!", + cannotDeleteSelf: "Deleting the current user is not allowed", + userIdRequired: "Please enter the user ID", + userNameRequired: "Please enter the user name", + incorrectUserIdOrName: "The user ID or name you entered does not match", + userDeleted: "The user has been deleted and cannot be operated", + deleteFailed: "Delete failed", + accountsOwnerPrompt: "The user {} is the owner of account(s) {}." + + "You need to delete the above account(s) before deleting this user.", + userRunningJobsPrompt: "The user has unfinished jobs and cannot be deleted.", + delete:"Delete", + + deleteAccount:"Delete Account", + accountName:"Account Name", + accountOwnerId:"Account Owner ID", + accountNameRequired:"Please enter the account name", + ownerIdRequired:"Please enter the account owner ID", + confirmPermanentDeleteAccount:"Please confirm whether to delete the account with " + + "account name {} and account owner ID {}.", + confirmDeleteAccountPrompt1:"If you delete the account, please confirm that it is no longer in use" + + ", and enter the account name and owner ID below.", + confirmDeleteAccountPrompt2:"Note: This action is irreversible." + + "The account will be unusable after deletion!", + accountRunningJobsPrompt: "The account has unfinished jobs and cannot be deleted.", + accountDeleted:"The account has been deleted and cannot be operated", + }, others: { seeDetails: "For details, please refer to the documentation", modifyUser: "Modify User", @@ -804,25 +843,6 @@ export default { alreadyNot: "User is already not in this role", selectRole: "Select Role", customEventType: "Custom Event Type", - deleteUser:"Delete User", - deleteUser2: "Delete Current User", - userId:"User ID", - userName:"User Name", - comments:"Comments", - confirmPermanentDeleteUser: "Please confirm if you want to delete the user with ID {} and name {}?", - confirmDeleteUserPrompt1: "If deleting a user, please ensure that the user is blocked in all accounts " + - "and enter the user ID and name below.", - confirmDeleteUserPrompt2: "Warning: This action is irreversible, and the user " + - "will be unavailable!", - cannotDeleteSelf: "Deleting the current user is not allowed", - userIdRequired: "Please enter the user ID", - userNameRequired: "Please enter the user name", - incorrectUserIdOrName: "The user ID or name you entered does not match", - userDeleted: "The user has been deleted", - deleteFailed: "Delete failed", - accountsOwnerPrompt: "The user {} is the owner of account(s) {}." + - "You need to delete the above account(s) before deleting this user.", - runningJobsPrompt: "The user has unfinished jobs and cannot be deleted.", }, }, page: { @@ -1263,6 +1283,7 @@ export default { activateCluster: "Activate Cluster", deactivateCluster: "Deactivate Cluster", deleteUser:"Delete User", + deleteAccount:"Delete Account", }, operationDetails: { login: "User Login", @@ -1320,6 +1341,7 @@ export default { copyModelVersion: "Copy Model Version" + " (Source ModelId: {}, Source VersionId: {}; Target ModelId: {}, VersionId: {})", createUser: "Create User {}", + deleteUser:"Delete User {}", addUserToAccount: "Add user {} to account {}", removeUserFromAccount: "Remove user {} from account {}", setAccountAdmin: "Set user {} as administrator of account {}", @@ -1334,8 +1356,8 @@ export default { setTenantFinance: "Set user {} as finance personnel of tenant {}", unsetTenantFinance: "Unset user {} as finance personnel of tenant {}", tenantChangePassword: "Reset login password for user {}", - deleteUser:"Delete User {}", createAccount: "Create account {}, owner {}", + deleteAccount:"Delete account {}", addAccountToWhitelist: "Add account {} to tenant {} whitelist", removeAccountFromWhitelist: "Remove account {} from tenant {} whitelist", accountPay: "Recharge account {} by {} yuan", diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index a5f0a9e2ef..e16d605c51 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -253,6 +253,7 @@ export default { frozen:"冻结", debt: "欠费", normal:"正常", + deleted:"已删除", unit:" 元", unblockConfirmTitle: "确认解除用户封锁？", unblockConfirmContent: "确认要在租户{}中解除账户{}的封锁？", @@ -266,6 +267,9 @@ export default { blockConfirmContent: "确认要在租户{}中封锁账户{}", blockSuccess: "封锁帐户成功！", blockFail: "封锁帐户失败！", + + delete:"删除", + changeFail:"修改失败", }, setBlockThresholdAmountModal: { setSuccess:"设置成功", @@ -653,7 +657,7 @@ export default { changeSuccess:"修改成功", changeFail:"修改失败", changePassword:"修改密码", - deleteUser:"删除用户", + delete:"删除", }, jobPriceChangeModal:{ tenantPrice:"租户计费", @@ -773,6 +777,41 @@ export default { clusterNotAvailable: "当前正在访问的集群不可用或没有可用集群。" + "请稍后再试或联系管理员。", }, + deleteModals:{ + deleteUser:"删除用户", + userId:"用户ID", + userName:"用户姓名", + comments:"备注", + confirmPermanentDeleteUser:"请确认是否删除ID是{}，姓名是{}的用户？", + confirmDeleteUserPrompt1: "如果删除用户，请确认该用户在所有账户中已处于封锁状态，并在下方输入用户ID和姓名。", + + confirmDeleteUserPrompt2: "注意：删除后不可恢复，用户将不可用！", + + cannotDeleteSelf:"不允许删除当前用户本身", + userIdRequired:"请输入用户ID", + userNameRequired:"请输入用户姓名", + incorrectUserIdOrName:"您输入的用户ID或姓名不匹配", + userDeleted: "该用户已删除,无法操作", + deleteFailed:"删除失败", + accountsOwnerPrompt:"用户{}是账户{}的拥有者，您需要先删除以上账户后才能删除该用户", + + userRunningJobsPrompt:"该用户还有未完成的作业，无法删除", + delete:"删除", + + deleteAccount:"删除账户", + accountName:"账户名", + accountOwnerId:"账户拥有者ID", + accountNameRequired:"请输入账户名", + ownerIdRequired:"请输入账户拥有者ID", + confirmPermanentDeleteAccount:"请确认是否删除账户名是{}，账户拥有者ID为{}的账户？", + + confirmDeleteAccountPrompt1:"如果删除账户，请确认该账户已不在使用中，并在下方输入账户名和拥有者ID。", + + confirmDeleteAccountPrompt2:"注意：删除后不可恢复，账户将不可用！", + + accountRunningJobsPrompt:"该账户还有未完成的作业，无法删除", + accountDeleted:"该账户已删除，无法操作", + }, others:{ seeDetails:"细节请查阅文档", modifyUser:"修改用户", @@ -804,25 +843,6 @@ export default { alreadyNot:"用户已经不是该角色", selectRole:"选择角色", customEventType:"自定义操作类型", - deleteUser:"删除用户", - deleteUser2:"删除当前用户", - userId:"用户ID", - userName:"用户姓名", - comments:"备注", - confirmPermanentDeleteUser:"请确认是否删除ID是{}，姓名是{}的用户？", - confirmDeleteUserPrompt1: "如果删除用户，请确认该用户在所有账户中已处于封锁状态，并在下方输入用户ID和姓名。", - - confirmDeleteUserPrompt2: "注意：删除后不可恢复，用户将不可用！", - - cannotDeleteSelf:"不允许删除当前用户本身", - userIdRequired:"请输入用户ID", - userNameRequired:"请输入用户姓名", - incorrectUserIdOrName:"您输入的用户ID或姓名不匹配", - userDeleted: "该用户已被删除", - deleteFailed:"删除失败", - accountsOwnerPrompt:"用户{}是账户{}的拥有者，您需要先删除以上账户后才能删除该用户", - - runningJobsPrompt:"该用户还有未完成的作业，无法删除", }, }, page: { @@ -1263,6 +1283,7 @@ export default { activateCluster: "启用集群", deactivateCluster: "停用集群", deleteUser:"删除用户", + deleteAccount:"删除账户", }, operationDetails: { login: "用户登录", @@ -1320,6 +1341,7 @@ export default { copyModelVersion:"复制算法版本(源数算法Id: {}, 源版本Id: {}; 目标算法Id: {}, 版本Id: {})", createUser: "创建用户{}", + deleteUser:"删除用户{}", addUserToAccount: "将用户{}添加到账户{}中", removeUserFromAccount: "将用户{}从账户{}中移除", setAccountAdmin: "设置用户{}为账户{}的管理员", @@ -1335,6 +1357,7 @@ export default { unsetTenantFinance: "取消用户{}为租户{}的财务人员", tenantChangePassword: "重置用户{}的登录密码", createAccount: "创建账户{}, 拥有者为{}", + deleteAccount:"删除账户{}", addAccountToWhitelist: "将账户{}添加到租户{}的白名单中", removeAccountFromWhitelist: "将账户{}从租户{}的白名单中移出", accountPay: "为账户{}充值{}元", @@ -1378,7 +1401,6 @@ export default { userChangeTenant: "用户{}切换租户，从租户{}切换到租户{}", activateCluster: "用户{}启用集群：{}", deactivateCluster: "用户{}停用集群：{}", - deleteUser:"删除用户{}", }, }, userRoles: { diff --git a/apps/mis-web/src/models/User.ts b/apps/mis-web/src/models/User.ts index 504f6befdb..60a4cab8a9 100644 --- a/apps/mis-web/src/models/User.ts +++ b/apps/mis-web/src/models/User.ts @@ -151,6 +151,7 @@ export const DisplayedAccountState = { DISPLAYED_FROZEN: 1, DISPLAYED_BLOCKED: 2, DISPLAYED_BELOW_BLOCK_THRESHOLD: 3, + DISPLAYED_DELETED: 4, } as const; export type DisplayedAccountState = ValueOf; @@ -162,6 +163,7 @@ export const getDisplayedStateI18nTexts = (t: TransType) => { [DisplayedAccountState.DISPLAYED_FROZEN]: t("pageComp.accounts.accountTable.frozen"), [DisplayedAccountState.DISPLAYED_BLOCKED]: t("pageComp.accounts.accountTable.blocked"), [DisplayedAccountState.DISPLAYED_BELOW_BLOCK_THRESHOLD]: t("pageComp.accounts.accountTable.debt"), + [DisplayedAccountState.DISPLAYED_DELETED]: t("pageComp.accounts.accountTable.deleted"), }; }; @@ -185,3 +187,8 @@ export enum DeleteFailedReason { ACCOUNTS_OWNER = "ACCOUNTS_OWNER", RUNNING_JOBS = "RUNNING_JOBS", } + +export enum EntityType { + USER = "USER", + ACCOUNT = "ACCOUNT", +} diff --git a/apps/mis-web/src/models/operationLog.ts b/apps/mis-web/src/models/operationLog.ts index fe5ea2dd67..9d07004701 100644 --- a/apps/mis-web/src/models/operationLog.ts +++ b/apps/mis-web/src/models/operationLog.ts @@ -150,6 +150,7 @@ export const getOperationTypeTexts = (t: OperationTextsTransType): {[key in LibO tenantChangePassword: t(pTypes("tenantChangePassword")), deleteUser: t(pTypes("deleteUser")), createAccount: t(pTypes("createAccount")), + deleteAccount: t(pTypes("deleteAccount")), addAccountToWhitelist: t(pTypes("addAccountToWhitelist")), removeAccountFromWhitelist: t(pTypes("removeAccountFromWhitelist")), accountPay: t(pTypes("accountPay")), @@ -257,6 +258,7 @@ export const OperationCodeMap: {[key in LibOperationType]: string } = { unblockAccount: "030306", setAccountBlockThreshold: "030307", setAccountDefaultBlockThreshold: "030308", + deleteAccount:"030309", importUsers: "040101", setPlatformAdmin: "040201", unsetPlatformAdmin: "040202", @@ -508,6 +510,9 @@ export const getOperationDetail = ( case "createAccount": return t(pDetails("createAccount"), [operationEvent[logEvent].accountName, operationEvent[logEvent].accountOwner]); + case "deleteAccount": + return t(pDetails("deleteAccount"), + [operationEvent[logEvent].accountName]); case "addAccountToWhitelist": return t(pDetails("addAccountToWhitelist"), [operationEvent[logEvent].accountName, operationEvent[logEvent].tenantName]); diff --git a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx index e087decb21..0adc2b2223 100644 --- a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx +++ b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx @@ -20,10 +20,14 @@ import { SortOrder } from "antd/es/table/interface"; import Link from "next/link"; import React, { useMemo, useState } from "react"; import { api } from "src/apis"; +import { DeleteEntityFailedModal } from "src/components/DeleteEntityFailedModal"; +import { DeleteEntityModalLink } from "src/components/DeleteEntityModal"; +import { DisabledA } from "src/components/DisabledA"; import { FilterFormContainer, FilterFormTabs } from "src/components/FilterFormContainer"; import { prefix, useI18nTranslateToString } from "src/i18n"; import { Encoding } from "src/models/exportFile"; import { AccountState, DisplayedAccountState, getDisplayedStateI18nTexts } from "src/models/User"; +import { DeleteFailedReason,EntityType } from "src/models/User"; import { ExportFileModaLButton } from "src/pageComponents/common/exportFileModal"; import { MAX_EXPORT_COUNT, urlToExport } from "src/pageComponents/file/apis"; import type { AdminAccountInfo, GetAccountsSchema } from "src/pages/api/tenant/getAccounts"; @@ -50,6 +54,7 @@ const FilteredTypes = { DISPLAYED_FROZEN: DisplayedAccountState.DISPLAYED_FROZEN, DISPLAYED_BLOCKED: DisplayedAccountState.DISPLAYED_BLOCKED, DISPLAYED_BELOW_BLOCK_THRESHOLD: DisplayedAccountState.DISPLAYED_BELOW_BLOCK_THRESHOLD, + DISPLAYED_DELETED: DisplayedAccountState.DISPLAYED_DELETED, }; const filteredStatuses = { @@ -63,6 +68,7 @@ type FilteredStatus = keyof typeof filteredStatuses; const p = prefix("pageComp.accounts.accountTable."); const pCommon = prefix("common."); +const pDelete = prefix("component.deleteModals."); export const AccountTable: React.FC = ({ data, isLoading, showedTab, reload, @@ -130,6 +136,8 @@ export const AccountTable: React.FC = ({ account.displayedState === DisplayedAccountState.DISPLAYED_BELOW_BLOCK_THRESHOLD).length, DISPLAYED_NORMAL: searchData.filter((account) => account.displayedState === DisplayedAccountState.DISPLAYED_NORMAL).length, + DISPLAYED_DELETED: searchData.filter((account) => + account.displayedState === DisplayedAccountState.DISPLAYED_DELETED).length, ALL: searchData.length, }; return counts; @@ -191,6 +199,11 @@ export const AccountTable: React.FC = ({ return [...common, ...tenant, ...remaining]; }, [showedTab, t]); + const [failedModalVisible, setFailedModalVisible] = useState(false); + const [failedDeletedMessage, setFailedDeletedMessage] = useState({ + type: DeleteFailedReason.RUNNING_JOBS, + }); + return (
@@ -420,10 +433,67 @@ export const AccountTable: React.FC = ({ {t(p("block"))} )} + {showedTab === "TENANT" && ( + r.state === 3 ? ( + + {t(p("delete"))} + + ) : ( + { + + message.open({ + type: "loading", + content: t("common.waitingMessage"), + duration: 0, + key: "deleteAccount" }); + + await api.deleteAccount({ query: { + ownerId:inputUserId, + accountName:inputAccountName, + comment: comment, + } })// 待完善 + .httpError(404, (e) => { + message.destroy("deleteAccount"); + message.error({ + content: e.message, + duration: 4, + }); + }) + .httpError(409, (e) => { + message.destroy("deleteAccount"); + const { type } = JSON.parse(e.message); + setFailedModalVisible(true); + setFailedDeletedMessage({ type }); + reload(); + }) + .then(() => { + message.destroy("deleteAccount"); + reload(); + }) + .catch(() => { message.error(t(p("changeFail"))); }); + }} + > + {t(p("delete"))} + + ) + )} )} /> + { + setFailedModalVisible(false); + }} + > +
); }; diff --git a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx index 18e9b4ef9a..03ba41207d 100644 --- a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx +++ b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx @@ -17,10 +17,10 @@ import { App, Button, Divider, Form, Input, Space, Table } from "antd"; import { SortOrder } from "antd/es/table/interface"; import React, { useCallback, useMemo, useState } from "react"; import { api } from "src/apis"; -import { CannotDeleteTooltip } from "src/components/CannotDeleteTooltip"; import { ChangePasswordModalLink } from "src/components/ChangePasswordModal"; -import { DeleteUserFailedModal } from "src/components/DeleteUserFailedModal"; -import { DeleteUserModalLink } from "src/components/DeleteUserModal"; +import { DeleteEntityFailedModal } from "src/components/DeleteEntityFailedModal"; +import { DeleteEntityModalLink } from "src/components/DeleteEntityModal"; +import { DisabledA } from "src/components/DisabledA"; import { FilterFormContainer, FilterFormTabs } from "src/components/FilterFormContainer"; import { TenantRoleSelector } from "src/components/TenantRoleSelector"; import { prefix, useI18n, useI18nTranslateToString } from "src/i18n"; @@ -45,6 +45,7 @@ interface FilterForm { const p = prefix("pageComp.tenant.adminUserTable."); const pCommon = prefix("common."); +const pDelete = prefix("component.deleteModals."); const filteredRoles = { "ALL_USERS": "allUsers", @@ -281,13 +282,18 @@ export const AdminUserTable: React.FC = ({ {t(p("changePassword"))} { user.identityId === r.id ? ( - + + {t(p("delete"))} + ) : r.state === UserState.DELETED ? ( - + + {t(p("delete"))} + ) : ( - { message.open({ @@ -322,21 +328,21 @@ export const AdminUserTable: React.FC = ({ .catch(() => { message.error(t(p("changeFail"))); }); }} > - {t(p("deleteUser"))} - + {t(p("delete"))} + )} )} /> - { setFailedModalVisible(false); }} > - +
); }; diff --git a/apps/mis-web/src/pages/api/tenant/deleteAccount.ts b/apps/mis-web/src/pages/api/tenant/deleteAccount.ts new file mode 100644 index 0000000000..e7830801ba --- /dev/null +++ b/apps/mis-web/src/pages/api/tenant/deleteAccount.ts @@ -0,0 +1,81 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +import { typeboxRouteSchema } from "@ddadaal/next-typed-api-routes-runtime"; +import { asyncClientCall } from "@ddadaal/tsgrpc-client"; +import { status } from "@grpc/grpc-js"; +import { OperationType } from "@scow/lib-operation-log"; +import { AccountServiceClient } from "@scow/protos/build/server/account"; +import { Type } from "@sinclair/typebox"; +import { authenticate } from "src/auth/server"; +import { OperationResult } from "src/models/operationLog"; +import { TenantRole } from "src/models/User"; +import { callLog } from "src/server/operationLog"; +import { getClient } from "src/utils/client"; +import { route } from "src/utils/route"; +import { handlegRPCError, parseIp } from "src/utils/server"; + +export const DeleteAccountSchema = typeboxRouteSchema({ + method: "DELETE", + + query: Type.Object({ + accountName: Type.String(), + ownerId: Type.String(), + comment: Type.Optional(Type.String()), + }), + + responses: { + 204: Type.Null(), + // 用户不存在 + 404: Type.Object({ message: Type.String() }), + // 不能移出有正在运行作业的用户，只能先封锁 + 409: Type.Object({ message: Type.String() }), + // 操作由于其他中止条件被中止 + 410: Type.Null(), + }, +}); + +export default /* #__PURE__*/route(DeleteAccountSchema, async (req,res) => { + const auth = authenticate((info) => info.tenantRoles.includes(TenantRole.TENANT_ADMIN)); + const info = await auth(req, res); + if (!info) { + return; + } + + const { accountName, ownerId, comment } = req.query; + + const logInfo = { + operatorUserId: info.identityId, + operatorIp: parseIp(req) ?? "", + operationTypeName: OperationType.deleteAccount, + operationTypePayload:{ + tenantName: info.tenant, accountName, ownerId, + }, + }; + + const client = getClient(AccountServiceClient); + + return await asyncClientCall(client, "deleteAccount", { + accountName, comment, tenantName: info.tenant, + }) + .then(async () => { + await callLog(logInfo, OperationResult.SUCCESS); + return { 204: null }; + }) + .catch(handlegRPCError({ + [status.NOT_FOUND]: (e) => ({ 404: { message: e.details } }), + [status.FAILED_PRECONDITION]: (e) => ({ 409: { message: e.details } }), + [status.ABORTED]: () => ({ 410: null }), + }, + async () => await callLog(logInfo, OperationResult.FAIL), + )); +}); diff --git a/dev/test-adapter/src/services/account.ts b/dev/test-adapter/src/services/account.ts index 27eb0df30a..5f3705da75 100644 --- a/dev/test-adapter/src/services/account.ts +++ b/dev/test-adapter/src/services/account.ts @@ -60,7 +60,8 @@ export const accountServiceServer = plugin((server) => { return [{ blocked: true }]; }, - - + // deleteAccount:async () => { + // return [{}]; + // }, }); }); diff --git a/libs/auth/src/accountUserRelation.ts b/libs/auth/src/accountUserRelation.ts index 5a903046cc..a91cbdd3f0 100644 --- a/libs/auth/src/accountUserRelation.ts +++ b/libs/auth/src/accountUserRelation.ts @@ -92,3 +92,19 @@ export async function unsetUserDefaultAccount( } } +// export async function deleteAccount( +// authUrl: string, +// params: { accountName: string; comment: string }, +// logger?: Logger, +// ) { +// const resp = await fetch(authUrl + `/account/${params.accountName}/comment/${params.comment}`, { +// method: "DELETE", +// headers: applicationJsonHeaders, +// }); + +// if (resp.status !== 204) { +// logHttpErrorAndThrow(resp, logger); +// } +// } + + diff --git a/libs/operation-log/src/constant.ts b/libs/operation-log/src/constant.ts index 04aa8908d8..b9e9a56dcf 100644 --- a/libs/operation-log/src/constant.ts +++ b/libs/operation-log/src/constant.ts @@ -60,6 +60,7 @@ export const OperationType: OperationTypeEnum = { unsetTenantFinance: "unsetTenantFinance", tenantChangePassword: "tenantChangePassword", createAccount: "createAccount", + deleteAccount:"deleteAccount", addAccountToWhitelist: "addAccountToWhitelist", removeAccountFromWhitelist: "removeAccountFromWhitelist", accountPay: "accountPay", diff --git a/protos/audit/operation_log.proto b/protos/audit/operation_log.proto index b564b53bb9..ee015b0f0e 100644 --- a/protos/audit/operation_log.proto +++ b/protos/audit/operation_log.proto @@ -270,6 +270,10 @@ message CreateAccount { string account_owner = 3; } +message DeleteAccount { + string account_name = 1; +} + message AddAccountToWhitelist { string tenant_name = 1; string account_name = 2; @@ -705,6 +709,7 @@ message CreateOperationLogRequest { DeleteModelVersion delete_model_version = 95; CopyModelVersion copy_model_version = 96; DeleteUser delete_user = 97; + DeleteAccount delete_account = 98; } } @@ -810,6 +815,7 @@ message OperationLog { DeleteModelVersion delete_model_version = 97; CopyModelVersion copy_model_version = 98; DeleteUser delete_user=99; + DeleteAccount delete_account = 100; } } diff --git a/protos/server/account.proto b/protos/server/account.proto index a7341dd1bc..0f6d2bbba3 100644 --- a/protos/server/account.proto +++ b/protos/server/account.proto @@ -96,6 +96,15 @@ message CreateAccountRequest { message CreateAccountResponse { } +message DeleteAccountRequest { + string tenant_name = 1; + string account_name = 2; + optional string comment = 3; +} + +message DeleteAccountResponse { +} + message GetAccountsRequest { optional string tenant_name = 1; // returns all accounts if not set @@ -110,6 +119,8 @@ message Account { FROZEN = 1; // 账户被上级手动封锁 BLOCKED_BY_ADMIN = 2; + // 账户被删除 + DELETED = 3; } // 页面展示的账户状态 enum DisplayedAccountState { @@ -125,6 +136,8 @@ message Account { // and not in whitelist // and balance <= blcok_threshold DISPLAYED_BELOW_BLOCK_THRESHOLD = 3; + // when state = deleted + DISPLAYED_DELETED = 4; } string tenant_name = 1; string account_name = 2; @@ -171,4 +184,6 @@ service AccountService { returns (DewhitelistAccountResponse); rpc SetBlockThreshold(SetBlockThresholdRequest) returns (SetBlockThresholdResponse); + + rpc DeleteAccount(DeleteAccountRequest) returns (DeleteAccountResponse); } From f59ab8afa4e29581e3c2a3c58216863a3b66f78d Mon Sep 17 00:00:00 2001 From: valign Date: Wed, 24 Jul 2024 09:14:11 +0000 Subject: [PATCH 09/20] =?UTF-8?q?feat(mis):=20=E8=B4=A6=E6=88=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=B1=8F=E8=94=BD=E5=B7=B2=E5=88=A0=E9=99=A4=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E5=90=84=E7=A7=8D=E6=93=8D=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E8=B4=A6=E6=88=B7=E7=9A=84?= =?UTF-8?q?tab=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E4=B8=AD=E6=8B=A5=E6=9C=89=E8=80=85?= =?UTF-8?q?ID=E5=92=8C=E5=A7=93=E5=90=8D=E7=9A=84=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/services/account.ts | 172 +++++++---------- apps/mis-server/src/services/export.ts | 32 +++- apps/mis-server/src/services/user.ts | 178 +++++++++--------- apps/mis-web/src/i18n/en.ts | 1 + apps/mis-web/src/i18n/zh_cn.ts | 1 + .../pageComponents/accounts/AccountTable.tsx | 18 +- .../pageComponents/tenant/AdminUserTable.tsx | 51 ++--- .../src/pages/api/file/exportAccount.ts | 7 +- apps/mis-web/src/pages/api/file/exportUser.ts | 2 +- protos/server/export.proto | 3 + 10 files changed, 238 insertions(+), 227 deletions(-) diff --git a/apps/mis-server/src/services/account.ts b/apps/mis-server/src/services/account.ts index 36c7458f01..0599e732fb 100644 --- a/apps/mis-server/src/services/account.ts +++ b/apps/mis-server/src/services/account.ts @@ -498,112 +498,76 @@ export const accountServiceServer = plugin((server) => { }, deleteAccount: async ({ request, em, logger }) => { - const { accountName, tenantName, comment } = ensureNotUndefined(request, ["accountName", "tenantName"]); - console.log("deleteAccount后端 accountName, tenantName, comment ", accountName, tenantName, comment); - - // const user = await em.findOne(User, { userId, tenant: { name: tenantName } }, { - // populate: ["accounts", "accounts.account"], - // }); - - // const tenant = await em.findOne(Tenant, { name: tenantName }); - - // if (!user) { - // throw { code: Status.NOT_FOUND, message:`User ${userId} is not found.` } as ServiceError; - // } - - // if (!tenant) { - // throw { code: Status.NOT_FOUND, message: `Tenant ${tenantName} is not found.` } as ServiceError; - // } - - // const accountItems = user.accounts.getItems(); - // // 这里商量是不要管有没有封锁直接删，但要不要先封锁了再删？ - - // // 如果用户为账户拥有者，提示管理员需要先删除拥有的账户再删除用户 - // const countAccountOwner = async () => { - // const ownedAccounts: string[] = []; - - // for (const userAccount of accountItems) { - // if (PFUserRole[userAccount.role] === PFUserRole.OWNER) { - // const account = userAccount.account.getEntity(); - // const { accountName } = account; - // ownedAccounts.push(accountName); - // } - // } - // return ownedAccounts; - // }; - - // const needDeleteAccounts = await countAccountOwner().catch((error) => { - // console.error("Error processing countAccountOwner:", error); - // return []; - // }); - - // if (needDeleteAccounts.length > 0) { - // const needDeleteAccountsObj = { - // userId, - // accounts:needDeleteAccounts, - // type:"ACCOUNTS_OWNER", - // }; - // throw { - // code: Status.FAILED_PRECONDITION, - // message: JSON.stringify(needDeleteAccountsObj), - // } as ServiceError; - // } - - // user.state = UserState.DELETED; - - // const currentActivatedClusters = await getActivatedClusters(em, logger); - // // 查询用户是否有RUNNING、PENDING的作业与交互式应用，有则抛出异常 - // const runningJobs = await server.ext.clusters.callOnAll( - // currentActivatedClusters, - // logger, - // async (client) => { - // const fields = ["job_id", "user", "state", "account"]; - - // return await asyncClientCall(client.job, "getJobs", { - // fields, - // filter: { users: [userId], accounts: [], states: ["RUNNING", "PENDING"]}, - // }); - // }, - // ); - - // if (runningJobs.filter((i) => i.result.jobs.length > 0).length > 0) { - // const runningJobsObj = { - // userId, - // type:"RUNNING_JOBS", - // }; - // throw { - // code: Status.FAILED_PRECONDITION, - // message: JSON.stringify(runningJobsObj), - // } as ServiceError; - // } - - // // 处理用户账户关系表，删除用户与所有账户的关系 - // const hasCapabilities = server.ext.capabilities.accountUserRelation; - - // for (const userAccount of accountItems) { - // console.log("单个userAccount",PFUserRole[userAccount.role] === PFUserRole.OWNER); - // const accountName = userAccount.account.getEntity().accountName; - // await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { - // return await asyncClientCall(client.user, "removeUserFromAccount", - // { userId, accountName }); - // }).catch(async (e) => { - // // 如果每个适配器返回的Error都是NOT_FOUND，说明所有集群均已将此用户移出账户，可以在scow数据库及认证系统中删除该条关系， - // // 除此以外，都抛出异常 - // if (countSubstringOccurrences(e.details, "Error: 5 NOT_FOUND") - // !== Object.keys(currentActivatedClusters).length) { - // throw e; - // } - // }); - // await em.removeAndFlush(userAccount); - // if (hasCapabilities) { - // await removeUserFromAccount(authUrl, { accountName, userId }, logger); - // } - // } - - // await em.flush(); + return await em.transactional(async (em) => { + const { accountName, tenantName, comment } = ensureNotUndefined(request, ["accountName", "tenantName"]); + console.log("deleteAccount后端 accountName, tenantName, comment ", accountName, tenantName, comment); - return [{}]; + const tenant = await em.findOne(Tenant, { name: tenantName }); + + if (!tenant) { + throw { code: Status.NOT_FOUND, message: `Tenant ${tenantName} is not found.` } as ServiceError; + } + + const account = await em.findOne(Account, { accountName, + tenant: { name: tenantName } }, { populate: ["tenant"]}); + + if (!account) { + throw { + code: Status.NOT_FOUND, message: `Account ${accountName} is not found`, + } as ServiceError; + } + + console.log("这里是deleteAccount的account",account); + const currentActivatedClusters = await getActivatedClusters(em, logger); + // 查询账户是否有RUNNING、PENDING的作业与交互式应用，有则抛出异常 + const runningJobs = await server.ext.clusters.callOnAll( + currentActivatedClusters, + logger, + async (client) => { + const fields = ["job_id", "user", "state", "account"]; + + return await asyncClientCall(client.job, "getJobs", { + fields, + filter: { users: [], accounts: [accountName], states: ["RUNNING", "PENDING"]}, + }); + }, + ); + + if (runningJobs.filter((i) => i.result.jobs.length > 0).length > 0) { + throw { + code: Status.FAILED_PRECONDITION, + message: `Account ${accountName} has jobs running and cannot be blocked. `, + } as ServiceError; + } + + // 处理用户账户关系表，删除账户与所有用户的关系 + const hasCapabilities = server.ext.capabilities.accountUserRelation; + + // for (const userAccount of accountItems) { + // console.log("单个userAccount",PFUserRole[userAccount.role] === PFUserRole.OWNER); + // const accountName = userAccount.account.getEntity().accountName; + // await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { + // return await asyncClientCall(client.user, "removeUserFromAccount", + // { userId, accountName }); + // }).catch(async (e) => { + // // 如果每个适配器返回的Error都是NOT_FOUND，说明所有集群均已将此用户移出账户，可以在scow数据库及认证系统中删除该条关系， + // // 除此以外，都抛出异常 + // if (countSubstringOccurrences(e.details, "Error: 5 NOT_FOUND") + // !== Object.keys(currentActivatedClusters).length) { + // throw e; + // } + // }); + // await em.removeAndFlush(userAccount); + // if (hasCapabilities) { + // await removeUserFromAccount(authUrl, { accountName, userId }, logger); + // } + // } + + // await em.flush(); + + return [{}]; + }); }, }); diff --git a/apps/mis-server/src/services/export.ts b/apps/mis-server/src/services/export.ts index 41b256c648..98902ca4e3 100644 --- a/apps/mis-server/src/services/export.ts +++ b/apps/mis-server/src/services/export.ts @@ -152,7 +152,9 @@ export const exportServiceServer = plugin((server) => { debt, frozen, normal, + deleted, count, + ownerIdOrName, } = request; const recordFormat = (x: Loaded) => { @@ -192,40 +194,53 @@ export const exportServiceServer = plugin((server) => { const { writeAsync } = createWriterExtensions(call); - const qb = em.createQueryBuilder(Account, "a") + const baseQb = em.createQueryBuilder(Account, "a") .select("*") .leftJoinAndSelect("a.users", "ua") .leftJoinAndSelect("ua.user", "u") .leftJoinAndSelect("a.tenant", "t"); if (tenantName !== undefined) { - void qb.andWhere({ "t.name": tenantName }); + void baseQb.andWhere({ "t.name": tenantName }); } if (accountName !== undefined) { - void qb.andWhere({ "a.accountName": { $like: `%${accountName}%` } }); + void baseQb.andWhere({ "a.accountName": { $like: `%${accountName}%` } }); } if (blocked) { - void qb.andWhere({ "a.state": AccountState.BLOCKED_BY_ADMIN, "a.blockedInCluster": true }); + void baseQb.andWhere({ "a.state": AccountState.BLOCKED_BY_ADMIN, "a.blockedInCluster": true }); } if (debt) { - void qb.andWhere({ "a.state": AccountState.NORMAL }) + void baseQb.andWhere({ "a.state": AccountState.NORMAL }) .andWhere("a.whitelist_id IS NULL") .andWhere("CASE WHEN a.block_threshold_amount IS NOT NULL" + " THEN a.balance <= a.block_threshold_amount ELSE a.balance <= t.default_account_block_threshold END"); } if (frozen) { - void qb.andWhere({ "a.state": AccountState.FROZEN }); + void baseQb.andWhere({ "a.state": AccountState.FROZEN }); } if (normal) { - void qb.andWhere({ "a.blockedInCluster": false }); + void baseQb.andWhere({ "a.blockedInCluster": false }); + } + + if (deleted) { + void baseQb.andWhere({ "a.state": AccountState.DELETED }); + } + + if (ownerIdOrName) { + const knexQuery = baseQb.getKnexQuery(); + knexQuery.andWhere(function() { + this.where("u.user_id", "like", `%${ownerIdOrName}%`) + .orWhere("u.name", "like", `%${ownerIdOrName}%`); + }); } while (offset < count) { + const qb = baseQb.clone(); const limit = Math.min(batchSize, count - offset); const queryResult = await qb @@ -233,8 +248,7 @@ export const exportServiceServer = plugin((server) => { .offset(offset) .getResultList() as Loaded[]; - const records = queryResult - .map(recordFormat ?? ((x) => x)); + const records = queryResult.map(recordFormat ?? ((x) => x)); if (records.length === 0) { break; diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index 3d7fa59d43..b475f15154 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -500,114 +500,116 @@ export const userServiceServer = plugin((server) => { }, deleteUser: async ({ request, em, logger }) => { - const { userId, tenantName, deleteRemark } = ensureNotUndefined(request, ["userId", "tenantName"]); - console.log("deleteUser后端 userId, tenantName, deleteRemark ", userId, tenantName, deleteRemark); - const user = await em.findOne(User, { userId, tenant: { name: tenantName } }, { - populate: ["accounts", "accounts.account"], - }); - - const tenant = await em.findOne(Tenant, { name: tenantName }); + return await em.transactional(async (em) => { + const { userId, tenantName, deleteRemark } = ensureNotUndefined(request, ["userId", "tenantName"]); + console.log("deleteUser后端 userId, tenantName, deleteRemark ", userId, tenantName, deleteRemark); - if (!user) { - throw { code: Status.NOT_FOUND, message:`User ${userId} is not found.` } as ServiceError; - } + const tenant = await em.findOne(Tenant, { name: tenantName }); - if (!tenant) { - throw { code: Status.NOT_FOUND, message: `Tenant ${tenantName} is not found.` } as ServiceError; - } - - const accountItems = user.accounts.getItems(); - // 这里商量是不要管有没有封锁直接删，但要不要先封锁了再删？ + if (!tenant) { + throw { code: Status.NOT_FOUND, message: `Tenant ${tenantName} is not found.` } as ServiceError; + } - // 如果用户为账户拥有者，提示管理员需要先删除拥有的账户再删除用户 - const countAccountOwner = async () => { - const ownedAccounts: string[] = []; + const user = await em.findOne(User, { userId, tenant: { name: tenantName } }, { + populate: ["accounts", "accounts.account"], + }); - for (const userAccount of accountItems) { - if (PFUserRole[userAccount.role] === PFUserRole.OWNER) { - const account = userAccount.account.getEntity(); - const { accountName } = account; - ownedAccounts.push(accountName); - } + if (!user) { + throw { code: Status.NOT_FOUND, message: `User ${userId} is not found.` } as ServiceError; } - return ownedAccounts; - }; - const needDeleteAccounts = await countAccountOwner().catch((error) => { - console.error("Error processing countAccountOwner:", error); - return []; - }); + const accountItems = user.accounts.getItems(); + // 这里商量是不要管有没有封锁直接删，但要不要先封锁了再删？ - if (needDeleteAccounts.length > 0) { - const needDeleteAccountsObj = { - userId, - accounts:needDeleteAccounts, - type:"ACCOUNTS_OWNER", + // 如果用户为账户拥有者，提示管理员需要先删除拥有的账户再删除用户 + const countAccountOwner = async () => { + const ownedAccounts: string[] = []; + + for (const userAccount of accountItems) { + if (PFUserRole[userAccount.role] === PFUserRole.OWNER) { + const account = userAccount.account.getEntity(); + const { accountName } = account; + ownedAccounts.push(accountName); + } + } + return ownedAccounts; }; - throw { - code: Status.FAILED_PRECONDITION, - message: JSON.stringify(needDeleteAccountsObj), - } as ServiceError; - } - user.state = UserState.DELETED; + const needDeleteAccounts = await countAccountOwner().catch((error) => { + console.error("Error processing countAccountOwner:", error); + return []; + }); - const currentActivatedClusters = await getActivatedClusters(em, logger); - // 查询用户是否有RUNNING、PENDING的作业与交互式应用，有则抛出异常 - const runningJobs = await server.ext.clusters.callOnAll( - currentActivatedClusters, - logger, - async (client) => { - const fields = ["job_id", "user", "state", "account"]; + if (needDeleteAccounts.length > 0) { + const needDeleteAccountsObj = { + userId, + accounts: needDeleteAccounts, + type: "ACCOUNTS_OWNER", + }; + throw { + code: Status.FAILED_PRECONDITION, + message: JSON.stringify(needDeleteAccountsObj), + } as ServiceError; + } - return await asyncClientCall(client.job, "getJobs", { - fields, - filter: { users: [userId], accounts: [], states: ["RUNNING", "PENDING"]}, - }); - }, - ); + const currentActivatedClusters = await getActivatedClusters(em, logger); + // 查询用户是否有RUNNING、PENDING的作业与交互式应用，有则抛出异常 + const runningJobs = await server.ext.clusters.callOnAll( + currentActivatedClusters, + logger, + async (client) => { + const fields = ["job_id", "user", "state", "account"]; + + return await asyncClientCall(client.job, "getJobs", { + fields, + filter: { users: [userId], accounts: [], states: ["RUNNING", "PENDING"]}, + }); + }, + ); - if (runningJobs.filter((i) => i.result.jobs.length > 0).length > 0) { - const runningJobsObj = { - userId, - type:"RUNNING_JOBS", - }; - throw { - code: Status.FAILED_PRECONDITION, - message: JSON.stringify(runningJobsObj), - } as ServiceError; - } + if (runningJobs.filter((i) => i.result.jobs.length > 0).length > 0) { + const runningJobsObj = { + userId, + type: "RUNNING_JOBS", + }; + throw { + code: Status.FAILED_PRECONDITION, + message: JSON.stringify(runningJobsObj), + } as ServiceError; + } - // 处理用户账户关系表，删除用户与所有账户的关系 - const hasCapabilities = server.ext.capabilities.accountUserRelation; - - for (const userAccount of accountItems) { - console.log("单个userAccount",PFUserRole[userAccount.role] === PFUserRole.OWNER); - const accountName = userAccount.account.getEntity().accountName; - await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { - return await asyncClientCall(client.user, "removeUserFromAccount", - { userId, accountName }); - }).catch(async (e) => { - // 如果每个适配器返回的Error都是NOT_FOUND，说明所有集群均已将此用户移出账户，可以在scow数据库及认证系统中删除该条关系， - // 除此以外，都抛出异常 - if (countSubstringOccurrences(e.details, "Error: 5 NOT_FOUND") - !== Object.keys(currentActivatedClusters).length) { - throw e; + // 处理用户账户关系表，删除用户与所有账户的关系 + const hasCapabilities = server.ext.capabilities.accountUserRelation; + + for (const userAccount of accountItems) { + console.log("单个userAccount", PFUserRole[userAccount.role] === PFUserRole.OWNER); + const accountName = userAccount.account.getEntity().accountName; + await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { + return await asyncClientCall(client.user, "removeUserFromAccount", + { userId, accountName }); + }).catch(async (e) => { + // 如果每个适配器返回的Error都是NOT_FOUND，说明所有集群均已将此用户移出账户，可以在scow数据库及认证系统中删除该条关系， + // 除此以外，都抛出异常 + if (countSubstringOccurrences(e.details, "Error: 5 NOT_FOUND") + !== Object.keys(currentActivatedClusters).length) { + throw e; + } + }); + await em.removeAndFlush(userAccount); + if (hasCapabilities) { + await removeUserFromAccount(authUrl, { accountName, userId }, logger); } - }); - await em.removeAndFlush(userAccount); - if (hasCapabilities) { - await removeUserFromAccount(authUrl, { accountName, userId }, logger); } - } - - await em.flush(); - return [{}]; + user.state = UserState.DELETED; + await em.flush(); + return [{}]; + }); }, + checkUserNameMatch: async ({ request, em }) => { const { userId, name } = request; diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts index ce08327402..93498728c3 100644 --- a/apps/mis-web/src/i18n/en.ts +++ b/apps/mis-web/src/i18n/en.ts @@ -228,6 +228,7 @@ export default { blockedAccount: "Blocked ", frozenAccount: "Frozen ", normalAccount: "Available ", + deletedAccount:"Deleted", account: "Account", accountName: "Account Name", owner: "Owner", diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index e16d605c51..9ddf440826 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -228,6 +228,7 @@ export default { blockedAccount: "封锁账户", frozenAccount: "冻结账户", normalAccount: "正常账户", + deletedAccount:"删除账户", account:"账户", accountName:"账户名", owner:"拥有者", diff --git a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx index 0adc2b2223..fbdf4f44f7 100644 --- a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx +++ b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx @@ -63,6 +63,7 @@ const filteredStatuses = { "DISPLAYED_FROZEN": "pageComp.accounts.accountTable.frozenAccount", "DISPLAYED_BLOCKED": "pageComp.accounts.accountTable.blockedAccount", "DISPLAYED_BELOW_BLOCK_THRESHOLD": "pageComp.accounts.accountTable.debtAccount", + "DISPLAYED_DELETED": "pageComp.accounts.accountTable.deletedAccount", }; type FilteredStatus = keyof typeof filteredStatuses; @@ -125,6 +126,7 @@ export const AccountTable: React.FC = ({ DISPLAYED_FROZEN: 0, DISPLAYED_BELOW_BLOCK_THRESHOLD: 0, DISPLAYED_NORMAL: 0, + DISPLAYED_DELETED: 0, ALL: 0, }; const counts = { @@ -174,7 +176,9 @@ export const AccountTable: React.FC = ({ debt: rangeSearchStatus === "DISPLAYED_BELOW_BLOCK_THRESHOLD", frozen: rangeSearchStatus === "DISPLAYED_FROZEN", normal: rangeSearchStatus === "DISPLAYED_NORMAL", + deleted: rangeSearchStatus === "DISPLAYED_DELETED", isFromAdmin: showedTab === "PLATFORM", + ownerIdOrName: query.ownerIdOrName, }, }); } @@ -358,7 +362,7 @@ export const AccountTable: React.FC = ({ render={(_, r) => ( }> {/* 只在租户管理下的账户列表中显示管理成员和封锁阈值 */} - {showedTab === "TENANT" && ( + {showedTab === "TENANT" && (r.state !== AccountState.DELETED ? ( <> {t(p("mangerMember"))} @@ -373,6 +377,16 @@ export const AccountTable: React.FC = ({ {t(p("blockThresholdAmount"))} + ) : ( + <> + + {t(p("mangerMember"))} + + + {t(p("blockThresholdAmount"))} + + + ) )} { r.state === AccountState.BLOCKED_BY_ADMIN && ( @@ -434,7 +448,7 @@ export const AccountTable: React.FC = ({ )} {showedTab === "TENANT" && ( - r.state === 3 ? ( + r.state === AccountState.DELETED ? ( {t(p("delete"))} diff --git a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx index 03ba41207d..a7af887e71 100644 --- a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx +++ b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx @@ -258,29 +258,36 @@ export const AdminUserTable: React.FC = ({ fixed="right" render={(_, r) => ( }> - { - await api.changePasswordAsTenantAdmin({ - body: { - identityId: r.id, - newPassword: newPassword, - }, - }) - .httpError(404, () => { message.error(t(p("notExist"))); }) - .httpError(501, () => { message.error(t(p("notAvailable"))); }) - .httpError(400, (e) => { - if (e.code === "PASSWORD_NOT_VALID") { - message.error(getRuntimeI18nConfigText(languageId, "passwordPatternMessage")); - }; + {r.state === UserState.DELETED ? ( + + {t(p("changePassword"))} + + ) : ( + { + await api.changePasswordAsTenantAdmin({ + body: { + identityId: r.id, + newPassword: newPassword, + }, }) - .then(() => { message.success(t(p("changeSuccess"))); }) - .catch(() => { message.error(t(p("changeFail"))); }); - }} - > - {t(p("changePassword"))} - + .httpError(404, () => { message.error(t(p("notExist"))); }) + .httpError(501, () => { message.error(t(p("notAvailable"))); }) + .httpError(400, (e) => { + if (e.code === "PASSWORD_NOT_VALID") { + message.error(getRuntimeI18nConfigText(languageId, "passwordPatternMessage")); + }; + }) + .then(() => { message.success(t(p("changeSuccess"))); }) + .catch(() => { message.error(t(p("changeFail"))); }); + }} + > + {t(p("changePassword"))} + + ) + } { user.identityId === r.id ? ( {t(p("delete"))} diff --git a/apps/mis-web/src/pages/api/file/exportAccount.ts b/apps/mis-web/src/pages/api/file/exportAccount.ts index a568d62ec1..7b1c5d36f4 100644 --- a/apps/mis-web/src/pages/api/file/exportAccount.ts +++ b/apps/mis-web/src/pages/api/file/exportAccount.ts @@ -44,9 +44,11 @@ export const ExportAccountSchema = typeboxRouteSchema({ debt: Type.Optional(Type.Boolean()), frozen: Type.Optional(Type.Boolean()), normal: Type.Optional(Type.Boolean()), + deleted:Type.Optional(Type.Boolean()), // 是否来自平台管理页面 isFromAdmin: Type.Boolean(), encoding: Type.Enum(Encoding), + ownerIdOrName: Type.Optional(Type.String()), }), responses:{ @@ -67,7 +69,8 @@ const adminAuth = authenticate((info) => export default route(ExportAccountSchema, async (req, res) => { const { query } = req; - const { columns, accountName, tenantName, blocked, debt, frozen, normal, count, isFromAdmin, encoding } = query; + const { columns, accountName, tenantName, blocked, debt, frozen, normal, count, isFromAdmin, + encoding, deleted, ownerIdOrName } = query; const info = isFromAdmin ? await adminAuth(req, res) : await tenantAuth(req, res); @@ -109,6 +112,8 @@ export default route(ExportAccountSchema, async (req, res) => { debt, frozen, normal, + deleted, + ownerIdOrName, }); const languageId = getCurrentLanguageId(req, publicConfig.SYSTEM_LANGUAGE_CONFIG); diff --git a/apps/mis-web/src/pages/api/file/exportUser.ts b/apps/mis-web/src/pages/api/file/exportUser.ts index a2584c281e..3f04947de3 100644 --- a/apps/mis-web/src/pages/api/file/exportUser.ts +++ b/apps/mis-web/src/pages/api/file/exportUser.ts @@ -85,7 +85,7 @@ export default route(ExportUserSchema, async (req, res) => { const logInfo = { operatorUserId: info.identityId, operatorIp: parseIp(req) ?? "", - operationTypeName: OperationType.exportAccount, + operationTypeName: OperationType.exportUser, operationTypePayload:{ tenantName: selfTenant ? info.tenant : undefined, }, diff --git a/protos/server/export.proto b/protos/server/export.proto index dd31be1dbc..bad4b2631a 100644 --- a/protos/server/export.proto +++ b/protos/server/export.proto @@ -31,6 +31,9 @@ message ExportAccountRequest { optional bool frozen = 6; // 为true时表明账户在白名单中(状态不为冻结)或账户为未欠费账户即可以正常使用集群的账户，false则为所有账户 optional bool normal = 7; + // 为true时表明账户为已删除的账户，false则为所有账户 + optional bool deleted = 8; + optional string owner_id_or_name = 9; } message ExportAccountResponse { From efa2748e10a5ba701a05beb2f97f033d1504e114 Mon Sep 17 00:00:00 2001 From: valign Date: Mon, 5 Aug 2024 02:47:36 +0000 Subject: [PATCH 10/20] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=B4=A6=E6=88=B7=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C?= =?UTF-8?q?UI=E5=B1=8F=E8=94=BD=E4=B8=8E=E8=B4=A6=E6=88=B7=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=8B=A5=E6=9C=89=E8=80=85=E4=BB=A5=E5=A4=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/services/account.ts | 57 +++++++------ apps/mis-server/src/services/user.ts | 31 +++---- apps/mis-web/src/apis/api.mock.ts | 4 + apps/mis-web/src/models/UserSchemaModel.ts | 3 +- .../pageComponents/admin/AllUsersTable.tsx | 82 +++++++++++-------- protos/server/user.proto | 2 +- 6 files changed, 107 insertions(+), 72 deletions(-) diff --git a/apps/mis-server/src/services/account.ts b/apps/mis-server/src/services/account.ts index 0599e732fb..b08be3d0a8 100644 --- a/apps/mis-server/src/services/account.ts +++ b/apps/mis-server/src/services/account.ts @@ -17,6 +17,7 @@ import { ServiceError } from "@grpc/grpc-js"; import { Status } from "@grpc/grpc-js/build/src/constants"; import { LockMode, UniqueConstraintViolationException } from "@mikro-orm/core"; import { createAccount } from "@scow/lib-auth"; +import { removeUserFromAccount } from "@scow/lib-auth"; import { Decimal, decimalToMoney, moneyToNumber } from "@scow/lib-decimal"; import { account_AccountStateFromJSON, AccountServiceServer, AccountServiceService, BlockAccountResponse_Result } from "@scow/protos/build/server/account"; @@ -30,6 +31,7 @@ import { User } from "src/entities/User"; import { UserAccount, UserRole as EntityUserRole, UserStatus } from "src/entities/UserAccount"; import { callHook } from "src/plugins/hookClient"; import { getAccountStateInfo } from "src/utils/accountUserState"; +import { countSubstringOccurrences } from "src/utils/countSubstringOccurrences"; import { toRef } from "src/utils/orm"; export const accountServiceServer = plugin((server) => { @@ -509,7 +511,7 @@ export const accountServiceServer = plugin((server) => { } const account = await em.findOne(Account, { accountName, - tenant: { name: tenantName } }, { populate: ["tenant"]}); + tenant: { name: tenantName } }, { populate: ["tenant","users","users.user"]}); if (!account) { throw { @@ -517,8 +519,7 @@ export const accountServiceServer = plugin((server) => { } as ServiceError; } - console.log("这里是deleteAccount的account",account); - + const userAccounts = account.users.getItems(); const currentActivatedClusters = await getActivatedClusters(em, logger); // 查询账户是否有RUNNING、PENDING的作业与交互式应用，有则抛出异常 const runningJobs = await server.ext.clusters.callOnAll( @@ -544,27 +545,35 @@ export const accountServiceServer = plugin((server) => { // 处理用户账户关系表，删除账户与所有用户的关系 const hasCapabilities = server.ext.capabilities.accountUserRelation; - // for (const userAccount of accountItems) { - // console.log("单个userAccount",PFUserRole[userAccount.role] === PFUserRole.OWNER); - // const accountName = userAccount.account.getEntity().accountName; - // await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { - // return await asyncClientCall(client.user, "removeUserFromAccount", - // { userId, accountName }); - // }).catch(async (e) => { - // // 如果每个适配器返回的Error都是NOT_FOUND，说明所有集群均已将此用户移出账户，可以在scow数据库及认证系统中删除该条关系， - // // 除此以外，都抛出异常 - // if (countSubstringOccurrences(e.details, "Error: 5 NOT_FOUND") - // !== Object.keys(currentActivatedClusters).length) { - // throw e; - // } - // }); - // await em.removeAndFlush(userAccount); - // if (hasCapabilities) { - // await removeUserFromAccount(authUrl, { accountName, userId }, logger); - // } - // } - - // await em.flush(); + for (const userAccount of userAccounts) { + const userId = userAccount.user.getEntity().userId; + if (userAccount.role === EntityUserRole.OWNER) { + continue; + } + await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { + return await asyncClientCall(client.user, "removeUserFromAccount", + { userId, accountName }); + }).catch(async (e) => { + // 如果每个适配器返回的Error都是NOT_FOUND，说明所有集群均已将此用户移出账户，可以在scow数据库及认证系统中删除该条关系， + // 除此以外，都抛出异常 + if (countSubstringOccurrences(e.details, "Error: 5 NOT_FOUND") + !== Object.keys(currentActivatedClusters).length) { + throw e; + } + }); + await em.removeAndFlush(userAccount); + if (hasCapabilities) { + await removeUserFromAccount(authUrl, { accountName, userId }, logger); + } + } + + if (account.whitelist) { + em.remove(account.whitelist); + account.whitelist = undefined; + } + + account.state = AccountState.DELETED; + await em.flush(); return [{}]; }); diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index b475f15154..c487d65800 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -35,7 +35,7 @@ import { import { blockUserInAccount, unblockUserInAccount } from "src/bl/block"; import { getActivatedClusters } from "src/bl/clustersUtils"; import { authUrl } from "src/config"; -import { Account } from "src/entities/Account"; +import { Account,AccountState } from "src/entities/Account"; import { Tenant } from "src/entities/Tenant"; import { PlatformRole, TenantRole, User, UserState } from "src/entities/User"; import { UserAccount, UserRole, UserStateInAccount, UserStatus } from "src/entities/UserAccount"; @@ -518,20 +518,20 @@ export const userServiceServer = plugin((server) => { throw { code: Status.NOT_FOUND, message: `User ${userId} is not found.` } as ServiceError; } - const accountItems = user.accounts.getItems(); + const userAccounts = user.accounts.getItems(); // 这里商量是不要管有没有封锁直接删，但要不要先封锁了再删？ - // 如果用户为账户拥有者，提示管理员需要先删除拥有的账户再删除用户 + // 如果用户为账户拥有者且该用户没有被删除，提示管理员需要先删除拥有的账户再删除用户 const countAccountOwner = async () => { - const ownedAccounts: string[] = []; - - for (const userAccount of accountItems) { - if (PFUserRole[userAccount.role] === PFUserRole.OWNER) { + const ownedAccounts = userAccounts + .filter((userAccount) => PFUserRole[userAccount.role] === PFUserRole.OWNER) + .map((userAccount) => { const account = userAccount.account.getEntity(); - const { accountName } = account; - ownedAccounts.push(accountName); - } - } + const { accountName, state } = account; + return state !== AccountState.DELETED ? accountName : null; + }) + .filter((accountName) => accountName !== null); + return ownedAccounts; }; @@ -578,11 +578,13 @@ export const userServiceServer = plugin((server) => { } as ServiceError; } - // 处理用户账户关系表，删除用户与所有账户的关系 + // 处理用户账户关系表，删除用户与除其拥有的所有账户的关系 const hasCapabilities = server.ext.capabilities.accountUserRelation; - for (const userAccount of accountItems) { - console.log("单个userAccount", PFUserRole[userAccount.role] === PFUserRole.OWNER); + for (const userAccount of userAccounts) { + if (PFUserRole[userAccount.role] === PFUserRole.OWNER) { + continue; + } const accountName = userAccount.account.getEntity().accountName; await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { return await asyncClientCall(client.user, "removeUserFromAccount", @@ -723,6 +725,7 @@ export const userServiceServer = plugin((server) => { tenantName: x.tenant.$.name, createTime: x.createTime.toISOString(), platformRoles: x.platformRoles.map(platformRoleFromJSON), + state:userStateFromJSON(x.state), })), }]; }, diff --git a/apps/mis-web/src/apis/api.mock.ts b/apps/mis-web/src/apis/api.mock.ts index dae6db3f9f..50d652e67a 100644 --- a/apps/mis-web/src/apis/api.mock.ts +++ b/apps/mis-web/src/apis/api.mock.ts @@ -162,6 +162,7 @@ export const mockApi: MockApi = { tenantName: "tenant1", createTime: "2022-10-05T23:49:50.000Z", platformRoles: [PlatformRole.PLATFORM_FINANCE, PlatformRole.PLATFORM_ADMIN], + state:UserState.NORMAL, }, { userId: "test01", @@ -171,6 +172,7 @@ export const mockApi: MockApi = { tenantName: "tenant2", createTime: "2022-10-05T23:49:50.000Z", platformRoles: [PlatformRole.PLATFORM_FINANCE, PlatformRole.PLATFORM_ADMIN], + state:UserState.NORMAL, }, { userId: "test02", @@ -180,6 +182,7 @@ export const mockApi: MockApi = { tenantName: "tenant2", createTime: "2022-10-05T23:49:50.000Z", platformRoles: [PlatformRole.PLATFORM_FINANCE], + state:UserState.NORMAL, }, { userId: "test03", @@ -189,6 +192,7 @@ export const mockApi: MockApi = { tenantName: "tenant2", createTime: "2022-10-05T23:49:50.000Z", platformRoles: [], + state:UserState.DELETED, }, ], diff --git a/apps/mis-web/src/models/UserSchemaModel.ts b/apps/mis-web/src/models/UserSchemaModel.ts index 9077dcd232..50e5c1b980 100644 --- a/apps/mis-web/src/models/UserSchemaModel.ts +++ b/apps/mis-web/src/models/UserSchemaModel.ts @@ -13,7 +13,7 @@ import { Static, Type } from "@sinclair/typebox"; import { AccountState, ClusterAccountInfo_ImportStatus, DisplayedAccountState, DisplayedUserState, PlatformRole, - TenantRole, UserRole, UserStateInAccount, UserStatus } from "./User"; + TenantRole, UserRole, UserState,UserStateInAccount, UserStatus } from "./User"; // 这个Model重新用typebox定义了 // 定义Schema时无法复用的@scow/protos/build/server中的interface @@ -43,6 +43,7 @@ export const PlatformUserInfo = Type.Object({ tenantName: Type.String(), createTime: Type.Optional(Type.String()), platformRoles: Type.Array(Type.Enum(PlatformRole)), + state: Type.Optional(Type.Enum(UserState)), }); export type PlatformUserInfo = Static; diff --git a/apps/mis-web/src/pageComponents/admin/AllUsersTable.tsx b/apps/mis-web/src/pageComponents/admin/AllUsersTable.tsx index f4a1cdf475..811ae37b3a 100644 --- a/apps/mis-web/src/pageComponents/admin/AllUsersTable.tsx +++ b/apps/mis-web/src/pageComponents/admin/AllUsersTable.tsx @@ -19,11 +19,12 @@ import React, { useCallback, useMemo, useState } from "react"; import { useAsync } from "react-async"; import { api } from "src/apis"; import { ChangePasswordModalLink } from "src/components/ChangePasswordModal"; +import { DisabledA } from "src/components/DisabledA"; import { FilterFormContainer, FilterFormTabs } from "src/components/FilterFormContainer"; import { PlatformRoleSelector } from "src/components/PlatformRoleSelector"; import { prefix, useI18n, useI18nTranslateToString } from "src/i18n"; import { Encoding } from "src/models/exportFile"; -import { PlatformRole, SortDirectionType, UsersSortFieldType } from "src/models/User"; +import { PlatformRole, SortDirectionType, UsersSortFieldType, UserState } from "src/models/User"; import { ExportFileModaLButton } from "src/pageComponents/common/exportFileModal"; import { MAX_EXPORT_COUNT, urlToExport } from "src/pageComponents/file/apis"; import { type GetAllUsersSchema } from "src/pages/api/admin/getAllUsers"; @@ -60,6 +61,7 @@ type FilteredRole = keyof typeof filteredRoles; const p = prefix("pageComp.admin.allUserTable."); const pCommon = prefix("common."); +const pDelete = prefix("component.deleteModals."); export const AllUsersTable: React.FC = ({ refreshToken, user }) => { @@ -315,37 +317,53 @@ const UserInfoTable: React.FC = ({ title={t(pCommon("operation"))} render={(_, r) => ( }> - { - await api.changePasswordAsPlatformAdmin({ - body: { - identityId: r.userId, - newPassword: newPassword, - }, - }) - .httpError(404, () => { message.error(t(p("notExist"))); }) - .httpError(501, () => { message.error(t(p("notAvailable"))); }) - .httpError(400, (e) => { - if (e.code === "PASSWORD_NOT_VALID") { - message.error(getRuntimeI18nConfigText(languageId, "passwordPatternMessage")); - }; - }) - .then(() => { message.success(t(p("success"))); }) - .catch(() => { message.error(t(p("fail"))); }); - }} - > - {t(p("changePassword"))} - - - {t(p("changeTenant"))} - + { + r.state === UserState.DELETED ? ( + + {t(p("changePassword"))} + + ) : + ( + { + await api.changePasswordAsPlatformAdmin({ + body: { + identityId: r.userId, + newPassword: newPassword, + }, + }) + .httpError(404, () => { message.error(t(p("notExist"))); }) + .httpError(501, () => { message.error(t(p("notAvailable"))); }) + .httpError(400, (e) => { + if (e.code === "PASSWORD_NOT_VALID") { + message.error(getRuntimeI18nConfigText(languageId, "passwordPatternMessage")); + }; + }) + .then(() => { message.success(t(p("success"))); }) + .catch(() => { message.error(t(p("fail"))); }); + }} + > + {t(p("changePassword"))} + + )} + { + r.state === UserState.DELETED ? ( + + {t(p("changeTenant"))} + + ) : ( + + {t(p("changeTenant"))} + + ) + } )} /> diff --git a/protos/server/user.proto b/protos/server/user.proto index 7221983606..9caf388d12 100644 --- a/protos/server/user.proto +++ b/protos/server/user.proto @@ -275,7 +275,6 @@ message GetUserInfoResponse { string tenant_name = 5; string email = 6; google.protobuf.Timestamp create_time = 7; - } message GetUsersResponse { @@ -290,6 +289,7 @@ message PlatformUserInfo { google.protobuf.Timestamp create_time = 5; repeated PlatformRole platform_roles = 6; string email = 7; + optional UserState state = 8; } enum SortDirection { From 82fd7d25abc975157a29ac628d7b6163c48a3010 Mon Sep 17 00:00:00 2001 From: valign Date: Tue, 6 Aug 2024 03:41:24 +0000 Subject: [PATCH 11/20] =?UTF-8?q?feat(mis&auth):=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8A=A5=E9=94=99=E4=BC=98=E5=8C=96,?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=B3=BB=E7=BB=9F=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7shell=E4=B8=BAnologin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/auth/config/auth.yml | 1 + apps/auth/src/auth/AuthProvider.ts | 2 + apps/auth/src/auth/ldap/delete.ts | 68 +++++++++++++++++++ apps/auth/src/auth/ldap/helpers.ts | 3 +- apps/auth/src/auth/ldap/index.ts | 13 ++++ apps/auth/src/auth/ldap/postHandler.ts | 2 +- apps/auth/src/auth/ssh/index.ts | 1 + apps/auth/src/config/auth.ts | 1 + apps/auth/src/routes/capabilities.ts | 2 + apps/auth/src/routes/deleteUser.ts | 60 ++++++++++++++++ apps/auth/src/routes/index.ts | 2 + apps/cli/assets/init-full/config/auth.yml | 2 + apps/cli/assets/init/config/auth.yml | 1 + apps/mis-server/src/services/user.ts | 28 +++++++- apps/mis-server/tests/setup.ts | 6 +- .../pageComponents/tenant/AdminUserTable.tsx | 12 ++++ apps/mis-web/src/pages/api/users/delete.ts | 19 +++++- .../scow/scow-deployment/config/auth.yml | 2 + libs/auth/src/deleteUser.ts | 27 ++++++++ libs/auth/src/getCapabilities.ts | 1 + libs/auth/src/index.ts | 1 + 21 files changed, 247 insertions(+), 7 deletions(-) create mode 100644 apps/auth/src/auth/ldap/delete.ts create mode 100644 apps/auth/src/routes/deleteUser.ts create mode 100644 libs/auth/src/deleteUser.ts diff --git a/apps/auth/config/auth.yml b/apps/auth/config/auth.yml index bfaff7627c..4527eb0dbe 100644 --- a/apps/auth/config/auth.yml +++ b/apps/auth/config/auth.yml @@ -78,6 +78,7 @@ ldap: uid: uid name: cn mail: mail + loginShell: loginShell ssh: baseNode: localhost:22222 diff --git a/apps/auth/src/auth/AuthProvider.ts b/apps/auth/src/auth/AuthProvider.ts index 4ed0d1b704..59efd71a7f 100644 --- a/apps/auth/src/auth/AuthProvider.ts +++ b/apps/auth/src/auth/AuthProvider.ts @@ -27,6 +27,7 @@ export type CreateUserResult = "AlreadyExists" | "OK"; export type ChangePasswordResult = "NotFound" | "OK"; export type CheckPasswordResult = "NotFound" | "Match" | "NotMatch"; export type ChangeEmailResult = "NotFound" | "OK"; +export type DeleteUserResult = "NotFound" | "OK" | "Faild"; export interface UserInfo { identityId: string; @@ -46,4 +47,5 @@ export interface AuthProvider { => Promise); changeEmail: undefined | ((id: string, newEmail: string, req: FastifyRequest) => Promise); + deleteUser: undefined | ((identityId: string, req: FastifyRequest) => Promise); } diff --git a/apps/auth/src/auth/ldap/delete.ts b/apps/auth/src/auth/ldap/delete.ts new file mode 100644 index 0000000000..5b6ddf8098 --- /dev/null +++ b/apps/auth/src/auth/ldap/delete.ts @@ -0,0 +1,68 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +/** + * References + * https://datatracker.ietf.org/doc/html/rfc3062 + * https://stackoverflow.com/questions/65745679/how-do-i-pass-parameters-to-the-ldapjs-exop-function + */ + +import { FastifyBaseLogger } from "fastify"; +import ldapjs from "ldapjs"; +import { useLdap } from "src/auth/ldap/helpers"; +import { LdapConfigSchema } from "src/config/auth"; +import { promisify } from "util"; + +function handleIfInvalidCredentials(e: any) { + if (e.message === "Invalid Credentials") { + return false; + } else { + throw e; + } +} + +export async function modifyNoLoginBase( + userId: string, client: ldapjs.Client, +): Promise { + + try { + const modify = promisify(client.modify.bind(client)); + await modify(userId, new ldapjs.Change({ + operation: "replace", + modification: { + "loginShell": "/sbin/nologin", + }, + }), + ); + return true; + + } catch (e: any) { + return handleIfInvalidCredentials(e); + } +} + +export async function modifyNoLogin( + log: FastifyBaseLogger, + ldap: LdapConfigSchema, + userDn: string, +): Promise { + try { + + return await useLdap(log, ldap)(async (client) => { + + await modifyNoLoginBase(userDn, client); + return true; + }); + } catch (e: any) { + return handleIfInvalidCredentials(e); + } +} diff --git a/apps/auth/src/auth/ldap/helpers.ts b/apps/auth/src/auth/ldap/helpers.ts index e99ce77e1c..36130b850c 100644 --- a/apps/auth/src/auth/ldap/helpers.ts +++ b/apps/auth/src/auth/ldap/helpers.ts @@ -132,8 +132,9 @@ export const extractUserInfoFromEntry = ( const name = config.attrs.name ? takeOne(extractAttr(entry, config.attrs.name)) : undefined; const mail = config.attrs.mail ? takeOne(extractAttr(entry, config.attrs.mail)) : undefined; + const loginShell = config.attrs.loginShell ? takeOne(extractAttr(entry, config.attrs.loginShell)) : undefined; - return { identityId, name, mail }; + return { identityId, name, mail, loginShell }; }; export function takeOne(val: string | string[] | undefined) { diff --git a/apps/auth/src/auth/ldap/index.ts b/apps/auth/src/auth/ldap/index.ts index a53aed3a21..695717d8b9 100644 --- a/apps/auth/src/auth/ldap/index.ts +++ b/apps/auth/src/auth/ldap/index.ts @@ -13,6 +13,7 @@ import { FastifyInstance } from "fastify"; import { AuthProvider } from "src/auth/AuthProvider"; import { createUser } from "src/auth/ldap/createUser"; +import { modifyNoLogin } from "src/auth/ldap/delete"; import { modifyEmailAsSelf } from "src/auth/ldap/email"; import { findUser, useLdap } from "src/auth/ldap/helpers"; import { checkPassword, modifyPassword } from "src/auth/ldap/password"; @@ -70,6 +71,18 @@ export const createLdapAuthProvider = (f: FastifyInstance) => { return result ? "OK" : "Wrong"; }); }, + deleteUser: async (identityId, req) => { + return useLdap(req.log, ldap)(async (client) => { + const user = await findUser(req.log, ldap, client, identityId); + if (!user) { + return "NotFound"; + } + + const result = await modifyNoLogin(req.log, ldap, user.dn); + + return result ? "OK" : "Faild"; + }); + }, } as AuthProvider; }; diff --git a/apps/auth/src/auth/ldap/postHandler.ts b/apps/auth/src/auth/ldap/postHandler.ts index 01366b791d..74e4875d42 100644 --- a/apps/auth/src/auth/ldap/postHandler.ts +++ b/apps/auth/src/auth/ldap/postHandler.ts @@ -58,7 +58,7 @@ export function registerPostHandler(f: FastifyInstance, ldapConfig: LdapConfigSc const user = await findUser(logger, ldapConfig, client, username); - if (!user) { + if (!user || user.loginShell === "/sbin/nologin") { // 用户删除即禁止用户登录后视为不存在该用户 logger.info("Didn't find user with %s=%s", ldapConfig.attrs.uid, username); await serveLoginHtml(true, callbackUrl, req, res); return; diff --git a/apps/auth/src/auth/ssh/index.ts b/apps/auth/src/auth/ssh/index.ts index 64ba2e2845..7ee84916cf 100644 --- a/apps/auth/src/auth/ssh/index.ts +++ b/apps/auth/src/auth/ssh/index.ts @@ -77,6 +77,7 @@ export const createSshAuthProvider = (f: FastifyInstance) => { changePassword: undefined, checkPassword: undefined, changeEmail: undefined, + deleteUser: undefined, } satisfies AuthProvider; }; diff --git a/apps/auth/src/config/auth.ts b/apps/auth/src/config/auth.ts index 440e17eb16..69e28418c7 100644 --- a/apps/auth/src/config/auth.ts +++ b/apps/auth/src/config/auth.ts @@ -137,6 +137,7 @@ export const LdapConfigSchema = Type.Object({ 3. 管理系统添加用户时，不验证ID与姓名是否匹配 ` })), mail: Type.Optional(Type.String({ description: "LDAP中对应用户的邮箱的属性名。可不填。此字段只用于在创建用户的时候把邮件信息填入LDAP。" })), + loginShell: Type.Optional(Type.String({ description: "LDAP中对应用户在 Unix/Linux 系统上的默认shel。当前仅用于判断用户是否被禁止登录" })), }, { description: "属性映射" }), }, { description: "LDAP配置" }); diff --git a/apps/auth/src/routes/capabilities.ts b/apps/auth/src/routes/capabilities.ts index 41275a431d..f4d9ced79f 100644 --- a/apps/auth/src/routes/capabilities.ts +++ b/apps/auth/src/routes/capabilities.ts @@ -20,6 +20,7 @@ const CapabilitiesSchema = Type.Object({ getUser: Type.Optional(Type.Boolean({ description: "是否可以查询用户" })), accountUserRelation: Type.Optional(Type.Boolean({ description: "是否可以管理账户用户关系" })), checkPassword: Type.Optional(Type.Boolean({ description: "是否可以验证密码" })), + deleteUser: Type.Optional(Type.Boolean({ description: "是否可以删除用户" })), }); export type Capabilities = Static; @@ -51,6 +52,7 @@ export const getCapabilitiesRoute = fp(async (f) => { changeEmail: provider.changeEmail !== undefined, getUser: provider.getUser !== undefined, accountUserRelation: false, + deleteUser: provider.deleteUser !== undefined, }; }, ); diff --git a/apps/auth/src/routes/deleteUser.ts b/apps/auth/src/routes/deleteUser.ts new file mode 100644 index 0000000000..ad3c9f5298 --- /dev/null +++ b/apps/auth/src/routes/deleteUser.ts @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +import { Static, Type } from "@sinclair/typebox"; +import fp from "fastify-plugin"; +import { DeleteUserResult } from "src/auth/AuthProvider"; + +const QuerystringSchema = Type.Object({ + identityId: Type.String({ description: "用户ID" }), +}); + +const ResponsesSchema = Type.Object({ + 204: Type.Null({ description: "删除成功" }), + 404: Type.Null({ description: "未找到该用户" }), + 501: Type.Null({ description: "不支持ldap禁止用户登录" }), +}); + +const codes: Record = { + NotFound: 404, + OK: 204, + Faild: 501, +}; + +/** + * 删除用户，其实是改变用户状态 + */ +export const deleteUserRoute = fp(async (f) => { + f.delete<{ + Querystring: Static + Responses: Static, + }>( + "/user/delete", + { + schema: { + querystring: QuerystringSchema, + response: ResponsesSchema.properties, + }, + }, + async (req, rep) => { + if (!f.auth.deleteUser) { + return await rep.code(501).send({ code: "NOT_SUPPORTED" }); + } + + const { identityId } = req.query; + + const result = await f.auth.deleteUser(identityId, req); + + return await rep.status(codes[result]).send(null); + }, + ); +}); diff --git a/apps/auth/src/routes/index.ts b/apps/auth/src/routes/index.ts index 6dfecd411d..7b0cb85e4a 100644 --- a/apps/auth/src/routes/index.ts +++ b/apps/auth/src/routes/index.ts @@ -15,6 +15,7 @@ import { changeEmailRoute } from "src/routes/changeEmail"; import { changePasswordRoute } from "src/routes/changePassword"; import { checkPasswordRoute } from "src/routes/checkPassword"; import { createUserRoute } from "src/routes/createUser"; +import { deleteUserRoute } from "src/routes/deleteUser"; import { getUserRoute } from "src/routes/getUser"; import { logoutRoute } from "src/routes/logout"; @@ -33,4 +34,5 @@ export const routes = [ getUserRoute, changeEmailRoute, checkPasswordRoute, + deleteUserRoute, ]; diff --git a/apps/cli/assets/init-full/config/auth.yml b/apps/cli/assets/init-full/config/auth.yml index 4e7a1a76e6..63f50a8a4f 100644 --- a/apps/cli/assets/init-full/config/auth.yml +++ b/apps/cli/assets/init-full/config/auth.yml @@ -41,6 +41,8 @@ authType: ssh # # LDAP中对应用户的邮箱的属性名。可不填。此字段只用于在创建用户的时候把邮件信息填入LDAP。 # # mail: mail +# # LDAP中对应用户在 Unix/Linux 系统上的默认shel。当前仅用于判断用户是否被禁止登录。 +# # loginShell: loginShell # # 添加用户的相关配置。可不填，不填的话SCOW不支持创建用户。 # addUser: diff --git a/apps/cli/assets/init/config/auth.yml b/apps/cli/assets/init/config/auth.yml index e1b7d8be6c..4450451525 100644 --- a/apps/cli/assets/init/config/auth.yml +++ b/apps/cli/assets/init/config/auth.yml @@ -14,6 +14,7 @@ ldap: uid: uid name: cn mail: mail + loginShell: loginShell addUser: userBase: "ou=People,ou=hpc,o=pku" diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index c487d65800..d04629e665 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -15,7 +15,8 @@ import { ensureNotUndefined, plugin } from "@ddadaal/tsgrpc-server"; import { ServiceError } from "@grpc/grpc-js"; import { Status } from "@grpc/grpc-js/build/src/constants"; import { QueryOrder, raw } from "@mikro-orm/core"; -import { addUserToAccount, changeEmail as libChangeEmail, createUser, getCapabilities, getUser, removeUserFromAccount, +import { addUserToAccount, changeEmail as libChangeEmail, createUser, deleteUser, + getCapabilities, getUser, removeUserFromAccount, } from "@scow/lib-auth"; import { decimalToMoney } from "@scow/lib-decimal"; @@ -602,10 +603,35 @@ export const userServiceServer = plugin((server) => { await removeUserFromAccount(authUrl, { accountName, userId }, logger); } } + const ldapCapabilities = await getCapabilities(authUrl); + if (ldapCapabilities.deleteUser) { + + await deleteUser(authUrl, + userId, server.logger) + .then(async (a: any) => { + console.log("从lib/auth返回了",a); + }) + .catch(async (e) => { + if (e.status === 404) { + throw { + code: Status.NOT_FOUND, + message: "User not found in LDAP." } as ServiceError; + } + throw { + code: Status.INTERNAL, + message: "Error nologin user in LDAP." } as ServiceError; + + }); + } else { + throw { + code: Status.UNAVAILABLE, + message: "No permission to delete user in LDAP." } as ServiceError; + } user.state = UserState.DELETED; await em.flush(); + return [{}]; }); }, diff --git a/apps/mis-server/tests/setup.ts b/apps/mis-server/tests/setup.ts index 19b3b3061e..4b4ad4379f 100644 --- a/apps/mis-server/tests/setup.ts +++ b/apps/mis-server/tests/setup.ts @@ -20,6 +20,10 @@ module.exports = async () => { changePassword: true, getUser: true, validateName: true, + deleteUser: true, + deleteAccount: true, })), + // deleteUser:jest.fn(async () => ({ identityId: "test" })), + // deleteAccount:jest.fn(async () => ({ accountName: "test" })), })); -}; \ No newline at end of file +}; diff --git a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx index a7af887e71..728a5dba1d 100644 --- a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx +++ b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx @@ -327,6 +327,18 @@ export const AdminUserTable: React.FC = ({ setFailedModalVisible(true); setFailedDeletedMessage({ type,userId,accounts }); reload(); + }).httpError(500, (e) => { + message.destroy("deleteUser"); + message.error({ + content: e.message, + duration: 4, + }); + }).httpError(501, (e) => { + message.destroy("deleteUser"); + message.error({ + content: e.message, + duration: 4, + }); }) .then(() => { message.destroy("deleteUser"); diff --git a/apps/mis-web/src/pages/api/users/delete.ts b/apps/mis-web/src/pages/api/users/delete.ts index 66fd854141..171b6a303a 100644 --- a/apps/mis-web/src/pages/api/users/delete.ts +++ b/apps/mis-web/src/pages/api/users/delete.ts @@ -13,6 +13,7 @@ import { typeboxRouteSchema } from "@ddadaal/next-typed-api-routes-runtime"; import { asyncClientCall } from "@ddadaal/tsgrpc-client"; import { status } from "@grpc/grpc-js"; +import { getCapabilities } from "@scow/lib-auth"; import { OperationType } from "@scow/lib-operation-log"; import { UserServiceClient } from "@scow/protos/build/server/user"; import { Type } from "@sinclair/typebox"; @@ -21,6 +22,7 @@ import { OperationResult } from "src/models/operationLog"; import { PlatformRole, TenantRole } from "src/models/User"; import { callLog } from "src/server/operationLog"; import { getClient } from "src/utils/client"; +import { runtimeConfig } from "src/utils/config"; import { route } from "src/utils/route"; import { handlegRPCError, parseIp } from "src/utils/server"; @@ -39,16 +41,26 @@ export const DeleteUserSchema = typeboxRouteSchema({ 404: Type.Object({ message: Type.String() }), // 不能移出有正在运行作业的用户，只能先封锁 409: Type.Object({ message: Type.String() }), - // 操作由于其他中止条件被中止 - 410: Type.Null(), + // ldap禁止用户登录失败 + 500: Type.Object({ message: Type.String() }), + /** 本功能在当前配置下不可用 */ + 501: Type.Object({ message: Type.String() }), }, }); export default /* #__PURE__*/route(DeleteUserSchema, async (req,res) => { + + const ldapCapabilities = await getCapabilities(runtimeConfig.AUTH_INTERNAL_URL); + if (!ldapCapabilities.deleteUser) { + return { 501: { message:"No permission to delete user in LDAP." } }; + } + const { userId, comments } = req.query; + const auth = authenticate((u) => (u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN) || u.tenantRoles.includes(TenantRole.TENANT_ADMIN)) && u.identityId !== userId); + const info = await auth(req, res); if (!info) { return; } @@ -76,7 +88,8 @@ export default /* #__PURE__*/route(DeleteUserSchema, async (req,res) => { .catch(handlegRPCError({ [status.NOT_FOUND]: (e) => ({ 404: { message: e.details } }), [status.FAILED_PRECONDITION]: (e) => ({ 409: { message: e.details } }), - [status.ABORTED]: () => ({ 410: null }), + [status.INTERNAL]: (e) => ({ 500: { message: e.details } }), + [status.UNAVAILABLE]: (e) => ({ 501:{ message: e.details } }), }, async () => await callLog(logInfo, OperationResult.FAIL), )); diff --git a/deploy/vagrant/scow/scow-deployment/config/auth.yml b/deploy/vagrant/scow/scow-deployment/config/auth.yml index 0134920ada..7fd152f494 100644 --- a/deploy/vagrant/scow/scow-deployment/config/auth.yml +++ b/deploy/vagrant/scow/scow-deployment/config/auth.yml @@ -36,6 +36,8 @@ ldap: # LDAP中对应用户的邮箱的属性名。可不填。此字段只用于在创建用户的时候把邮件信息填入LDAP。 mail: mail + # LDAP中对应用户在 Unix/Linux 系统上的默认shel。当前仅用于判断用户是否被禁止登录。 + loginShell: loginShell # 添加用户的相关配置。必填 addUser: # 增加用户节点时，把用户增加到哪个节点下 diff --git a/libs/auth/src/deleteUser.ts b/libs/auth/src/deleteUser.ts new file mode 100644 index 0000000000..23f43de85f --- /dev/null +++ b/libs/auth/src/deleteUser.ts @@ -0,0 +1,27 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +import { applicationJsonHeaders, logHttpErrorAndThrow } from "src/utils"; +import { Logger } from "ts-log"; + + +export async function deleteUser(authUrl: string, identityId: string, logger?: Logger) { + const resp = await fetch(authUrl + "/user/delete?identityId=" + identityId, { + method: "DELETE", + headers: applicationJsonHeaders, + }); + + if (resp.status !== 204) { + logHttpErrorAndThrow(resp, logger); + } +} + diff --git a/libs/auth/src/getCapabilities.ts b/libs/auth/src/getCapabilities.ts index 2ada90e9bf..081ab4d02e 100644 --- a/libs/auth/src/getCapabilities.ts +++ b/libs/auth/src/getCapabilities.ts @@ -19,6 +19,7 @@ export interface Capabilities { changeEmail?: boolean; getUser?: boolean; accountUserRelation?: boolean; + deleteUser?: boolean; } diff --git a/libs/auth/src/index.ts b/libs/auth/src/index.ts index 5551ad1a5d..5e81589af8 100644 --- a/libs/auth/src/index.ts +++ b/libs/auth/src/index.ts @@ -16,6 +16,7 @@ export { changePassword } from "./changePassword"; export { checkPassword } from "./checkPassword"; export { createUser } from "./createUser"; export { deleteToken } from "./deleteToken"; +export { deleteUser } from "./deleteUser"; export type { Capabilities } from "./getCapabilities"; export { getCapabilities } from "./getCapabilities"; export { getUser } from "./getUser"; From 3b6c1e80eebad7b624e6f4844bb2053d51f82d7f Mon Sep 17 00:00:00 2001 From: valign Date: Thu, 8 Aug 2024 08:17:07 +0000 Subject: [PATCH 12/20] =?UTF-8?q?feat(mis):=20=E4=BC=98=E5=8C=96=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=94=A8=E6=88=B7=E8=B4=A6=E6=88=B7=E7=9A=84httperror?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E8=B0=83=E5=BA=A6=E5=99=A8=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=99=A8=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=EF=BC=8C=E8=B4=A6=E6=88=B7=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E5=B7=B2=E5=88=A0=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/services/account.ts | 20 ++++++++++- apps/mis-server/src/services/user.ts | 36 ++++++++++++++++--- apps/mis-web/src/i18n/en.ts | 6 +++- apps/mis-web/src/i18n/zh_cn.ts | 6 +++- .../pageComponents/accounts/AccountTable.tsx | 3 +- .../pageComponents/tenant/AdminUserTable.tsx | 3 +- .../pageComponents/users/AddUserButton.tsx | 7 ++++ .../src/pages/api/tenant/deleteAccount.ts | 3 -- .../src/pages/api/users/addToAccount.ts | 14 ++++++-- dev/test-adapter/src/services/account.ts | 6 ++-- 10 files changed, 87 insertions(+), 17 deletions(-) diff --git a/apps/mis-server/src/services/account.ts b/apps/mis-server/src/services/account.ts index b08be3d0a8..ea0e196b3d 100644 --- a/apps/mis-server/src/services/account.ts +++ b/apps/mis-server/src/services/account.ts @@ -502,7 +502,6 @@ export const accountServiceServer = plugin((server) => { deleteAccount: async ({ request, em, logger }) => { return await em.transactional(async (em) => { const { accountName, tenantName, comment } = ensureNotUndefined(request, ["accountName", "tenantName"]); - console.log("deleteAccount后端 accountName, tenantName, comment ", accountName, tenantName, comment); const tenant = await em.findOne(Tenant, { name: tenantName }); @@ -519,6 +518,12 @@ export const accountServiceServer = plugin((server) => { } as ServiceError; } + if (account.state === AccountState.DELETED) { + throw { + code: Status.NOT_FOUND, message: `Account ${accountName} has been deleted`, + } as ServiceError; + } + const userAccounts = account.users.getItems(); const currentActivatedClusters = await getActivatedClusters(em, logger); // 查询账户是否有RUNNING、PENDING的作业与交互式应用，有则抛出异常 @@ -572,7 +577,20 @@ export const accountServiceServer = plugin((server) => { account.whitelist = undefined; } + await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { + return await asyncClientCall(client.account, "deleteAccount", + { accountName }); + }).catch(async (e) => { + // 如果每个适配器返回的Error都是NOT_FOUND，说明所有集群均已移出账户 + // 除此以外，都抛出异常 + if (countSubstringOccurrences(e.details, "Error: 5 NOT_FOUND") + !== Object.keys(currentActivatedClusters).length) { + throw e; + } + }); + account.state = AccountState.DELETED; + account.comment = account.comment + (comment ? " " + comment.trim() : ""); await em.flush(); return [{}]; diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index d04629e665..9b0f690057 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -187,6 +187,21 @@ export const userServiceServer = plugin((server) => { } as ServiceError; } + if (user.state === UserState.DELETED) { + throw { + code: Status.NOT_FOUND, + details: "USER_DELETED", + } as ServiceError; + } + + + if (account.state === AccountState.DELETED) { + throw { + code: Status.NOT_FOUND, + details: "ACCOUNT_DELETED", + } as ServiceError; + } + if (account.users.getItems().some((x) => x.user.getEntity().userId === userId)) { throw { code: Status.ALREADY_EXISTS, message: `User ${userId} already in the account ${accountName}.`, @@ -503,7 +518,6 @@ export const userServiceServer = plugin((server) => { deleteUser: async ({ request, em, logger }) => { return await em.transactional(async (em) => { const { userId, tenantName, deleteRemark } = ensureNotUndefined(request, ["userId", "tenantName"]); - console.log("deleteUser后端 userId, tenantName, deleteRemark ", userId, tenantName, deleteRemark); const tenant = await em.findOne(Tenant, { name: tenantName }); @@ -519,6 +533,10 @@ export const userServiceServer = plugin((server) => { throw { code: Status.NOT_FOUND, message: `User ${userId} is not found.` } as ServiceError; } + if (user.state === UserState.DELETED) { + throw { code: Status.NOT_FOUND, message: `User ${userId} has been deleted.` } as ServiceError; + } + const userAccounts = user.accounts.getItems(); // 这里商量是不要管有没有封锁直接删，但要不要先封锁了再删？ @@ -608,9 +626,6 @@ export const userServiceServer = plugin((server) => { await deleteUser(authUrl, userId, server.logger) - .then(async (a: any) => { - console.log("从lib/auth返回了",a); - }) .catch(async (e) => { if (e.status === 404) { throw { @@ -628,7 +643,20 @@ export const userServiceServer = plugin((server) => { message: "No permission to delete user in LDAP." } as ServiceError; } + await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { + return await asyncClientCall(client.user, "deleteUser", + { userId }); + }).catch(async (e) => { + // 如果每个适配器返回的Error都是NOT_FOUND，说明所有集群均已移出此用户 + // 除此以外，都抛出异常 + if (countSubstringOccurrences(e.details, "Error: 5 NOT_FOUND") + !== Object.keys(currentActivatedClusters).length) { + throw e; + } + }); + user.state = UserState.DELETED; + user.deleteRemark = deleteRemark?.trim(); await em.flush(); diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts index 93498728c3..63717117a2 100644 --- a/apps/mis-web/src/i18n/en.ts +++ b/apps/mis-web/src/i18n/en.ts @@ -270,7 +270,8 @@ export default { blockFail: "Account blocking failed!", delete:"Delete", - changeFail: "Modification failed", + deleteSuccess: "Account deleting successful!", + deleteFail: "Account deleting failed!", }, setBlockThresholdAmountModal: { setSuccess: "Set Successfully", @@ -659,6 +660,8 @@ export default { changeFail: "Modification failed", changePassword: "Change Password", delete:"Delete", + deleteFail: "Deletion failed", + deleteSuccess: "Deletion successful", }, jobPriceChangeModal: { tenantPrice: "Tenant Billing", @@ -687,6 +690,7 @@ export default { createModal: "seconds to open the create user interface", createFirst: "User does not exist. Please create a user first", addSuccess: "Added Successfully!", + userDeleted: "The user has been deleted and cannot be added", }, createUserForm: { email: "User Email", diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index 9ddf440826..17bdb92b1b 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -270,7 +270,8 @@ export default { blockFail: "封锁帐户失败！", delete:"删除", - changeFail:"修改失败", + deleteSuccess:"删除帐户成功", + deleteFail:"删除帐户失败", }, setBlockThresholdAmountModal: { setSuccess:"设置成功", @@ -659,6 +660,8 @@ export default { changeFail:"修改失败", changePassword:"修改密码", delete:"删除", + deleteFail:"删除失败", + deleteSuccess:"删除成功", }, jobPriceChangeModal:{ tenantPrice:"租户计费", @@ -687,6 +690,7 @@ export default { createModal:"秒后打开创建用户界面", createFirst:"用户不存在。请先创建用户", addSuccess:"添加成功！", + userDeleted:"该用户已删除，无法添加", }, createUserForm:{ email:"用户邮箱", diff --git a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx index fbdf4f44f7..ecd85c8083 100644 --- a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx +++ b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx @@ -485,10 +485,11 @@ export const AccountTable: React.FC = ({ reload(); }) .then(() => { + message.success(t(p("deleteSuccess"))); message.destroy("deleteAccount"); reload(); }) - .catch(() => { message.error(t(p("changeFail"))); }); + .catch(() => { message.error(t(p("deleteFail"))); }); }} > {t(p("delete"))} diff --git a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx index 728a5dba1d..2a87a9bc81 100644 --- a/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx +++ b/apps/mis-web/src/pageComponents/tenant/AdminUserTable.tsx @@ -342,9 +342,10 @@ export const AdminUserTable: React.FC = ({ }) .then(() => { message.destroy("deleteUser"); + message.success(t(p("deleteSuccess"))); reload(); }) - .catch(() => { message.error(t(p("changeFail"))); }); + .catch(() => { message.error(t(p("deleteFail"))); }); }} > {t(p("delete"))} diff --git a/apps/mis-web/src/pageComponents/users/AddUserButton.tsx b/apps/mis-web/src/pageComponents/users/AddUserButton.tsx index 91227dd8d0..24fc262025 100644 --- a/apps/mis-web/src/pageComponents/users/AddUserButton.tsx +++ b/apps/mis-web/src/pageComponents/users/AddUserButton.tsx @@ -143,6 +143,13 @@ export const AddUserButton: React.FC = ({ refresh, accountName, token, ca .httpError(409, (e) => { message.error(e.message); }) + .httpError(410, ({ code }) => { + if (code === "USER_DELETED") { + message.error(t(p("userDeleted"))); + } else { + message.error(code); + } + }) .then(() => { message.success(t(p("addSuccess"))); refresh(); diff --git a/apps/mis-web/src/pages/api/tenant/deleteAccount.ts b/apps/mis-web/src/pages/api/tenant/deleteAccount.ts index e7830801ba..4e30fb5805 100644 --- a/apps/mis-web/src/pages/api/tenant/deleteAccount.ts +++ b/apps/mis-web/src/pages/api/tenant/deleteAccount.ts @@ -39,8 +39,6 @@ export const DeleteAccountSchema = typeboxRouteSchema({ 404: Type.Object({ message: Type.String() }), // 不能移出有正在运行作业的用户，只能先封锁 409: Type.Object({ message: Type.String() }), - // 操作由于其他中止条件被中止 - 410: Type.Null(), }, }); @@ -74,7 +72,6 @@ export default /* #__PURE__*/route(DeleteAccountSchema, async (req,res) => { .catch(handlegRPCError({ [status.NOT_FOUND]: (e) => ({ 404: { message: e.details } }), [status.FAILED_PRECONDITION]: (e) => ({ 409: { message: e.details } }), - [status.ABORTED]: () => ({ 410: null }), }, async () => await callLog(logInfo, OperationResult.FAIL), )); diff --git a/apps/mis-web/src/pages/api/users/addToAccount.ts b/apps/mis-web/src/pages/api/users/addToAccount.ts index d8ba209138..cec1f00e25 100644 --- a/apps/mis-web/src/pages/api/users/addToAccount.ts +++ b/apps/mis-web/src/pages/api/users/addToAccount.ts @@ -60,6 +60,13 @@ export const AddUserToAccountSchema = typeboxRouteSchema({ message: Type.Optional(Type.String()), }), + /** 用户或账户已删除 */ + 410: Type.Object({ + code: Type.Union([ + Type.Literal("USER_DELETED"), + Type.Literal("ACCOUNT_DELETED"), + ]), + }), }, }); @@ -124,9 +131,12 @@ export default /* #__PURE__*/route(AddUserToAccountSchema, async (req, res) => { * */ return { 404: { code: "USER_ALREADY_EXIST_IN_OTHER_TENANT" as const } }; - } else { - + } else if (e.details === "ACCOUNT_OR_TENANT_NOT_FOUND") { return { 404: { code: "ACCOUNT_OR_TENANT_NOT_FOUND" as const } }; + } else if (e.details === "USER_DELETED") { + return { 410: { code: "USER_DELETED" as const } }; + } else { + return { 410: { code: "ACCOUNT_DELETED" as const } }; } }, }, diff --git a/dev/test-adapter/src/services/account.ts b/dev/test-adapter/src/services/account.ts index 5f3705da75..44f57cbe5e 100644 --- a/dev/test-adapter/src/services/account.ts +++ b/dev/test-adapter/src/services/account.ts @@ -60,8 +60,8 @@ export const accountServiceServer = plugin((server) => { return [{ blocked: true }]; }, - // deleteAccount:async () => { - // return [{}]; - // }, + deleteAccount: async () => { + return [{}]; + }, }); }); From 1e5e290f2ac03b34a52581af4981fbe70dce0de5 Mon Sep 17 00:00:00 2001 From: valign Date: Fri, 9 Aug 2024 07:41:47 +0000 Subject: [PATCH 13/20] =?UTF-8?q?feat(mis):=20=E8=87=AA=E8=A1=8C=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=94=A8=E6=88=B7=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E6=A0=87=E8=AF=86=E7=AC=A6=E5=90=8E=E7=BC=80=EF=BC=8C?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E5=B7=B2=E5=88=A0=E9=99=A4=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E7=AD=9B=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/services/user.ts | 7 ++- .../dashboard/AccountInfoSection.tsx | 59 ++++++++++--------- dev/vagrant/config/auth.yml | 3 + dev/vagrant/config/mis.yaml | 4 ++ libs/config/src/mis.ts | 3 + libs/protos/scheduler-adapter/package.json | 2 +- protos/server/user.proto | 12 ++++ 7 files changed, 58 insertions(+), 32 deletions(-) diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index 9b0f690057..dfd8630b71 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -22,7 +22,7 @@ import { addUserToAccount, changeEmail as libChangeEmail, createUser, deleteUser import { decimalToMoney } from "@scow/lib-decimal"; import { checkTimeZone, convertToDateMessage } from "@scow/lib-server/build/date"; import { - AccountStatus, + AccountState as PFAccountState, AccountStatus, accountUserInfo_UserStateInAccountFromJSON, GetAccountUsersResponse, platformRoleFromJSON, platformRoleToJSON, @@ -36,6 +36,7 @@ import { import { blockUserInAccount, unblockUserInAccount } from "src/bl/block"; import { getActivatedClusters } from "src/bl/clustersUtils"; import { authUrl } from "src/config"; +import { misConfig } from "src/config/mis"; import { Account,AccountState } from "src/entities/Account"; import { Tenant } from "src/entities/Tenant"; import { PlatformRole, TenantRole, User, UserState } from "src/entities/User"; @@ -123,6 +124,7 @@ export const userServiceServer = plugin((server) => { isInWhitelist: Boolean(account.whitelist), blockThresholdAmount:account.blockThresholdAmount ? decimalToMoney(account.blockThresholdAmount) : decimalToMoney(tenant.defaultAccountBlockThreshold), + accountState:PFAccountState["ACCOUNT_" + account.state], } as AccountStatus; return prev; }, {}); @@ -657,7 +659,8 @@ export const userServiceServer = plugin((server) => { user.state = UserState.DELETED; user.deleteRemark = deleteRemark?.trim(); - + const deletionMarker = misConfig?.deleteUser?.deletionMarker || ""; + user.name += deletionMarker; await em.flush(); return [{}]; diff --git a/apps/mis-web/src/pageComponents/dashboard/AccountInfoSection.tsx b/apps/mis-web/src/pageComponents/dashboard/AccountInfoSection.tsx index 2517c3953b..3df4d797a8 100644 --- a/apps/mis-web/src/pageComponents/dashboard/AccountInfoSection.tsx +++ b/apps/mis-web/src/pageComponents/dashboard/AccountInfoSection.tsx @@ -17,7 +17,7 @@ import React from "react"; import { Section } from "src/components/Section"; import { AccountStatCard } from "src/components/StatCard"; import { useI18nTranslateToString } from "src/i18n"; -import { UserStatus } from "src/models/User"; +import { AccountState,UserStatus } from "src/models/User"; import type { AccountInfo } from "src/pages/dashboard"; import { styled } from "styled-components"; @@ -65,34 +65,35 @@ export const AccountInfoSection: React.FC = ({ info }) => { ) : ( { - accounts.map(([accountName, { - accountBlocked, userStatus, balance, - jobChargeLimit, usedJobCharge, isInWhitelist, blockThresholdAmount, - }]) => { - - const isBlocked = accountBlocked || userStatus === UserStatus.BLOCKED; - const [ textColor, Icon, opacity] = isBlocked ? statusTexts.blocked : statusTexts.normal; - const availableLimit = jobChargeLimit && usedJobCharge - ? (moneyToNumber(jobChargeLimit) - moneyToNumber(usedJobCharge)).toFixed(2) - : undefined; - const whitelistCharge = isInWhitelist ? "不限" : undefined; - const normalCharge = (balance - blockThresholdAmount).toFixed(2); - const showAvailableBalance = availableLimit ?? whitelistCharge ?? normalCharge; - return ( - - }> - - ￥} - value={isBlocked ? "-" : showAvailableBalance} - /> - - - - ); - }) + accounts.filter((accountInfo) => accountInfo[1].accountState !== AccountState.DELETED) + .map(([accountName, { + accountBlocked, userStatus, balance, + jobChargeLimit, usedJobCharge, isInWhitelist, blockThresholdAmount, + }]) => { + + const isBlocked = accountBlocked || userStatus === UserStatus.BLOCKED; + const [ textColor, Icon, opacity] = isBlocked ? statusTexts.blocked : statusTexts.normal; + const availableLimit = jobChargeLimit && usedJobCharge + ? (moneyToNumber(jobChargeLimit) - moneyToNumber(usedJobCharge)).toFixed(2) + : undefined; + const whitelistCharge = isInWhitelist ? "不限" : undefined; + const normalCharge = (balance - blockThresholdAmount).toFixed(2); + const showAvailableBalance = availableLimit ?? whitelistCharge ?? normalCharge; + return ( + + }> + + ￥} + value={isBlocked ? "-" : showAvailableBalance} + /> + + + + ); + }) } ) diff --git a/dev/vagrant/config/auth.yml b/dev/vagrant/config/auth.yml index 01a56bbb0c..124d248330 100644 --- a/dev/vagrant/config/auth.yml +++ b/dev/vagrant/config/auth.yml @@ -95,6 +95,9 @@ ldap: # LDAP中对应用户的邮箱的属性名。可不填。此字段只用于在创建用户的时候把邮件信息填入LDAP。 mail: mail + # LDAP中对应用户在 Unix/Linux 系统上的默认shel。当前仅用于判断用户是否被禁止登录。 + loginShell: loginShell + # 添加用户的相关配置。必填 addUser: # 增加用户节点时，把用户增加到哪个节点下 diff --git a/dev/vagrant/config/mis.yaml b/dev/vagrant/config/mis.yaml index 29d882d31a..b6cc5be659 100644 --- a/dev/vagrant/config/mis.yaml +++ b/dev/vagrant/config/mis.yaml @@ -148,4 +148,8 @@ createUser: # en: "The billing for jobId {{ idJob }} of Cluster {{ cluster }}" # zh_cn: "集群 {{ cluster }} 的作业ID {{ idJob }} 的计费" +# 新增删除用户相关配置 +deleteUser: + # 删除标识,默认为"(已删除)" + deletionMarker: "(已删除)" diff --git a/libs/config/src/mis.ts b/libs/config/src/mis.ts index b527348383..85fdfe9d51 100644 --- a/libs/config/src/mis.ts +++ b/libs/config/src/mis.ts @@ -170,6 +170,9 @@ export const MisConfigSchema = Type.Object({ default: true, }), + deleteUser: Type.Optional(Type.Object({ + deletionMarker: Type.String({ description: "用户名删除标识", default: "(已删除)" }, + ) })), }); const MIS_CONFIG_NAME = "mis"; diff --git a/libs/protos/scheduler-adapter/package.json b/libs/protos/scheduler-adapter/package.json index bd64689159..df530881d5 100644 --- a/libs/protos/scheduler-adapter/package.json +++ b/libs/protos/scheduler-adapter/package.json @@ -5,7 +5,7 @@ "main": "build/index.js", "private": true, "scripts": { - "generate": "rimraf generated && buf generate --template buf.gen.yaml https://github.com/PKUHPC/scow-scheduler-adapter-interface.git#branch=feat-ai-release", + "generate": "rimraf generated && buf generate --template buf.gen.yaml https://github.com/PKUHPC/scow-scheduler-adapter-interface.git#branch=master", "build": "rimraf build && tsc" }, "files": [ diff --git a/protos/server/user.proto b/protos/server/user.proto index 9caf388d12..6fb62a7867 100644 --- a/protos/server/user.proto +++ b/protos/server/user.proto @@ -29,6 +29,17 @@ message GetUserStatusRequest { string user_id = 2; } +enum AccountState { + // 未封锁或未冻结，解封或激活时 + ACCOUNT_NORMAL = 0; + // 账户被手动冻结 + ACCOUNT_FROZEN = 1; + // 账户被上级手动封锁 + ACCOUNT_BLOCKED_BY_ADMIN = 2; + // 账户被删除 + ACCOUNT_DELETED = 3; +} + message AccountStatus { UserStatus user_status = 1; bool account_blocked = 2; @@ -37,6 +48,7 @@ message AccountStatus { common.Money balance = 5; optional bool is_in_whitelist = 6; common.Money block_threshold_amount = 7; + optional AccountState account_state = 8; } message GetUserStatusResponse { From bad690f50734544cbd9ac72f08cf9e63aaef9057 Mon Sep 17 00:00:00 2001 From: valign Date: Tue, 13 Aug 2024 06:28:33 +0000 Subject: [PATCH 14/20] =?UTF-8?q?feat(mis):=20=E5=88=A0=E9=99=A4=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E6=97=B6=EF=BC=8C=E5=8D=B3=E6=97=B6=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E8=8F=9C=E5=8D=95=E6=A0=8F=E5=B7=B2?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E8=B4=A6=E6=88=B7=EF=BC=8C=E9=98=B2?= =?UTF-8?q?=E6=AD=A2URL=E8=BF=9B=E5=85=A5=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=80=A0=E6=88=90=E7=A0=B4=E5=9D=8F=E6=80=A7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/services/charging.ts | 12 ++++++++- apps/mis-server/src/services/user.ts | 1 + apps/mis-web/src/i18n/en.ts | 1 + apps/mis-web/src/i18n/zh_cn.ts | 1 + apps/mis-web/src/layouts/routes.tsx | 2 +- apps/mis-web/src/models/User.ts | 15 ++++++----- .../pageComponents/accounts/AccountTable.tsx | 27 +++++++++++++++++-- .../src/pageComponents/finance/ChargeForm.tsx | 3 +++ .../pages/accounts/[accountName]/users.tsx | 6 ++++- apps/mis-web/src/pages/accounts/index.tsx | 5 +++- apps/mis-web/src/pages/api/finance/pay.ts | 3 ++- apps/mis-web/src/stores/UserStore.ts | 2 +- protos/server/user.proto | 1 + 13 files changed, 64 insertions(+), 15 deletions(-) diff --git a/apps/mis-server/src/services/charging.ts b/apps/mis-server/src/services/charging.ts index 8a178920e6..42e02d98cd 100644 --- a/apps/mis-server/src/services/charging.ts +++ b/apps/mis-server/src/services/charging.ts @@ -21,7 +21,7 @@ import { ChargeRecord as ChargeRecordProto, import { charge, pay } from "src/bl/charging"; import { getActivatedClusters } from "src/bl/clustersUtils"; import { misConfig } from "src/config/mis"; -import { Account } from "src/entities/Account"; +import { Account,AccountState } from "src/entities/Account"; import { ChargeRecord } from "src/entities/ChargeRecord"; import { PayRecord } from "src/entities/PayRecord"; import { Tenant } from "src/entities/Tenant"; @@ -92,6 +92,16 @@ export const chargingServiceServer = plugin((server) => { } + if (accountName && target) { // 是账户 + const { state } = target as Account; + if (state === AccountState.DELETED) { + throw { + code: status.FAILED_PRECONDITION, + message: `Account ${accountName} has been deleted`, + } as ServiceError; + } + } + const currentActivatedClusters = await getActivatedClusters(em, logger); return await pay({ diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index dfd8630b71..1ebec26ac8 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -735,6 +735,7 @@ export const userServiceServer = plugin((server) => { affiliations: user.accounts.getItems().map((x) => ({ accountName: x.account.getEntity().accountName, role: PFUserRole[x.role], + accountState: PFAccountState["ACCOUNT_" + x.account.getEntity().state] as PFAccountState, })), tenantName: user.tenant.$.name, name: user.name, diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts index 63717117a2..67c57c0042 100644 --- a/apps/mis-web/src/i18n/en.ts +++ b/apps/mis-web/src/i18n/en.ts @@ -406,6 +406,7 @@ export default { charging: "Charging...", notFound: "Account not found.", chargeFinished: "Charging finished!", + deleted:"Account has been deleted", }, chargeTable: { time: "Deduction Date", diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index 17bdb92b1b..b32a69c0c3 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -406,6 +406,7 @@ export default { charging:"充值中……", notFound:"账户未找到", chargeFinished:"充值完成！", + deleted:"账户已删除", }, chargeTable:{ time:"扣费日期", diff --git a/apps/mis-web/src/layouts/routes.tsx b/apps/mis-web/src/layouts/routes.tsx index fdc60a1a54..d462a1706d 100644 --- a/apps/mis-web/src/layouts/routes.tsx +++ b/apps/mis-web/src/layouts/routes.tsx @@ -360,7 +360,7 @@ export const accountAdminRoutes: (adminAccounts: AccountAffiliation[], t: TransT Icon: UserOutlined, text: t(pAccount("firstNav")), path: "/accounts", - children: accounts.map((x) => ({ + children: accounts.filter((x) => x.accountState !== 3).map((x) => ({ Icon: AccountBookOutlined, text: `${x.accountName}`, path: `/accounts/${x.accountName}`, diff --git a/apps/mis-web/src/models/User.ts b/apps/mis-web/src/models/User.ts index 60a4cab8a9..a01e0ad931 100644 --- a/apps/mis-web/src/models/User.ts +++ b/apps/mis-web/src/models/User.ts @@ -76,9 +76,17 @@ export enum ClusterAccountInfo_ImportStatus { HAS_NEW_USERS = 2, } +export const AccountState = { + NORMAL: 0, + FROZEN: 1, + BLOCKED_BY_ADMIN: 2, + DELETED: 3, +} as const; + export const AccountAffiliationSchema = Type.Object({ accountName: Type.String(), role: Type.Enum(UserRole), + accountState: Type.Optional(Type.Enum(AccountState)), }); @@ -137,13 +145,6 @@ export enum SearchType { TENANT = "TENANT", } -export const AccountState = { - NORMAL: 0, - FROZEN: 1, - BLOCKED_BY_ADMIN: 2, - DELETED: 3, -} as const; - export type AccountState = ValueOf; export const DisplayedAccountState = { diff --git a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx index ecd85c8083..d5e495f321 100644 --- a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx +++ b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx @@ -19,6 +19,7 @@ import { App, Button, Divider, Form, Input, Popover, Space, Table, Tag, Tooltip import { SortOrder } from "antd/es/table/interface"; import Link from "next/link"; import React, { useMemo, useState } from "react"; +import { useStore } from "simstate"; import { api } from "src/apis"; import { DeleteEntityFailedModal } from "src/components/DeleteEntityFailedModal"; import { DeleteEntityModalLink } from "src/components/DeleteEntityModal"; @@ -31,6 +32,7 @@ import { DeleteFailedReason,EntityType } from "src/models/User"; import { ExportFileModaLButton } from "src/pageComponents/common/exportFileModal"; import { MAX_EXPORT_COUNT, urlToExport } from "src/pageComponents/file/apis"; import type { AdminAccountInfo, GetAccountsSchema } from "src/pages/api/tenant/getAccounts"; +import { UserStore } from "src/stores/UserStore"; import { moneyToString } from "src/utils/money"; import { SetBlockThresholdAmountLink } from "./SetBlockThresholdAmountModal"; @@ -79,7 +81,7 @@ export const AccountTable: React.FC = ({ const [form] = Form.useForm(); const t = useI18nTranslateToString(); - + const userStore = useStore(UserStore); const DisplayedStateI18nTexts = getDisplayedStateI18nTexts(t); const [rangeSearchStatus, setRangeSearchStatus] = useState("ALL"); @@ -487,9 +489,30 @@ export const AccountTable: React.FC = ({ .then(() => { message.success(t(p("deleteSuccess"))); message.destroy("deleteAccount"); + + // 修改userStore中user的accountAffiliations，保证菜单栏已删除账户同步不显示 + const userInfo = userStore.user; + if (userInfo) { + const newAccountAffiliations = userInfo.accountAffiliations.map((acc) => { + if (acc.accountName === inputAccountName) { + return { ...acc, accountState: AccountState.DELETED }; + } + return acc; + }); + + // 使用 setUser 方法更新 userStore 中的用户信息 + userStore.setUser({ + ...userInfo, + accountAffiliations: newAccountAffiliations, + }); + } + reload(); }) - .catch(() => { message.error(t(p("deleteFail"))); }); + .catch(() => { + message.error(t(p("deleteFail"))); + message.destroy("deleteAccount"); + }); }} > {t(p("delete"))} diff --git a/apps/mis-web/src/pageComponents/finance/ChargeForm.tsx b/apps/mis-web/src/pageComponents/finance/ChargeForm.tsx index cbad1554f0..214666c01c 100644 --- a/apps/mis-web/src/pageComponents/finance/ChargeForm.tsx +++ b/apps/mis-web/src/pageComponents/finance/ChargeForm.tsx @@ -85,6 +85,9 @@ export const ChargeForm: React.FC = () => { .httpError(404, () => { message.error(t(p("notFound"))); }) + .httpError(410, () => { + message.error(t(p("deleted"))); + }) .then(() => { message.success(t(p("chargeFinished"))); form.resetFields(); diff --git a/apps/mis-web/src/pages/accounts/[accountName]/users.tsx b/apps/mis-web/src/pages/accounts/[accountName]/users.tsx index 5a6c346959..1477f3aceb 100644 --- a/apps/mis-web/src/pages/accounts/[accountName]/users.tsx +++ b/apps/mis-web/src/pages/accounts/[accountName]/users.tsx @@ -19,7 +19,7 @@ import { api } from "src/apis"; import { requireAuth } from "src/auth/requireAuth"; import { PageTitle } from "src/components/PageTitle"; import { prefix, useI18n, useI18nTranslateToString } from "src/i18n"; -import { UserRole } from "src/models/User"; +import { AccountState,UserRole } from "src/models/User"; import { useAccountPagesAccountName } from "src/pageComponents/accounts/checkQueryAccountNameIsAdmin"; import { AddUserButton } from "src/pageComponents/users/AddUserButton"; import { UserTable } from "src/pageComponents/users/UserTable"; @@ -39,6 +39,10 @@ export const UsersPage: NextPage = requireAuth( const account = userStore.user.accountAffiliations.find((x) => x.accountName === accountName)!; + // 已删除账户的用户管理返回空白屏蔽操作 + if (account.accountState === AccountState.DELETED) { + return null; + } const promiseFn = useCallback(async () => { return await api.getAccountUsers({ query: { accountName, diff --git a/apps/mis-web/src/pages/accounts/index.tsx b/apps/mis-web/src/pages/accounts/index.tsx index aae941bd55..3a42f7af65 100644 --- a/apps/mis-web/src/pages/accounts/index.tsx +++ b/apps/mis-web/src/pages/accounts/index.tsx @@ -17,6 +17,8 @@ import { Redirect } from "src/components/Redirect"; import { useI18nTranslateToString } from "src/i18n"; import { accountAdminRoutes } from "src/layouts/routes"; import { AccountAffiliation, UserRole } from "src/models/User"; +import { AccountState } from "src/models/User"; + interface Props { error: AuthResultError; @@ -38,7 +40,8 @@ export const FinanceIndexPage: NextPage = ({ error, adminAccounts }) => { }; -const auth = ssrAuthenticate((u) => u.accountAffiliations.some((x) => x.role !== UserRole.USER)); +const auth = ssrAuthenticate((u) => u.accountAffiliations.some((x) => x.role !== UserRole.USER + && x.accountState !== AccountState.DELETED)); export const getServerSideProps: GetServerSideProps = async (ctx) => { diff --git a/apps/mis-web/src/pages/api/finance/pay.ts b/apps/mis-web/src/pages/api/finance/pay.ts index 4625750e82..8478ab4b65 100644 --- a/apps/mis-web/src/pages/api/finance/pay.ts +++ b/apps/mis-web/src/pages/api/finance/pay.ts @@ -42,7 +42,7 @@ export const FinancePaySchema = typeboxRouteSchema({ }), // account is not found in current tenant. 404: Type.Null(), - + 410: Type.Null(), }, }); @@ -84,6 +84,7 @@ export default route(FinancePaySchema, return { 200: { balance: moneyToNumber(replyObj.currentBalance) } }; }).catch(handlegRPCError({ [Status.NOT_FOUND]: () => ({ 404: null }), + [Status.FAILED_PRECONDITION]: () => ({ 410: null }), }, async () => await callLog(logInfo, OperationResult.FAIL), )); diff --git a/apps/mis-web/src/stores/UserStore.ts b/apps/mis-web/src/stores/UserStore.ts index bd74629e2f..3b9d9fce42 100644 --- a/apps/mis-web/src/stores/UserStore.ts +++ b/apps/mis-web/src/stores/UserStore.ts @@ -41,5 +41,5 @@ export function UserStore(initialUser: User | undefined = undefined) { }); }, []); - return { loggedIn, user, logout }; + return { loggedIn, user, logout, setUser }; } diff --git a/protos/server/user.proto b/protos/server/user.proto index 6fb62a7867..c8529aac84 100644 --- a/protos/server/user.proto +++ b/protos/server/user.proto @@ -262,6 +262,7 @@ enum UserRole { message AccountAffiliation { string account_name = 1; UserRole role = 2; + optional AccountState account_state = 3; } enum PlatformRole { From f9aae1ab5c0aa7d7788ea52313acea653e593bb5 Mon Sep 17 00:00:00 2001 From: valign Date: Wed, 14 Aug 2024 08:48:44 +0000 Subject: [PATCH 15/20] =?UTF-8?q?feat(mis):=20=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E6=A2=B3=E7=90=86=E6=B6=89=E5=8F=8A=E8=B4=A6=E6=88=B7=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-server/src/services/account.ts | 34 ++++++++++++++----- apps/mis-server/src/services/charging.ts | 9 +++++ apps/mis-server/src/services/init.ts | 6 ++-- apps/mis-server/src/services/job.ts | 11 ++++-- apps/mis-server/src/services/tenant.ts | 7 ++-- apps/mis-server/src/services/user.ts | 25 +++++++------- apps/mis-web/src/i18n/en.ts | 4 +-- apps/mis-web/src/i18n/zh_cn.ts | 4 +-- .../tenant/JobPriceChangeModal.tsx | 8 +++++ .../pages/accounts/[accountName]/users.tsx | 6 +--- .../src/pages/api/admin/changeJobPrice.ts | 6 ++-- 11 files changed, 80 insertions(+), 40 deletions(-) diff --git a/apps/mis-server/src/services/account.ts b/apps/mis-server/src/services/account.ts index ea0e196b3d..67b4134bc9 100644 --- a/apps/mis-server/src/services/account.ts +++ b/apps/mis-server/src/services/account.ts @@ -27,13 +27,22 @@ import { authUrl } from "src/config"; import { Account, AccountState } from "src/entities/Account"; import { AccountWhitelist } from "src/entities/AccountWhitelist"; import { Tenant } from "src/entities/Tenant"; -import { User } from "src/entities/User"; +import { User, UserState } from "src/entities/User"; import { UserAccount, UserRole as EntityUserRole, UserStatus } from "src/entities/UserAccount"; import { callHook } from "src/plugins/hookClient"; import { getAccountStateInfo } from "src/utils/accountUserState"; import { countSubstringOccurrences } from "src/utils/countSubstringOccurrences"; import { toRef } from "src/utils/orm"; +function checkIfAccountDeleted(account: Account) { + if (account.state === AccountState.DELETED) { + throw { + code: Status.NOT_FOUND, + message: `Account ${account.accountName} has been deleted.`, + } as ServiceError; + } +} + export const accountServiceServer = plugin((server) => { server.addService(AccountServiceService, { @@ -51,6 +60,9 @@ export const accountServiceServer = plugin((server) => { } as ServiceError; } + // 检查账户是否已删除 + checkIfAccountDeleted(account); + const currentActivatedClusters = await getActivatedClusters(em, logger); const jobs = await server.ext.clusters.callOnAll( currentActivatedClusters, @@ -128,6 +140,8 @@ export const accountServiceServer = plugin((server) => { } as ServiceError; } + checkIfAccountDeleted(account); + if (!account.blockedInCluster) { throw { code: Status.FAILED_PRECONDITION, message: `Account ${accountName} is unblocked`, @@ -214,9 +228,9 @@ export const accountServiceServer = plugin((server) => { const { accountName, tenantName, ownerId, comment } = request; const user = await em.findOne(User, { userId: ownerId, tenant: { name: tenantName } }); - if (!user) { + if (!user || user.state === UserState.DELETED) { throw { - code: Status.NOT_FOUND, message: `User ${user} under tenant ${tenantName} does not exist`, + code: Status.NOT_FOUND, message: `User ${ownerId} under tenant ${tenantName} does not exist`, } as ServiceError; } @@ -371,6 +385,8 @@ export const accountServiceServer = plugin((server) => { } as ServiceError; } + checkIfAccountDeleted(account); + if (account.whitelist) { return [{ executed: false }]; } @@ -420,6 +436,9 @@ export const accountServiceServer = plugin((server) => { code: Status.NOT_FOUND, message: `Account ${accountName} is not found`, } as ServiceError; } + + checkIfAccountDeleted(account); + if (!account.whitelist) { return [{ executed: false }]; } @@ -465,6 +484,9 @@ export const accountServiceServer = plugin((server) => { code: Status.NOT_FOUND, message: `Account ${accountName} is not found`, } as ServiceError; } + + checkIfAccountDeleted(account); + account.blockThresholdAmount = blockThresholdAmount ? new Decimal(moneyToNumber(blockThresholdAmount)) : undefined; @@ -518,11 +540,7 @@ export const accountServiceServer = plugin((server) => { } as ServiceError; } - if (account.state === AccountState.DELETED) { - throw { - code: Status.NOT_FOUND, message: `Account ${accountName} has been deleted`, - } as ServiceError; - } + checkIfAccountDeleted(account); const userAccounts = account.users.getItems(); const currentActivatedClusters = await getActivatedClusters(em, logger); diff --git a/apps/mis-server/src/services/charging.ts b/apps/mis-server/src/services/charging.ts index 42e02d98cd..06663abcab 100644 --- a/apps/mis-server/src/services/charging.ts +++ b/apps/mis-server/src/services/charging.ts @@ -148,6 +148,15 @@ export const chargingServiceServer = plugin((server) => { } } + if (accountName && target) { // 是账户 + const { state } = target as Account; + if (state === AccountState.DELETED) { + throw { + code: status.NOT_FOUND, message: `Account ${accountName} has been deleted`, + } as ServiceError; + } + } + const currentActivatedClusters = await getActivatedClusters(em, logger); return await charge({ diff --git a/apps/mis-server/src/services/init.ts b/apps/mis-server/src/services/init.ts index 72c6bb86f8..114043793d 100644 --- a/apps/mis-server/src/services/init.ts +++ b/apps/mis-server/src/services/init.ts @@ -18,7 +18,7 @@ import { createUser } from "@scow/lib-auth"; import { InitServiceServer, InitServiceService } from "@scow/protos/build/server/init"; import { authUrl } from "src/config"; import { SystemState } from "src/entities/SystemState"; -import { PlatformRole, TenantRole, User } from "src/entities/User"; +import { PlatformRole, TenantRole, User, UserState } from "src/entities/User"; import { DEFAULT_TENANT_NAME } from "src/utils/constants"; import { createUserInDatabase, insertKeyToNewUser } from "src/utils/createUser"; import { userExists } from "src/utils/userExists"; @@ -98,7 +98,7 @@ export const initServiceServer = plugin((server) => { tenant: { name: DEFAULT_TENANT_NAME }, }); - if (!user) { + if (!user || user.state === UserState.DELETED) { throw { code: status.NOT_FOUND, message: `User ${request.userId} is not found in default tenant.`, @@ -124,7 +124,7 @@ export const initServiceServer = plugin((server) => { tenant: { name: DEFAULT_TENANT_NAME }, }); - if (!user) { + if (!user || user.state === UserState.DELETED) { throw { code: status.NOT_FOUND, message: `User ${request.userId} is not found in default tenant.`, diff --git a/apps/mis-server/src/services/job.ts b/apps/mis-server/src/services/job.ts index e3b38334f6..c65ed1549d 100644 --- a/apps/mis-server/src/services/job.ts +++ b/apps/mis-server/src/services/job.ts @@ -29,7 +29,7 @@ import { charge, pay } from "src/bl/charging"; import { getActivatedClusters } from "src/bl/clustersUtils"; import { createPriceMap, getActiveBillingItems } from "src/bl/PriceMap"; import { misConfig } from "src/config/mis"; -import { Account } from "src/entities/Account"; +import { Account, AccountState } from "src/entities/Account"; import { JobInfo as JobInfoEntity } from "src/entities/JobInfo"; import { JobPriceChange } from "src/entities/JobPriceChange"; import { AmountStrategy, JobPriceItem } from "src/entities/JobPriceItem"; @@ -157,11 +157,18 @@ export const jobServiceServer = plugin((server) => { if (!account) { throw { - code: status.INTERNAL, + code: status.NOT_FOUND, message: `Unknown account ${x.account} of job ${x.biJobIndex}`, } as ServiceError; } + if (account.state === AccountState.DELETED) { + throw { + code: status.NOT_FOUND, + message: `Account ${x.account} for job ${x.biJobIndex} has been deleted.`, + } as ServiceError; + } + const comment = `Record id ${record.id}, job biJobIndex ${x.biJobIndex}`; const metadataMap: ChargeRecord["metadata"] = {}; diff --git a/apps/mis-server/src/services/tenant.ts b/apps/mis-server/src/services/tenant.ts index 3e62552074..7f3d748d57 100644 --- a/apps/mis-server/src/services/tenant.ts +++ b/apps/mis-server/src/services/tenant.ts @@ -22,7 +22,7 @@ import { getActivatedClusters } from "src/bl/clustersUtils"; import { authUrl } from "src/config"; import { Account } from "src/entities/Account"; import { Tenant } from "src/entities/Tenant"; -import { TenantRole, User } from "src/entities/User"; +import { TenantRole, User, UserState } from "src/entities/User"; import { UserAccount } from "src/entities/UserAccount"; import { callHook } from "src/plugins/hookClient"; import { getAccountStateInfo } from "src/utils/accountUserState"; @@ -239,9 +239,10 @@ export const tenantServiceServer = plugin((server) => { const user = await em.findOne(User, { userId, name: userName }); - if (!user) { + if (!user || user.state === UserState.DELETED) { throw { - code: Status.NOT_FOUND, message: `User with userId ${userId} and name ${userName} is not found.`, + code: Status.NOT_FOUND, message: `User with userId ${userId} and name ${userName} + is either not found or has been deleted.`, } as ServiceError; } diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index 1ebec26ac8..1e22139fc4 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -788,7 +788,7 @@ export const userServiceServer = plugin((server) => { }]; }, - getUsersByIds: async ({ request, em }) => { + getUsersByIds: async ({ request, em }) => { // 操作日志调用，可以展示已删除 const { userIds } = request; const users = await em.find(User, { userId: { $in: userIds } }); @@ -832,7 +832,7 @@ export const userServiceServer = plugin((server) => { const user = await em.findOne(User, { userId: userId }); - if (!user) { + if (!user || user.state == UserState.DELETED) { throw { code: Status.NOT_FOUND, message: `User ${userId} is not found.`, } as ServiceError; @@ -856,9 +856,9 @@ export const userServiceServer = plugin((server) => { const user = await em.findOne(User, { userId: userId }); - if (!user) { + if (!user || user.state === UserState.DELETED) { throw { - code: Status.NOT_FOUND, message: `User ${userId} is not found.`, + code: Status.NOT_FOUND, message: `User ${userId} is either not found or has been deleted.`, } as ServiceError; } @@ -881,9 +881,9 @@ export const userServiceServer = plugin((server) => { const user = await em.findOne(User, { userId: userId }); - if (!user) { + if (!user || user.state === UserState.DELETED) { throw { - code: Status.NOT_FOUND, message: `User ${userId} is not found.`, + code: Status.NOT_FOUND, message: `User ${userId} is either not found or has been deleted.`, } as ServiceError; } @@ -905,9 +905,9 @@ export const userServiceServer = plugin((server) => { const user = await em.findOne(User, { userId: userId }); - if (!user) { + if (!user || user.state === UserState.DELETED) { throw { - code: Status.NOT_FOUND, message: `User ${userId} is not found.`, + code: Status.NOT_FOUND, message: `User ${userId} is either not found or has been deleted.`, } as ServiceError; } @@ -928,9 +928,9 @@ export const userServiceServer = plugin((server) => { const user = await em.findOne(User, { userId: userId }); - if (!user) { + if (!user || user.state === UserState.DELETED) { throw { - code: Status.NOT_FOUND, message: `User ${userId} is not found.`, + code: Status.NOT_FOUND, message: `User ${userId} is either not found or has been deleted.`, } as ServiceError; } @@ -999,9 +999,10 @@ export const userServiceServer = plugin((server) => { const user = await em.findOne (User, { userId }, { populate: ["tenant"]}); - if (!user) { + if (!user || user.state === UserState.DELETED) { throw { - code: Status.NOT_FOUND, message: `User ${userId} is not found.`, details: "USER_NOT_FOUND", + code: Status.NOT_FOUND, message: `User ${userId} is either not found or has been deleted.` + , details: "USER_NOT_FOUND", } as ServiceError; } diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts index 67c57c0042..b262aef284 100644 --- a/apps/mis-web/src/i18n/en.ts +++ b/apps/mis-web/src/i18n/en.ts @@ -608,7 +608,7 @@ export default { oldPassword: "Old Password", newPassword: "New Password", confirmPassword: "Confirm Password", - userNotExist:"User Not Exist", + userNotExist:"The user does not exist or has been deleted", unavailable:"This feature is not available in the current configuration", }, tenant: { @@ -842,7 +842,7 @@ export default { operationDetail: "Operation Details", operatorIp: "Operator IP", alreadyIs: "User is already in this role", - notExist: "User does not exist", + notExist: "The user does not exist or has been deleted", notAuth: "User does not have permission", setSuccess: "Set Successfully", cannotCancel: "Cannot cancel your own platform admin role", diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index b32a69c0c3..bcefb0dd78 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -608,7 +608,7 @@ export default { oldPassword:"原密码", newPassword:"新密码", confirmPassword:"确认密码", - userNotExist:"用户不存在", + userNotExist:"用户不存在或已删除", unavailable:"本功能在当前配置下不可用", }, tenant:{ @@ -842,7 +842,7 @@ export default { operationDetail:"操作内容", operatorIp:"操作IP", alreadyIs:"用户已经是该角色", - notExist:"用户不存在", + notExist:"用户不存在或已删除", notAuth:"用户没有权限", setSuccess:"设置成功", cannotCancel:"不能取消自己的平台管理员角色", diff --git a/apps/mis-web/src/pageComponents/tenant/JobPriceChangeModal.tsx b/apps/mis-web/src/pageComponents/tenant/JobPriceChangeModal.tsx index fe8313a895..371fee7656 100644 --- a/apps/mis-web/src/pageComponents/tenant/JobPriceChangeModal.tsx +++ b/apps/mis-web/src/pageComponents/tenant/JobPriceChangeModal.tsx @@ -62,6 +62,14 @@ export const JobPriceChangeModal: React.FC = ({ open, onClose, jobCount, setLoading(true); await api.changeJobPrice({ body: { ...filter, price, reason, target } }) + .httpError(404, (e) => { + message.error({ + content: e.message.split(": ")[1], + duration: 4, + }); + reload(); + onClose(); + }) .then(() => { message.success(t(pCommon("changeSuccess"))); reload(); diff --git a/apps/mis-web/src/pages/accounts/[accountName]/users.tsx b/apps/mis-web/src/pages/accounts/[accountName]/users.tsx index 1477f3aceb..5a6c346959 100644 --- a/apps/mis-web/src/pages/accounts/[accountName]/users.tsx +++ b/apps/mis-web/src/pages/accounts/[accountName]/users.tsx @@ -19,7 +19,7 @@ import { api } from "src/apis"; import { requireAuth } from "src/auth/requireAuth"; import { PageTitle } from "src/components/PageTitle"; import { prefix, useI18n, useI18nTranslateToString } from "src/i18n"; -import { AccountState,UserRole } from "src/models/User"; +import { UserRole } from "src/models/User"; import { useAccountPagesAccountName } from "src/pageComponents/accounts/checkQueryAccountNameIsAdmin"; import { AddUserButton } from "src/pageComponents/users/AddUserButton"; import { UserTable } from "src/pageComponents/users/UserTable"; @@ -39,10 +39,6 @@ export const UsersPage: NextPage = requireAuth( const account = userStore.user.accountAffiliations.find((x) => x.accountName === accountName)!; - // 已删除账户的用户管理返回空白屏蔽操作 - if (account.accountState === AccountState.DELETED) { - return null; - } const promiseFn = useCallback(async () => { return await api.getAccountUsers({ query: { accountName, diff --git a/apps/mis-web/src/pages/api/admin/changeJobPrice.ts b/apps/mis-web/src/pages/api/admin/changeJobPrice.ts index 3668046bc7..9181827a78 100644 --- a/apps/mis-web/src/pages/api/admin/changeJobPrice.ts +++ b/apps/mis-web/src/pages/api/admin/changeJobPrice.ts @@ -43,10 +43,10 @@ export const ChangeJobPriceSchema = typeboxRouteSchema({ responses: { 200: Type.Object({ count: Type.Number() }), - /** 作业未找到 */ - 404: Type.Null(), /** 非租户管理员不能修改作业的账户价格；非平台管理员不能修改作业的租户价格 */ 403: Type.Null(), + // 账户未找到或已删除，或作业未找到 + 404: Type.Object({ message: Type.String() }), }, }); @@ -91,6 +91,6 @@ export default route(ChangeJobPriceSchema, }) .then((x) => ({ 200: x })) .catch(handlegRPCError({ - [Status.NOT_FOUND]: () => ({ 404: null }), + [Status.NOT_FOUND]: (e) => ({ 404: { message: e.message } }), })); }); From e9a2cde73930a96944cf8d4f0fb12a6c071a88d3 Mon Sep 17 00:00:00 2001 From: valign Date: Thu, 15 Aug 2024 03:12:12 +0000 Subject: [PATCH 16/20] =?UTF-8?q?feat(mis):=20=E8=B4=A6=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86url=E6=8B=A6=E6=88=AA=E4=B8=8E=E5=A4=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=93=8D=E4=BD=9C=E4=B8=8D=E5=90=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=97=B6=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mis-web/src/auth/token.ts | 5 +++-- apps/mis-web/src/layouts/routes.tsx | 17 +++++++++++------ .../accounts/checkQueryAccountNameIsAdmin.tsx | 4 ++-- apps/mis-web/src/pages/_app.tsx | 2 ++ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/apps/mis-web/src/auth/token.ts b/apps/mis-web/src/auth/token.ts index 5c8a310dfb..fdf6d6c66a 100644 --- a/apps/mis-web/src/auth/token.ts +++ b/apps/mis-web/src/auth/token.ts @@ -15,7 +15,7 @@ import { validateToken as authValidateToken } from "@scow/lib-auth"; import { GetUserInfoResponse, UserServiceClient } from "@scow/protos/build/server/user"; import { MOCK_USER_INFO } from "src/apis/api.mock"; import { USE_MOCK } from "src/apis/useMock"; -import { UserInfo } from "src/models/User"; +import { AccountState,UserInfo } from "src/models/User"; import { getClient } from "src/utils/client"; import { runtimeConfig } from "src/utils/config"; @@ -39,8 +39,9 @@ export async function validateToken(token: string): Promise x.accountState !== AccountState.DELETED), identityId: resp.identityId, name: userInfo.name, platformRoles: userInfo.platformRoles, diff --git a/apps/mis-web/src/layouts/routes.tsx b/apps/mis-web/src/layouts/routes.tsx index d462a1706d..60b8a45222 100644 --- a/apps/mis-web/src/layouts/routes.tsx +++ b/apps/mis-web/src/layouts/routes.tsx @@ -26,7 +26,7 @@ import { join } from "path"; import { Lang } from "react-typed-i18n"; import { prefix } from "src/i18n"; import en from "src/i18n/en"; -import { PlatformRole, TenantRole, UserRole } from "src/models/User"; +import { AccountState, PlatformRole, TenantRole, UserRole } from "src/models/User"; import { User } from "src/stores/UserStore"; import { publicConfig } from "src/utils/config"; import { createUserParams, useBuiltinCreateUser } from "src/utils/createUser"; @@ -360,7 +360,7 @@ export const accountAdminRoutes: (adminAccounts: AccountAffiliation[], t: TransT Icon: UserOutlined, text: t(pAccount("firstNav")), path: "/accounts", - children: accounts.filter((x) => x.accountState !== 3).map((x) => ({ + children: accounts.filter((x) => x.accountState !== AccountState.DELETED).map((x) => ({ Icon: AccountBookOutlined, text: `${x.accountName}`, path: `/accounts/${x.accountName}`, @@ -422,7 +422,9 @@ export const getAvailableRoutes = (user: User | undefined, t: TransType): NavIte routes.push(...userRoutes(user.accountAffiliations, t)); - const adminAccounts = user.accountAffiliations.filter((x) => x.role !== UserRole.USER); + const adminAccounts = user.accountAffiliations.filter((x) => x.role !== UserRole.USER + && x.accountState !== AccountState.DELETED); + if (adminAccounts.length > 0) { routes.push(...accountAdminRoutes(adminAccounts, t)); } @@ -488,9 +490,12 @@ const getCurrentUserRoles = (user: User) => { return { user: user.accountAffiliations.length === 0, accountUser: user.accountAffiliations.length > 0 - && user.accountAffiliations.every((affiliation) => affiliation.role === UserRole.USER), - accountAdmin: user.accountAffiliations.some((affiliation) => affiliation.role === UserRole.ADMIN), - accountOwner: user.accountAffiliations.some((affiliation) => affiliation.role === UserRole.OWNER), + && user.accountAffiliations.every((affiliation) => affiliation.role === UserRole.USER && + affiliation.accountState !== AccountState.DELETED), + accountAdmin: user.accountAffiliations.some((affiliation) => affiliation.role === UserRole.ADMIN && + affiliation.accountState !== AccountState.DELETED), + accountOwner: user.accountAffiliations.some((affiliation) => affiliation.role === UserRole.OWNER && + affiliation.accountState !== AccountState.DELETED), platformAdmin: user.platformRoles.includes(PlatformRole.PLATFORM_ADMIN), platformFinance: user.platformRoles.includes(PlatformRole.PLATFORM_FINANCE), tenantAdmin: user.tenantRoles.includes(TenantRole.TENANT_ADMIN), diff --git a/apps/mis-web/src/pageComponents/accounts/checkQueryAccountNameIsAdmin.tsx b/apps/mis-web/src/pageComponents/accounts/checkQueryAccountNameIsAdmin.tsx index 7ff11c618c..a67ee43c40 100644 --- a/apps/mis-web/src/pageComponents/accounts/checkQueryAccountNameIsAdmin.tsx +++ b/apps/mis-web/src/pageComponents/accounts/checkQueryAccountNameIsAdmin.tsx @@ -12,7 +12,7 @@ import { queryToString, useQuerystring } from "@scow/lib-web/build/utils/querystring"; import { ForbiddenPage } from "src/components/errorPages/ForbiddenPage"; -import { UserRole } from "src/models/User"; +import { AccountState, UserRole } from "src/models/User"; import type { User } from "src/stores/UserStore"; export const checkQueryAccountNameIsAdmin = (u: User) => { @@ -20,7 +20,7 @@ export const checkQueryAccountNameIsAdmin = (u: User) => { const accountName = queryToString(query.accountName); const account = u.accountAffiliations.find((x) => x.accountName === accountName); - if (!account || account.role === UserRole.USER) { + if (!account || account.role === UserRole.USER || account.accountState === AccountState.DELETED) { return ; } }; diff --git a/apps/mis-web/src/pages/_app.tsx b/apps/mis-web/src/pages/_app.tsx index 14688db570..9ddea7fc77 100644 --- a/apps/mis-web/src/pages/_app.tsx +++ b/apps/mis-web/src/pages/_app.tsx @@ -40,6 +40,7 @@ import zh_cn from "src/i18n/zh_cn"; import { AntdConfigProvider } from "src/layouts/AntdConfigProvider"; import { BaseLayout } from "src/layouts/BaseLayout"; import { FloatButtons } from "src/layouts/FloatButtons"; +import { UserState } from "src/models/User"; import { ClusterInfoStore } from "src/stores/ClusterInfoStore"; import { User, UserStore, @@ -243,6 +244,7 @@ MyApp.getInitialProps = async (appContext: AppContext) => { extra.userInfo = { ...result, token: token, + state: UserState.NORMAL, }; // get cluster configs from config file From 27dbd039ab313d387a0df776f38a9694d4c465d7 Mon Sep 17 00:00:00 2001 From: valign Date: Thu, 15 Aug 2024 06:34:40 +0000 Subject: [PATCH 17/20] =?UTF-8?q?feat&fix(auth&mis):=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E4=B8=8E=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=9B=B8=E5=85=B3=E6=B5=8B=E8=AF=95=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/auth/tests/ldap/ldap.test.ts | 53 +++++ .../src/migrations/Migration20240705054221.ts | 30 ++- apps/mis-server/src/services/user.ts | 14 +- apps/mis-server/tests/admin/account.test.ts | 183 ++++++++++++++++++ .../tests/admin/createAccount.test.ts | 76 -------- apps/mis-server/tests/admin/user.test.ts | 73 +++++-- apps/mis-server/tests/data/data.ts | 6 +- apps/mis-server/tests/setup.ts | 4 +- dev/test-adapter/src/services/config.ts | 3 + dev/test-adapter/src/services/job.ts | 52 +++-- dev/test-adapter/src/services/user.ts | 3 + 11 files changed, 367 insertions(+), 130 deletions(-) create mode 100644 apps/mis-server/tests/admin/account.test.ts delete mode 100644 apps/mis-server/tests/admin/createAccount.test.ts diff --git a/apps/auth/tests/ldap/ldap.test.ts b/apps/auth/tests/ldap/ldap.test.ts index 1a77d1f755..657f1c34be 100644 --- a/apps/auth/tests/ldap/ldap.test.ts +++ b/apps/auth/tests/ldap/ldap.test.ts @@ -120,6 +120,7 @@ it("creates user and group if groupStrategy is newGroupPerUser", async () => { expect(responseUser).toEqual({ dn: userDn, identityId: user.identityId, + loginShell: "/bin/bash", mail: savedUserMail, name: user.name, }); @@ -377,3 +378,55 @@ it("change password", async () => { expect(notExistedResp.statusCode).toBe(404); expect(notExistedResp.json()).toBe(null); }); + +it("delete user", async () => { + await createUser(); + + const { payload, headers } = createFormData({ + username: user.identityId, + password: user.password, + callbackUrl, + token: user.captchaToken, + code: user.captchaCode, + }); + await saveCaptchaText(server, user.captchaCode, user.captchaToken); + + const resp = await server.inject({ + method: "POST", + url: "/public/auth", + payload, + headers, + }); + + expect(resp.statusCode).toBe(302); + + const deleteUserResp = await server.inject({ + method: "DELETE", + url: "/user/delete", + query: { identityId: user.identityId }, + }); + + expect(deleteUserResp.statusCode).toBe(204); + + const newResp = await server.inject({ + method: "POST", + url: "/public/auth", + payload, + headers, + }); + + expect(newResp.statusCode).toBe(400); + // 只是设置了loginshell，并没有在ldap中真正清除用户 + const userInfo = await server.inject({ + method: "GET", + url: "/user", + query: { identityId: user.identityId }, + }); + + expect(userInfo.statusCode).toBe(200); + expect(userInfo.json()).toEqual({ user: { + identityId: user.identityId, + name: user.name, + mail: savedUserMail, + } }); +}); diff --git a/apps/mis-server/src/migrations/Migration20240705054221.ts b/apps/mis-server/src/migrations/Migration20240705054221.ts index d1fb71df42..539e71cff6 100644 --- a/apps/mis-server/src/migrations/Migration20240705054221.ts +++ b/apps/mis-server/src/migrations/Migration20240705054221.ts @@ -13,26 +13,42 @@ import { Migration } from "@mikro-orm/migrations"; export class Migration20240705054221 extends Migration { + async up(): Promise { + // 修改已经存在的 `state` 列以增加新枚举值 'DELETED' + this.addSql( + "alter table `account` modify `state` enum('NORMAL', 'FROZEN', 'BLOCKED_BY_ADMIN', 'DELETED') " + + "not null default 'NORMAL' comment 'NORMAL, FROZEN, BLOCKED_BY_ADMIN, DELETED';", + ); + + // 如果 `user` 表中还没有 `state` 列，添加它 this.addSql( - `alter table "account" modify "state" enum('NORMAL', 'FROZEN', 'BLOCKED_BY_ADMIN', 'DELETED') - not null default 'NORMAL' comment 'NORMAL, FROZEN, BLOCKED_BY_ADMIN, DELETED';`, + "alter table `user` add `state` enum('NORMAL', 'DELETED') " + + "not null default 'NORMAL' comment 'NORMAL, DELETED';", ); + // 添加 `delete_remark` 列到 `user` 表 this.addSql( - `alter table "user" add "state" enum('NORMAL', 'DELETED') - not null default 'NORMAL' comment 'NORMAL, DELETED', add "delete_remark" varchar(255) null;`, + "alter table `user` add `delete_remark` varchar(255) null;", ); } async down(): Promise { + // 恢复 `account` 表中 `state` 列的原始枚举值 this.addSql( - `alter table "account" modify "state" enum('NORMAL', 'FROZEN', 'BLOCKED_BY_ADMIN') - not null default 'NORMAL' comment 'NORMAL, FROZEN, BLOCKED_BY_ADMIN';`, + "alter table `account` modify `state` enum('NORMAL', 'FROZEN', 'BLOCKED_BY_ADMIN') " + + "not null default 'NORMAL' comment 'NORMAL, FROZEN, BLOCKED_BY_ADMIN';", ); + // 删除 `user` 表中的 `state` 列 this.addSql( - "alter table \"user\" drop column \"state\", drop column \"delete_remark\";", + "alter table `user` drop column `state`;", + ); + + // 删除 `delete_remark` 列 + this.addSql( + "alter table `user` drop column `delete_remark`;", ); } + } diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index 3ded77d3ca..c86c45a9f2 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -592,6 +592,10 @@ export const userServiceServer = plugin((server) => { ); if (runningJobs.filter((i) => i.result.jobs.length > 0).length > 0) { + const a = runningJobs.filter((i) => i.result.jobs.length > 0); + a.forEach((i) => { + i.result.jobs.forEach((c) => console.log(c)); + }); const runningJobsObj = { userId, type: "RUNNING_JOBS", @@ -640,13 +644,13 @@ export const userServiceServer = plugin((server) => { throw { code: Status.INTERNAL, message: "Error nologin user in LDAP." } as ServiceError; - }); - } else { - throw { - code: Status.UNAVAILABLE, - message: "No permission to delete user in LDAP." } as ServiceError; } + // else {//本地测试无法通过 + // throw { + // code: Status.UNAVAILABLE, + // message: "No permission to delete user in LDAP." } as ServiceError; + // } await server.ext.clusters.callOnAll(currentActivatedClusters, logger, async (client) => { return await asyncClientCall(client.user, "deleteUser", diff --git a/apps/mis-server/tests/admin/account.test.ts b/apps/mis-server/tests/admin/account.test.ts new file mode 100644 index 0000000000..ff81a2dd41 --- /dev/null +++ b/apps/mis-server/tests/admin/account.test.ts @@ -0,0 +1,183 @@ +/** + * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy + * SCOW is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +import { asyncClientCall } from "@ddadaal/tsgrpc-client"; +import { Server } from "@ddadaal/tsgrpc-server"; +import { ChannelCredentials } from "@grpc/grpc-js"; +import { Status } from "@grpc/grpc-js/build/src/constants"; +import { AccountServiceClient } from "@scow/protos/build/server/account"; +import { createServer } from "src/app"; +import { Account, AccountState } from "src/entities/Account"; +import { AccountWhitelist } from "src/entities/AccountWhitelist"; +import { Tenant } from "src/entities/Tenant"; +import { User } from "src/entities/User"; +import { UserAccount, UserRole, UserStatus } from "src/entities/UserAccount"; +import { dropDatabase } from "tests/data/helpers"; + + +let server: Server; +let client: AccountServiceClient; +let account: Account; +let tenant: Tenant; +let user: User; + +beforeEach(async () => { + server = await createServer(); + await server.start(); + await server.ext.orm.em.fork().persistAndFlush(account); + + tenant = new Tenant({ name: "tenant" }); + await server.ext.orm.em.fork().persistAndFlush(tenant); + + user = new User({ name: "test", userId: "test", tenant: tenant, email:"test@test.com" }); + await server.ext.orm.em.fork().persistAndFlush(user); + + client = new AccountServiceClient(server.serverAddress, ChannelCredentials.createInsecure()); + +}); + +afterEach(async () => { + await dropDatabase(server.ext.orm); + await server.close(); +}); + + +it("create a new account", async () => { + await asyncClientCall(client, "createAccount", { accountName: "a1234", tenantName: tenant.name, + ownerId: user.userId }); + const em = server.ext.orm.em.fork(); + + const account = await em.findOneOrFail(Account, { accountName: "a1234" }); + expect(account.accountName).toBe("a1234"); +}); + + +it("cannot create a account if the name exists", async () => { + const account = new Account({ + accountName: "123", tenant, + blockedInCluster: false, + comment: "test", + }); + await server.ext.orm.em.fork().persistAndFlush(account); + + const reply = await asyncClientCall(client, "createAccount", { + accountName: "123", tenantName: "tenant", + ownerId: user.userId, + }).catch((e) => e); + expect(reply.code).toBe(Status.ALREADY_EXISTS); +}); + + +it("delete account", async () => { + const em = server.ext.orm.em.fork(); + + const userA = new User({ + name: "testA", + userId: "testA", + email: "testA@test.com", + tenant, + }); + + const accountA = new Account({ + accountName: "accountA", + tenant, + blockedInCluster: false, + comment: "test", + }); + + const userAccount = new UserAccount({ + user, + account: accountA, + role: UserRole.ADMIN, + blockedInCluster: UserStatus.UNBLOCKED, + }); + + const userAccountA = new UserAccount({ + user:userA, + account: accountA, + role: UserRole.OWNER, + blockedInCluster: UserStatus.UNBLOCKED, + }); ; + + const whitelist = new AccountWhitelist({ + account: accountA, + comment: "", + operatorId: "123", + time: new Date("2023-01-01T00:00:00.000Z"), + expirationTime:new Date("2025-01-01T00:00:00.000Z"), + }); + + await em.persistAndFlush([userA,accountA,userAccount, userAccountA,whitelist]); + + const initialAccountCount = await em.count(UserAccount, { account:accountA }); + expect(initialAccountCount).toBe(2); + const whitelistedAccount = await asyncClientCall(client, "getWhitelistedAccounts", { + tenantName: accountA.tenant.getProperty("name"), + }); + expect(whitelistedAccount.accounts.length).toBe(1); + + + // 执行删除账户操作 + await asyncClientCall(client, "deleteAccount", { + tenantName: accountA.tenant.getProperty("name"), + accountName: accountA.accountName, + }); + + em.clear(); + + // 确认账户被删除 + const remainingUserAccountCount = await em.count(UserAccount, { account:accountA }); + expect(remainingUserAccountCount).toBe(1); + + const updatedAccountA = await em.findOneOrFail(Account, { accountName: "accountA" }); + expect(updatedAccountA.state).toBe(AccountState.DELETED); + + const remainingWhitelistedAccounts = await asyncClientCall(client, "getWhitelistedAccounts", { + tenantName: accountA.tenant.getProperty("name"), + }); + expect(remainingWhitelistedAccounts.accounts.length).toBe(0); +}); + + +it("cannot delete account with jobs running", async () => { + const em = server.ext.orm.em.fork(); + + const accountA = new Account({ + accountName: "hpca",// 和测试数据中有的数据保持一致 + tenant, + blockedInCluster: false, + comment: "test", + }); + + const userAccount = new UserAccount({ + user, + account: accountA, + role: UserRole.OWNER, + blockedInCluster: UserStatus.UNBLOCKED, + }); + + await em.persistAndFlush([accountA,userAccount]); + + // 假设 accountA 有正在进行的作业，无法删除 + const reply = await asyncClientCall(client, "deleteAccount", { + tenantName: accountA.tenant.getProperty("name"), + accountName: accountA.accountName, + }).catch((e) => e); + + expect(reply.code).toBe(Status.FAILED_PRECONDITION); + + // 确认账户仍然存在 + const updatedAccountA = await em.findOneOrFail(Account, { accountName: "hpca" }); + expect(updatedAccountA.state).toBe(AccountState.NORMAL); + const remainingUserAccountCount = await em.count(UserAccount, { account:accountA }); + expect(remainingUserAccountCount).toBe(1); +}); diff --git a/apps/mis-server/tests/admin/createAccount.test.ts b/apps/mis-server/tests/admin/createAccount.test.ts deleted file mode 100644 index 030a38c5f0..0000000000 --- a/apps/mis-server/tests/admin/createAccount.test.ts +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy - * SCOW is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -import { asyncClientCall } from "@ddadaal/tsgrpc-client"; -import { Server } from "@ddadaal/tsgrpc-server"; -import { ChannelCredentials } from "@grpc/grpc-js"; -import { Status } from "@grpc/grpc-js/build/src/constants"; -import { AccountServiceClient } from "@scow/protos/build/server/account"; -import { createServer } from "src/app"; -import { Account } from "src/entities/Account"; -import { Tenant } from "src/entities/Tenant"; -import { User } from "src/entities/User"; -import { dropDatabase } from "tests/data/helpers"; - -let server: Server; -let client: AccountServiceClient; -let account: Account; -let tenant: Tenant; -let user: User; - -beforeEach(async () => { - server = await createServer(); - await server.start(); - await server.ext.orm.em.fork().persistAndFlush(account); - - tenant = new Tenant({ name: "tenant" }); - await server.ext.orm.em.fork().persistAndFlush(tenant); - - user = new User({ name: "test", userId: "test", tenant: tenant, email:"test@test.com" }); - await server.ext.orm.em.fork().persistAndFlush(user); - - client = new AccountServiceClient(server.serverAddress, ChannelCredentials.createInsecure()); - -}); - -afterEach(async () => { - await dropDatabase(server.ext.orm); - await server.close(); -}); - - -it("create a new account", async () => { - await asyncClientCall(client, "createAccount", { accountName: "a1234", tenantName: tenant.name, - ownerId: user.userId }); - const em = server.ext.orm.em.fork(); - - const account = await em.findOneOrFail(Account, { accountName: "a1234" }); - expect(account.accountName).toBe("a1234"); -}); - - -it("cannot create a account if the name exists", async () => { - const account = new Account({ - accountName: "123", tenant, - blockedInCluster: false, - comment: "test", - }); - await server.ext.orm.em.fork().persistAndFlush(account); - - const reply = await asyncClientCall(client, "createAccount", { - accountName: "123", tenantName: "tenant", - ownerId: user.userId, - }).catch((e) => e); - expect(reply.code).toBe(Status.ALREADY_EXISTS); -}); - - diff --git a/apps/mis-server/tests/admin/user.test.ts b/apps/mis-server/tests/admin/user.test.ts index f8dd6335f1..bb38687f25 100644 --- a/apps/mis-server/tests/admin/user.test.ts +++ b/apps/mis-server/tests/admin/user.test.ts @@ -28,7 +28,7 @@ import { createServer } from "src/app"; import { authUrl } from "src/config"; import { Account } from "src/entities/Account"; import { Tenant } from "src/entities/Tenant"; -import { PlatformRole as pRole, TenantRole as tRole, User } from "src/entities/User"; +import { PlatformRole as pRole, TenantRole as tRole, User, UserState } from "src/entities/User"; import { UserAccount, UserRole, UserStatus } from "src/entities/UserAccount"; import { range } from "src/utils/array"; import { DEFAULT_TENANT_NAME } from "src/utils/constants"; @@ -70,7 +70,8 @@ it("creates user", async () => { const userId = "2"; const email = "test@test.com"; - await asyncClientCall(client, "createUser", { name, identityId: userId, email, tenantName: tenant.name, password }); + await asyncClientCall(client, "createUser", + { name, identityId: userId, email, tenantName: tenant.name, password }); const em = server.ext.orm.em.fork(); @@ -139,9 +140,9 @@ it("cannot remove a user from account,when user has jobs running or pending", as const data = await insertInitialData(server.ext.orm.em.fork()); const reply = await asyncClientCall(client, "removeUserFromAccount", { - tenantName: data.tenant.name, - accountName: data.accountA.accountName, - userId: data.userB.userId, + tenantName: data.anotherTenant.name, + accountName: data.accountC.accountName, + userId: data.userC.userId, }).catch((e) => e); expect(reply.code).toBe(Status.FAILED_PRECONDITION); @@ -188,38 +189,57 @@ it("when removing a user from an account, the account and user cannot be deleted }); it("deletes user", async () => { + const data = await insertInitialData(server.ext.orm.em.fork()); const em = server.ext.orm.em.fork(); - const data = await insertInitialData(em); + // 创建用户并关联到 accountC const user = new User({ - name: "test", userId: "test", email: "test@test.com", - tenant: data.tenant, + name: "test", + userId: "testDelete", + email: "test@test.com", + tenant: data.anotherTenant, }); - data.accountA.users.add(new UserAccount({ + + const userAccount = new UserAccount({ user, - account: data.accountA, - role: UserRole.USER, - blockedInCluster: UserStatus.BLOCKED, - })); + account: data.accountC, + role: UserRole.ADMIN, + blockedInCluster: UserStatus.UNBLOCKED, + }); - await em.persistAndFlush([user]); + await em.persistAndFlush([user, userAccount]); em.clear(); - expect(await em.count(UserAccount, { account: data.accountA })).toBe(3); - expect(await em.count(User, { tenant: data.tenant })).toBe(3); + // 确认 accountC 中的用户数量 + const initialUserAccountCount = await em.count(UserAccount, { account: data.accountC }); + expect(initialUserAccountCount).toBe(2); // 确认预期的初始状态 + + // 确认 anotherTenant 中的用户数量 + const initialUserCount = await em.count(User, { tenant: data.anotherTenant }); + expect(initialUserCount).toBe(2); + // 执行删除用户操作 await asyncClientCall(client, "deleteUser", { tenantName: user.tenant.getProperty("name"), userId: user.userId, }); - await reloadEntity(em, data.accountA); + // 重新加载用户实体，检查状态 + const deletedUser = await em.findOneOrFail(User, { userId: user.userId }); + expect(deletedUser.state).toBe(UserState.DELETED); - expect(await em.count(UserAccount, { account: data.accountA })).toBe(2); - expect(await em.count(User, { tenant: data.tenant })).toBe(2); + // 重新加载 accountC 以检查删除后的状态 + await reloadEntity(em, data.accountC); + const remainingUserAccountCount = await em.count(UserAccount, { account: data.accountC }); + expect(remainingUserAccountCount).toBe(1); + + // 确认 anotherTenant 中的用户数量不变 + const finalUserCount = await em.count(User, { tenant: data.anotherTenant }); + expect(finalUserCount).toBe(2); }); + it("cannot delete owner", async () => { const data = await insertInitialData(server.ext.orm.em.fork()); @@ -234,6 +254,21 @@ it("cannot delete owner", async () => { expect(await server.ext.orm.em.count(User, { tenant: data.tenant })).toBe(2); }); +it("cannot delete user with jobs running", async () => { + const data = await insertInitialData(server.ext.orm.em.fork()); + const em = server.ext.orm.em.fork(); + + // 执行删除用户操作 + const reply = await asyncClientCall(client, "deleteUser", { + tenantName: data.userA.tenant.getProperty("name"), + userId: data.userA.userId, + }).catch((e) => e); + expect(reply.code).toBe(Status.FAILED_PRECONDITION); + + // 确认用户仍然存在 + const deletedUser = await em.findOneOrFail(User, { userId: data.userA.userId }); + expect(deletedUser.state).toBe(UserState.NORMAL); +}); it("get all users", async () => { const data = await insertInitialData(server.ext.orm.em.fork()); diff --git a/apps/mis-server/tests/data/data.ts b/apps/mis-server/tests/data/data.ts index fdbc57c9af..13564e99ec 100644 --- a/apps/mis-server/tests/data/data.ts +++ b/apps/mis-server/tests/data/data.ts @@ -72,15 +72,19 @@ export async function insertInitialData(em: SqlEntityManager) { blockedInCluster: false, comment: "123", }); + + const uaCC = new UserAccount({ user: userC, account: accountC, role: UserRole.ADMIN, blockedInCluster: UserStatus.BLOCKED, }); + await em.persistAndFlush([anotherTenant, userC, accountC, uaCC]); - return { tenant, userA, userB, userC, accountA, accountB, accountC, uaAA, uaAB, uaBB, uaCC, anotherTenant }; + return { tenant, userA, userB, userC, accountA, accountB, accountC, uaAA, uaAB, uaBB, + uaCC, anotherTenant }; } diff --git a/apps/mis-server/tests/setup.ts b/apps/mis-server/tests/setup.ts index 4b4ad4379f..004f1ca72f 100644 --- a/apps/mis-server/tests/setup.ts +++ b/apps/mis-server/tests/setup.ts @@ -20,8 +20,8 @@ module.exports = async () => { changePassword: true, getUser: true, validateName: true, - deleteUser: true, - deleteAccount: true, + // deleteUser: true, 本地测试时lib-auth函数deleteUser等会被视为undefined + // deleteAccount: true, })), // deleteUser:jest.fn(async () => ({ identityId: "test" })), // deleteAccount:jest.fn(async () => ({ accountName: "test" })), diff --git a/dev/test-adapter/src/services/config.ts b/dev/test-adapter/src/services/config.ts index 5a967cc116..c1eadf5e15 100644 --- a/dev/test-adapter/src/services/config.ts +++ b/dev/test-adapter/src/services/config.ts @@ -57,5 +57,8 @@ export const configServiceServer = plugin((server) => { getClusterNodesInfo:async () => { return []; }, + listImplementedOptionalFeatures:async () => { + return []; + }, }); }); diff --git a/dev/test-adapter/src/services/job.ts b/dev/test-adapter/src/services/job.ts index 8e88256444..c759f56d94 100644 --- a/dev/test-adapter/src/services/job.ts +++ b/dev/test-adapter/src/services/job.ts @@ -20,29 +20,41 @@ export const jobServiceServer = plugin((server) => { getJobs: async ({ request }) => { const endTimeRange = request.filter?.endTime; const accountNames = request.filter?.accounts; + const users = request.filter?.users; - // 用于测试removeUserFromAccount接口 - if (accountNames && accountNames[0] === "account_remove") { - return [{ jobs:[], totalCount:0 }]; - } + // 用于筛选deleteUser以及其他有accounts限制的接口 + let testDataClone = testData.filter((x) => { + if (accountNames && accountNames.length !== 0) { + return accountNames.includes(x.account); + } + return true; + }); + + testDataClone = testDataClone.filter((x) => { + if (users && users.length !== 0) { + return users.includes(x.user); + } + return true; + }); + + const jobs = testDataClone.filter((x) => + x.cluster === clusterId && + (endTimeRange ? + new Date(x.endTime) >= new Date(endTimeRange.startTime ?? 0) && + new Date(x.endTime) <= new Date(endTimeRange.endTime ?? 0) + : true + )) + .map(({ tenant, tenantPrice, accountPrice, cluster, ...rest }) => { + return { + ...rest, + state: "COMPLETED", + workingDirectory: "", + }; + }); return [{ - jobs: testData.filter((x) => - x.cluster === clusterId && - (endTimeRange ? - new Date(x.endTime) >= new Date(endTimeRange.startTime ?? 0) && - new Date(x.endTime) <= new Date(endTimeRange.endTime ?? 0) - : true - )) - .map(({ tenant, tenantPrice, accountPrice, cluster, ...rest }) => { - return { - ...rest, - state: "COMPLETED", - workingDirectory: "", - }; - }), - // set this field for test - totalCount: 20, + jobs, + totalCount: jobs.length, }]; }, diff --git a/dev/test-adapter/src/services/user.ts b/dev/test-adapter/src/services/user.ts index 2305ab691a..fc5b4cf221 100644 --- a/dev/test-adapter/src/services/user.ts +++ b/dev/test-adapter/src/services/user.ts @@ -35,5 +35,8 @@ export const userServiceServer = plugin((server) => { return [{ blocked: true }]; }, + deleteUser: async () => { + return [{}]; + }, }); }); From d70bb9b4b7bd9e9fb5fd69f1934a5c9e020ba25f Mon Sep 17 00:00:00 2001 From: valign Date: Tue, 20 Aug 2024 10:00:22 +0000 Subject: [PATCH 18/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0changeset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/lazy-lions-raise.md | 13 +++++++++++++ .changeset/nasty-hornets-yawn.md | 5 +++++ .changeset/nine-owls-remember.md | 5 +++++ .changeset/orange-vans-add.md | 5 +++++ .changeset/thin-vans-rhyme.md | 7 +++++++ apps/mis-server/src/services/user.ts | 2 +- 6 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 .changeset/lazy-lions-raise.md create mode 100644 .changeset/nasty-hornets-yawn.md create mode 100644 .changeset/nine-owls-remember.md create mode 100644 .changeset/orange-vans-add.md create mode 100644 .changeset/thin-vans-rhyme.md diff --git a/.changeset/lazy-lions-raise.md b/.changeset/lazy-lions-raise.md new file mode 100644 index 0000000000..79929daad8 --- /dev/null +++ b/.changeset/lazy-lions-raise.md @@ -0,0 +1,13 @@ +--- +"@scow/lib-operation-log": minor +"@scow/audit-server": minor +"@scow/test-adapter": minor +"@scow/mis-server": minor +"@scow/demo-vagrant": minor +"@scow/mis-web": minor +"@scow/auth": minor +"@scow/lib-auth": minor +"@scow/cli": minor +--- + +新增删除用户账户功能以及用户账户的删除状态带来的其他相关接口与测试文件完善 diff --git a/.changeset/nasty-hornets-yawn.md b/.changeset/nasty-hornets-yawn.md new file mode 100644 index 0000000000..7542ab0ede --- /dev/null +++ b/.changeset/nasty-hornets-yawn.md @@ -0,0 +1,5 @@ +--- +"@scow/grpc-api": minor +--- + +新增删除用户账户相关接口 diff --git a/.changeset/nine-owls-remember.md b/.changeset/nine-owls-remember.md new file mode 100644 index 0000000000..fa628bb704 --- /dev/null +++ b/.changeset/nine-owls-remember.md @@ -0,0 +1,5 @@ +--- +"@scow/config": minor +--- + +新增 ldap 的用户 loginShell 属性与删除用户时删除标识配置 diff --git a/.changeset/orange-vans-add.md b/.changeset/orange-vans-add.md new file mode 100644 index 0000000000..318f47e61c --- /dev/null +++ b/.changeset/orange-vans-add.md @@ -0,0 +1,5 @@ +--- +"@scow/scheduler-adapter-protos": minor +--- + +**删除账户用户功能**需要**1.7.0 及以上版本**的接口 diff --git a/.changeset/thin-vans-rhyme.md b/.changeset/thin-vans-rhyme.md new file mode 100644 index 0000000000..51d30f8399 --- /dev/null +++ b/.changeset/thin-vans-rhyme.md @@ -0,0 +1,7 @@ +--- +"@scow/audit-server": patch +"@scow/mis-server": patch +"@scow/mis-web": patch +--- + +账户列表导出时增加拥有者 ID 和姓名筛选，操作日志修正为导出账户 diff --git a/apps/mis-server/src/services/user.ts b/apps/mis-server/src/services/user.ts index c86c45a9f2..d8de6765c6 100644 --- a/apps/mis-server/src/services/user.ts +++ b/apps/mis-server/src/services/user.ts @@ -646,7 +646,7 @@ export const userServiceServer = plugin((server) => { message: "Error nologin user in LDAP." } as ServiceError; }); } - // else {//本地测试无法通过 + // else { // 无法通过测试 // throw { // code: Status.UNAVAILABLE, // message: "No permission to delete user in LDAP." } as ServiceError; From 8958b939f71be04921d61eac1452680496b187ad Mon Sep 17 00:00:00 2001 From: valign Date: Fri, 30 Aug 2024 09:05:52 +0000 Subject: [PATCH 19/20] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=9A=84=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E6=A0=A1=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/bright-cameras-matter.md | 6 ------ .changeset/early-donkeys-clap.md | 5 ----- .changeset/eighty-pandas-roll.md | 5 ----- .changeset/giant-drinks-remain.md | 6 ------ .changeset/green-apricots-sparkle.md | 5 ----- .changeset/short-deers-shave.md | 11 ----------- .changeset/slow-falcons-give.md | 8 -------- .changeset/strange-lamps-live.md | 5 ----- .changeset/tasty-files-end.md | 7 ------- .changeset/tender-crabs-visit.md | 5 ----- .changeset/tender-spoons-doubt.md | 6 ------ .changeset/tidy-pianos-reply.md | 5 ----- .changeset/warm-gifts-know.md | 11 ----------- .changeset/yellow-sloths-compare.md | 11 ----------- .../accounts/SetBlockThresholdAmountModal.tsx | 1 - 15 files changed, 97 deletions(-) delete mode 100644 .changeset/bright-cameras-matter.md delete mode 100644 .changeset/early-donkeys-clap.md delete mode 100644 .changeset/eighty-pandas-roll.md delete mode 100644 .changeset/giant-drinks-remain.md delete mode 100644 .changeset/green-apricots-sparkle.md delete mode 100644 .changeset/short-deers-shave.md delete mode 100644 .changeset/slow-falcons-give.md delete mode 100644 .changeset/strange-lamps-live.md delete mode 100644 .changeset/tasty-files-end.md delete mode 100644 .changeset/tender-crabs-visit.md delete mode 100644 .changeset/tender-spoons-doubt.md delete mode 100644 .changeset/tidy-pianos-reply.md delete mode 100644 .changeset/warm-gifts-know.md delete mode 100644 .changeset/yellow-sloths-compare.md diff --git a/.changeset/bright-cameras-matter.md b/.changeset/bright-cameras-matter.md deleted file mode 100644 index b58c9caa23..0000000000 --- a/.changeset/bright-cameras-matter.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@scow/lib-web": patch -"@scow/docs": patch ---- - -UI扩展增加导航栏链接自动刷新功能 diff --git a/.changeset/early-donkeys-clap.md b/.changeset/early-donkeys-clap.md deleted file mode 100644 index 6208417984..0000000000 --- a/.changeset/early-donkeys-clap.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@scow/lib-web": patch ---- - -修复 UI 拓展自定义图标大小与导航栏原有图标大小不一致的问题 diff --git a/.changeset/eighty-pandas-roll.md b/.changeset/eighty-pandas-roll.md deleted file mode 100644 index c4980f97f8..0000000000 --- a/.changeset/eighty-pandas-roll.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@scow/lib-web": patch ---- - -UI扩展修复当跳往扩展页面的导航项位于已有导航项的下面时，此扩展页面的导航结构不显示的问题 diff --git a/.changeset/giant-drinks-remain.md b/.changeset/giant-drinks-remain.md deleted file mode 100644 index 2f3943df89..0000000000 --- a/.changeset/giant-drinks-remain.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@scow/lib-web": patch -"@scow/docs": patch ---- - -UI 扩展页面支持修改标题 diff --git a/.changeset/green-apricots-sparkle.md b/.changeset/green-apricots-sparkle.md deleted file mode 100644 index 5166eb130c..0000000000 --- a/.changeset/green-apricots-sparkle.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@scow/mis-web": patch ---- - -增加租户管理下的用户列表的关联账户跳转到账户管理的功能 diff --git a/.changeset/short-deers-shave.md b/.changeset/short-deers-shave.md deleted file mode 100644 index ded32cb18f..0000000000 --- a/.changeset/short-deers-shave.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -"@scow/mis-server": patch -"@scow/mis-web": patch ---- - -增加配置消费记录精度，默认精度为 2 位小数； -增加最小作业消费金额的功能，默认最小作业消费金额为 0.01； -账户、租户的余额展示精度与消费记录精度一致； -充值金额展示的小数位与消费记录的精度保持一致； -充值时数值输入框精度与消费记录的精度保持一致。 - diff --git a/.changeset/slow-falcons-give.md b/.changeset/slow-falcons-give.md deleted file mode 100644 index 60fde76f45..0000000000 --- a/.changeset/slow-falcons-give.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"@scow/portal-server": patch -"@scow/scowd-protos": patch -"@scow/lib-scowd": patch ---- - -scowd 新增 app service 和 GetAppLastSubmission 接口 - diff --git a/.changeset/strange-lamps-live.md b/.changeset/strange-lamps-live.md deleted file mode 100644 index e311b69038..0000000000 --- a/.changeset/strange-lamps-live.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@scow/ai": patch ---- - -修复 AI 应用的工作目录和挂载点重复时报错 diff --git a/.changeset/tasty-files-end.md b/.changeset/tasty-files-end.md deleted file mode 100644 index 2fe6468182..0000000000 --- a/.changeset/tasty-files-end.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@scow/portal-server": patch -"@scow/portal-web": patch -"@scow/ai": patch ---- - -ai 和 hpc 在提交作业和应用前检查一下是否重名 diff --git a/.changeset/tender-crabs-visit.md b/.changeset/tender-crabs-visit.md deleted file mode 100644 index b35f948f27..0000000000 --- a/.changeset/tender-crabs-visit.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@scow/mis-web": patch ---- - -将操作日志、消费记录、结束作业的默认排序改为按照时间倒序。 diff --git a/.changeset/tender-spoons-doubt.md b/.changeset/tender-spoons-doubt.md deleted file mode 100644 index 6fb3c858f7..0000000000 --- a/.changeset/tender-spoons-doubt.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@scow/lib-web": patch -"@scow/docs": patch ---- - -UI 扩展返回的导航项允许指定 navs[].hideIfNotActive 属性 diff --git a/.changeset/tidy-pianos-reply.md b/.changeset/tidy-pianos-reply.md deleted file mode 100644 index f22248060d..0000000000 --- a/.changeset/tidy-pianos-reply.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@scow/ai": patch ---- - -TensorFlow 增加 psNode 和 workerNode 参数 diff --git a/.changeset/warm-gifts-know.md b/.changeset/warm-gifts-know.md deleted file mode 100644 index 2460c6e97d..0000000000 --- a/.changeset/warm-gifts-know.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -"@scow/portal-server": patch -"@scow/lib-operation-log": patch -"@scow/scowd-protos": patch -"@scow/portal-web": patch -"@scow/mis-web": patch -"@scow/lib-server": patch -"@scow/grpc-api": minor ---- - -接入 scowd 文件分片上传 diff --git a/.changeset/yellow-sloths-compare.md b/.changeset/yellow-sloths-compare.md deleted file mode 100644 index a99aa5ab25..0000000000 --- a/.changeset/yellow-sloths-compare.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -"@scow/config": patch ---- - -增加配置消费记录精度、最小消费金额的功能，默认精度为 2 位小数，默认最小消费金额为 0.01。 -### 注意：此更新必定影响作业计费结果（除非您以前所有计费项价格皆为0）如果您不想更改之前的版本中的计费逻辑，需要增加配置如下： - -```yaml title="config/mis.yaml" -jobChargeDecimalPrecision: 3 -jobMinCharge : 0 -``` \ No newline at end of file diff --git a/apps/mis-web/src/pageComponents/accounts/SetBlockThresholdAmountModal.tsx b/apps/mis-web/src/pageComponents/accounts/SetBlockThresholdAmountModal.tsx index 648e9dd0f3..2b4c9e037d 100644 --- a/apps/mis-web/src/pageComponents/accounts/SetBlockThresholdAmountModal.tsx +++ b/apps/mis-web/src/pageComponents/accounts/SetBlockThresholdAmountModal.tsx @@ -83,7 +83,6 @@ export const SetBlockThresholdAmountModal: React.FC = ({ >
{accountName} From a0e9eee21eed9298928c082b95f1559f03de83bb Mon Sep 17 00:00:00 2001 From: valign Date: Fri, 30 Aug 2024 09:11:54 +0000 Subject: [PATCH 20/20] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=9A=84=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=AC=A1=E6=A0=A1=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/admin/createAccount.test.ts | 76 ------------------- 1 file changed, 76 deletions(-) delete mode 100644 apps/mis-server/tests/admin/createAccount.test.ts diff --git a/apps/mis-server/tests/admin/createAccount.test.ts b/apps/mis-server/tests/admin/createAccount.test.ts deleted file mode 100644 index 030a38c5f0..0000000000 --- a/apps/mis-server/tests/admin/createAccount.test.ts +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright (c) 2022 Peking University and Peking University Institute for Computing and Digital Economy - * SCOW is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -import { asyncClientCall } from "@ddadaal/tsgrpc-client"; -import { Server } from "@ddadaal/tsgrpc-server"; -import { ChannelCredentials } from "@grpc/grpc-js"; -import { Status } from "@grpc/grpc-js/build/src/constants"; -import { AccountServiceClient } from "@scow/protos/build/server/account"; -import { createServer } from "src/app"; -import { Account } from "src/entities/Account"; -import { Tenant } from "src/entities/Tenant"; -import { User } from "src/entities/User"; -import { dropDatabase } from "tests/data/helpers"; - -let server: Server; -let client: AccountServiceClient; -let account: Account; -let tenant: Tenant; -let user: User; - -beforeEach(async () => { - server = await createServer(); - await server.start(); - await server.ext.orm.em.fork().persistAndFlush(account); - - tenant = new Tenant({ name: "tenant" }); - await server.ext.orm.em.fork().persistAndFlush(tenant); - - user = new User({ name: "test", userId: "test", tenant: tenant, email:"test@test.com" }); - await server.ext.orm.em.fork().persistAndFlush(user); - - client = new AccountServiceClient(server.serverAddress, ChannelCredentials.createInsecure()); - -}); - -afterEach(async () => { - await dropDatabase(server.ext.orm); - await server.close(); -}); - - -it("create a new account", async () => { - await asyncClientCall(client, "createAccount", { accountName: "a1234", tenantName: tenant.name, - ownerId: user.userId }); - const em = server.ext.orm.em.fork(); - - const account = await em.findOneOrFail(Account, { accountName: "a1234" }); - expect(account.accountName).toBe("a1234"); -}); - - -it("cannot create a account if the name exists", async () => { - const account = new Account({ - accountName: "123", tenant, - blockedInCluster: false, - comment: "test", - }); - await server.ext.orm.em.fork().persistAndFlush(account); - - const reply = await asyncClientCall(client, "createAccount", { - accountName: "123", tenantName: "tenant", - ownerId: user.userId, - }).catch((e) => e); - expect(reply.code).toBe(Status.ALREADY_EXISTS); -}); - -