Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

feat: support update user's role

johnnyjoyf9e07a2245a7
diff --git a/server/router/api/v1/user_service.go b/server/router/api/v1/user_service.go
index bb7727c4e..3c70126ca 100644
--- a/server/router/api/v1/user_service.go
+++ b/server/router/api/v1/user_service.go
@@ -145,11 +145,9 @@ func (s *APIV1Service) CreateUser(ctx context.Context, request *v1pb.CreateUserR
}
func (s *APIV1Service) UpdateUser(ctx context.Context, request *v1pb.UpdateUserRequest) (*v1pb.User, error) {
- workspaceGeneralSetting, err := s.Store.GetWorkspaceGeneralSetting(ctx)
- if err != nil {
- return nil, status.Errorf(codes.Internal, "failed to get workspace general setting: %v", err)
+ if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
+ return nil, status.Errorf(codes.InvalidArgument, "update mask is empty")
}
-
userID, err := ExtractUserIDFromName(request.User.Name)
if err != nil {
return nil, status.Errorf(codes.InvalidArgument, "invalid user name: %v", err)
@@ -158,12 +156,11 @@ func (s *APIV1Service) UpdateUser(ctx context.Context, request *v1pb.UpdateUserR
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to get user: %v", err)
}
+ // Check permission.
+ // Only allow admin or self to update user.
if currentUser.ID != userID && currentUser.Role != store.RoleAdmin && currentUser.Role != store.RoleHost {
return nil, status.Errorf(codes.PermissionDenied, "permission denied")
}
- if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
- return nil, status.Errorf(codes.InvalidArgument, "update mask is empty")
- }
user, err := s.Store.GetUser(ctx, &store.FindUser{ID: &userID})
if err != nil {
@@ -178,6 +175,10 @@ func (s *APIV1Service) UpdateUser(ctx context.Context, request *v1pb.UpdateUserR
ID: user.ID,
UpdatedTs: &currentTs,
}
+ workspaceGeneralSetting, err := s.Store.GetWorkspaceGeneralSetting(ctx)
+ if err != nil {
+ return nil, status.Errorf(codes.Internal, "failed to get workspace general setting: %v", err)
+ }
for _, field := range request.UpdateMask.Paths {
if field == "username" {
if workspaceGeneralSetting.DisallowChangeUsername {
@@ -199,6 +200,10 @@ func (s *APIV1Service) UpdateUser(ctx context.Context, request *v1pb.UpdateUserR
} else if field == "description" {
update.Description = &request.User.Description
} else if field == "role" {
+ // Only allow admin to update role.
+ if currentUser.Role != store.RoleAdmin && currentUser.Role != store.RoleHost {
+ return nil, status.Errorf(codes.PermissionDenied, "permission denied")
+ }
role := convertUserRoleToStore(request.User.Role)
update.Role = &role
} else if field == "password" {
diff --git a/store/db/mysql/user.go b/store/db/mysql/user.go
index fab15066a..0db9dda95 100644
--- a/store/db/mysql/user.go
+++ b/store/db/mysql/user.go
@@ -64,6 +64,9 @@ func (d *DB) UpdateUser(ctx context.Context, update *store.UpdateUser) (*store.U
if v := update.Description; v != nil {
set, args = append(set, "`description` = ?"), append(args, *v)
}
+ if v := update.Role; v != nil {
+ set, args = append(set, "`role` = ?"), append(args, *v)
+ }
args = append(args, update.ID)
query := "UPDATE `user` SET " + strings.Join(set, ", ") + " WHERE `id` = ?"
diff --git a/store/db/postgres/user.go b/store/db/postgres/user.go
index 807b89559..87ea847cc 100644
--- a/store/db/postgres/user.go
+++ b/store/db/postgres/user.go
@@ -51,6 +51,9 @@ func (d *DB) UpdateUser(ctx context.Context, update *store.UpdateUser) (*store.U
if v := update.Description; v != nil {
set, args = append(set, "description = "+placeholder(len(args)+1)), append(args, *v)
}
+ if v := update.Role; v != nil {
+ set, args = append(set, "role = "+placeholder(len(args)+1)), append(args, *v)
+ }
query := `
UPDATE "user"
diff --git a/store/db/sqlite/user.go b/store/db/sqlite/user.go
index c07ef4a67..1003107f4 100644
--- a/store/db/sqlite/user.go
+++ b/store/db/sqlite/user.go
@@ -52,6 +52,9 @@ func (d *DB) UpdateUser(ctx context.Context, update *store.UpdateUser) (*store.U
if v := update.Description; v != nil {
set, args = append(set, "description = ?"), append(args, *v)
}
+ if v := update.Role; v != nil {
+ set, args = append(set, "role = ?"), append(args, *v)
+ }
args = append(args, update.ID)
query := `
diff --git a/web/src/components/CreateUserDialog.tsx b/web/src/components/CreateUserDialog.tsx
new file mode 100644
index 000000000..db27dd7e6
--- /dev/null
+++ b/web/src/components/CreateUserDialog.tsx
@@ -0,0 +1,134 @@
+import { Radio, RadioGroup } from "@mui/joy";
+import { Button, Input } from "@usememos/mui";
+import { XIcon } from "lucide-react";
+import { useState } from "react";
+import { toast } from "react-hot-toast";
+import { userServiceClient } from "@/grpcweb";
+import useLoading from "@/hooks/useLoading";
+import { User, User_Role } from "@/types/proto/api/v1/user_service";
+import { useTranslate } from "@/utils/i18n";
+import { generateDialog } from "./Dialog";
+
+interface Props extends DialogProps {
+ user?: User;
+ confirmCallback?: () => void;
+}
+
+const CreateUserDialog: React.FC<Props> = (props: Props) => {
+ const { confirmCallback, destroy } = props;
+ const t = useTranslate();
+ const [user, setUser] = useState(User.fromPartial({ ...props.user }));
+ const requestState = useLoading(false);
+ const isCreating = !props.user;
+
+ const setPartialUser = (state: Partial<User>) => {
+ setUser({
+ ...user,
+ ...state,
+ });
+ };
+
+ const handleConfirm = async () => {
+ if (isCreating && (!user.username || !user.password)) {
+ toast.error("Username and password cannot be empty");
+ return;
+ }
+
+ try {
+ if (isCreating) {
+ await userServiceClient.createUser({ user });
+ toast.success("Create user successfully");
+ } else {
+ const updateMask = [];
+ if (user.username !== props.user?.username) {
+ updateMask.push("username");
+ }
+ if (user.password) {
+ updateMask.push("password");
+ }
+ if (user.role !== props.user?.role) {
+ updateMask.push("role");
+ }
+ await userServiceClient.updateUser({ user, updateMask });
+ toast.success("Update user successfully");
+ }
+ } catch (error: any) {
+ console.error(error);
+ toast.error(error.details);
+ }
+ if (confirmCallback) {
+ confirmCallback();
+ }
+ destroy();
+ };
+
+ return (
+ <div className="max-w-full shadow flex flex-col justify-start items-start bg-white dark:bg-zinc-800 dark:text-gray-300 p-4 rounded-lg">
+ <div className="flex flex-row justify-between items-center mb-4 gap-2 w-full">
+ <p className="title-text">{`${isCreating ? t("common.create") : t("common.edit")} ${t("common.user")}`}</p>
+ <Button size="sm" variant="plain" onClick={() => destroy()}>
+ <XIcon className="w-5 h-auto" />
+ </Button>
+ </div>
+ <div className="flex flex-col justify-start items-start max-w-md min-w-72">
+ <div className="w-full flex flex-col justify-start items-start mb-3">
+ <span className="text-sm whitespace-nowrap mb-1">{t("common.username")}</span>
+ <Input
+ className="w-full"
+ type="text"
+ placeholder={t("common.username")}
+ value={user.username}
+ onChange={(e) =>
+ setPartialUser({
+ username: e.target.value,
+ })
+ }
+ />
+ <span className="text-sm whitespace-nowrap mt-3 mb-1">{t("common.password")}</span>
+ <Input
+ className="w-full"
+ type="password"
+ placeholder={t("common.password")}
+ autoComplete="off"
+ value={user.password}
+ onChange={(e) =>
+ setPartialUser({
+ password: e.target.value,
+ })
+ }
+ />
+ <span className="text-sm whitespace-nowrap mt-3 mb-1">{t("common.role")}</span>
+ <RadioGroup
+ orientation="horizontal"
+ defaultValue={user.role}
+ onChange={(e) => setPartialUser({ role: e.target.value as User_Role })}
+ >
+ <Radio value={User_Role.USER} label={t("setting.member-section.user")} />
+ <Radio value={User_Role.ADMIN} label={t("setting.member-section.admin")} />
+ </RadioGroup>
+ </div>
+ <div className="w-full flex flex-row justify-end items-center space-x-2 mt-2">
+ <Button variant="plain" disabled={requestState.isLoading} onClick={destroy}>
+ {t("common.cancel")}
+ </Button>
+ <Button color="primary" disabled={requestState.isLoading} onClick={handleConfirm}>
+ {t("common.confirm")}
+ </Button>
+ </div>
+ </div>
+ </div>
+ );
+};
+
+function showCreateUserDialog(user?: User, confirmCallback?: () => void) {
+ generateDialog(
+ {
+ className: "create-user-dialog",
+ dialogName: "create-user-dialog",
+ },
+ CreateUserDialog,
+ { user, confirmCallback },
+ );
+}
+
+export default showCreateUserDialog;
diff --git a/web/src/components/Settings/MemberSection.tsx b/web/src/components/Settings/MemberSection.tsx
index 58155e9a5..556775e4e 100644
--- a/web/src/components/Settings/MemberSection.tsx
+++ b/web/src/components/Settings/MemberSection.tsx
@@ -10,7 +10,7 @@ import { userStore } from "@/store/v2";
import { State } from "@/types/proto/api/v1/common";
import { User, User_Role } from "@/types/proto/api/v1/user_service";
import { useTranslate } from "@/utils/i18n";
-import showChangeMemberPasswordDialog from "../ChangeMemberPasswordDialog";
+import showCreateUserDialog from "../CreateUserDialog";
interface LocalState {
creatingUser: User;
@@ -106,10 +106,6 @@ const MemberSection = () => {
});
};
- const handleChangePasswordClick = (user: User) => {
- showChangeMemberPasswordDialog(user);
- };
-
const handleArchiveUserClick = async (user: User) => {
const confirmed = window.confirm(t("setting.member-section.archive-warning", { username: user.nickname }));
if (confirmed) {
@@ -222,9 +218,7 @@ const MemberSection = () => {
<MoreVerticalIcon className="w-4 h-auto" />
</MenuButton>
<Menu placement="bottom-end" size="sm">
- <MenuItem onClick={() => handleChangePasswordClick(user)}>
- {t("setting.account-section.change-password")}
- </MenuItem>
+ <MenuItem onClick={() => showCreateUserDialog(user, () => fetchUsers())}>{t("common.update")}</MenuItem>
{user.state === State.NORMAL ? (
<MenuItem onClick={() => handleArchiveUserClick(user)}>{t("setting.member-section.archive-member")}</MenuItem>
) : (
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index 5569185b9..c457cecaf 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -94,6 +94,7 @@
"unpin": "Unpin",
"update": "Update",
"upload": "Upload",
+ "user": "User",
"username": "Username",
"version": "Version",
"visibility": "Visibility",