diff --git a/api/v2/inbox_service .go b/api/v2/inbox_service .go index 75df3a759..faaf625c9 100644 --- a/api/v2/inbox_service .go +++ b/api/v2/inbox_service .go @@ -46,7 +46,7 @@ func (s *APIV2Service) UpdateInbox(ctx context.Context, request *apiv2pb.UpdateI return nil, status.Errorf(codes.InvalidArgument, "update mask is required") } - inboxID, err := GetInboxID(request.Inbox.Name) + inboxID, err := ExtractInboxIDFromName(request.Inbox.Name) if err != nil { return nil, status.Errorf(codes.InvalidArgument, "invalid inbox name: %v", err) } @@ -77,7 +77,7 @@ func (s *APIV2Service) UpdateInbox(ctx context.Context, request *apiv2pb.UpdateI } func (s *APIV2Service) DeleteInbox(ctx context.Context, request *apiv2pb.DeleteInboxRequest) (*apiv2pb.DeleteInboxResponse, error) { - inboxID, err := GetInboxID(request.Name) + inboxID, err := ExtractInboxIDFromName(request.Name) if err != nil { return nil, status.Errorf(codes.InvalidArgument, "invalid inbox name: %v", err) } diff --git a/api/v2/resource_name.go b/api/v2/resource_name.go index a9f285229..fea44cfff 100644 --- a/api/v2/resource_name.go +++ b/api/v2/resource_name.go @@ -34,8 +34,8 @@ func GetNameParentTokens(name string, tokenPrefixes ...string) ([]string, error) return tokens, nil } -// GetUsername returns the username from a resource name. -func GetUsername(name string) (string, error) { +// ExtractUsernameFromName returns the username from a resource name. +func ExtractUsernameFromName(name string) (string, error) { tokens, err := GetNameParentTokens(name, UserNamePrefix) if err != nil { return "", err @@ -43,8 +43,8 @@ func GetUsername(name string) (string, error) { return tokens[0], nil } -// GetInboxID returns the inbox ID from a resource name. -func GetInboxID(name string) (int32, error) { +// ExtractInboxIDFromName returns the inbox ID from a resource name. +func ExtractInboxIDFromName(name string) (int32, error) { tokens, err := GetNameParentTokens(name, InboxNamePrefix) if err != nil { return 0, err diff --git a/api/v2/user_service.go b/api/v2/user_service.go index a393aab88..161ca5ad1 100644 --- a/api/v2/user_service.go +++ b/api/v2/user_service.go @@ -28,7 +28,7 @@ var ( ) func (s *APIV2Service) GetUser(ctx context.Context, request *apiv2pb.GetUserRequest) (*apiv2pb.GetUserResponse, error) { - username, err := GetUsername(request.Name) + username, err := ExtractUsernameFromName(request.Name) if err != nil { return nil, status.Errorf(codes.InvalidArgument, "name is required") } @@ -58,7 +58,7 @@ func (s *APIV2Service) CreateUser(ctx context.Context, request *apiv2pb.CreateUs return nil, status.Errorf(codes.PermissionDenied, "permission denied") } - username, err := GetUsername(request.User.Name) + username, err := ExtractUsernameFromName(request.User.Name) if err != nil { return nil, status.Errorf(codes.InvalidArgument, "name is required") } @@ -88,7 +88,7 @@ func (s *APIV2Service) CreateUser(ctx context.Context, request *apiv2pb.CreateUs } func (s *APIV2Service) UpdateUser(ctx context.Context, request *apiv2pb.UpdateUserRequest) (*apiv2pb.UpdateUserResponse, error) { - username, err := GetUsername(request.User.Name) + username, err := ExtractUsernameFromName(request.User.Name) if err != nil { return nil, status.Errorf(codes.InvalidArgument, "name is required") } @@ -159,7 +159,7 @@ func (s *APIV2Service) ListUserAccessTokens(ctx context.Context, request *apiv2p } userID := user.ID - username, err := GetUsername(request.Name) + username, err := ExtractUsernameFromName(request.Name) if err != nil { return nil, status.Errorf(codes.InvalidArgument, "name is required") } diff --git a/web/src/components/ChangeMemberPasswordDialog.tsx b/web/src/components/ChangeMemberPasswordDialog.tsx index a9477790e..3eb98166a 100644 --- a/web/src/components/ChangeMemberPasswordDialog.tsx +++ b/web/src/components/ChangeMemberPasswordDialog.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; -import { useUserStore } from "@/store/module"; +import { useUserV1Store, UserNamePrefix } from "@/store/v1"; import { useTranslate } from "@/utils/i18n"; import { generateDialog } from "./Dialog"; import Icon from "./Icon"; @@ -10,9 +10,9 @@ interface Props extends DialogProps { } const ChangeMemberPasswordDialog: React.FC = (props: Props) => { - const { user: propsUser, destroy } = props; + const { user, destroy } = props; const t = useTranslate(); - const userStore = useUserStore(); + const userStore = useUserV1Store(); const [newPassword, setNewPassword] = useState(""); const [newPasswordAgain, setNewPasswordAgain] = useState(""); @@ -47,10 +47,13 @@ const ChangeMemberPasswordDialog: React.FC = (props: Props) => { } try { - await userStore.patchUser({ - id: propsUser.id, - password: newPassword, - }); + await userStore.updateUser( + { + name: `${UserNamePrefix}${user.username}`, + password: newPassword, + }, + ["password"] + ); toast(t("message.password-changed")); handleCloseBtnClick(); } catch (error: any) { @@ -63,7 +66,7 @@ const ChangeMemberPasswordDialog: React.FC = (props: Props) => { <>

- {t("setting.account-section.change-password")} ({propsUser.username}) + {t("setting.account-section.change-password")} ({user.username})