Skip to content

Allow admins to update user edits #708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flashy78 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −6
Open

Allow admins to update user edits #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/pages/edits/Edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const EditComponent: FC = () => {
const buttons = (isAdmin(auth.user) || auth.user?.id === edit.user?.id) &&
edit.status === VoteStatusEnum.PENDING && (
<div className="d-flex justify-content-end">
{auth.user?.id === edit.user?.id &&
{(auth.user?.id === edit.user?.id || isAdmin(auth.user)) &&
edit.operation !== OperationEnum.DESTROY &&
!edit.updated && (
<Link to={createHref(ROUTE_EDIT_UPDATE, edit)} className="me-2">
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/pages/edits/EditUpdate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { SceneEditUpdate } from "src/pages/scenes/SceneEditUpdate";
import { PerformerEditUpdate } from "src/pages/performers/PerformerEditUpdate";
import { TagEditUpdate } from "src/pages/tags/TagEditUpdate";
import { StudioEditUpdate } from "src/pages/studios/StudioEditUpdate";
import { isAdmin } from "src/utils";

const EditUpdateComponent: FC = () => {
const auth = useContext(AuthContext);
Expand All @@ -18,7 +19,7 @@ const EditUpdateComponent: FC = () => {

const edit = data?.findEdit;
if (!edit) return <ErrorMessage error="Failed to load edit." />;
if (edit.user?.id != auth.user?.id)
if (edit.user?.id != auth.user?.id && !isAdmin(auth.user))
return <ErrorMessage error="Only the creator can update edits." />;
if (edit.updated)
return <ErrorMessage error="Edits can only be updated once." />;
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/resolver_mutation_edit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (r *mutationResolver) SceneEditUpdate(ctx context.Context, id uuid.UUID, in
return nil, err
}

if existingEdit.UserID.UUID != currentUser.ID {
if validateUserOrAdmin(ctx, existingEdit.UserID.UUID) != nil {
return nil, ErrUnauthorizedUpdate
}

Expand Down Expand Up @@ -151,7 +151,7 @@ func (r *mutationResolver) StudioEditUpdate(ctx context.Context, id uuid.UUID, i
return nil, err
}

if existingEdit.UserID.UUID != currentUser.ID {
if validateUserOrAdmin(ctx, existingEdit.UserID.UUID) != nil {
return nil, ErrUnauthorizedUpdate
}

Expand Down Expand Up @@ -228,7 +228,7 @@ func (r *mutationResolver) TagEditUpdate(ctx context.Context, id uuid.UUID, inpu
return nil, err
}

if existingEdit.UserID.UUID != currentUser.ID {
if validateUserOrAdmin(ctx, existingEdit.UserID.UUID) != nil {
return nil, ErrUnauthorizedUpdate
}

Expand Down Expand Up @@ -311,7 +311,7 @@ func (r *mutationResolver) PerformerEditUpdate(ctx context.Context, id uuid.UUID
return nil, err
}

if existingEdit.UserID.UUID != currentUser.ID {
if validateUserOrAdmin(ctx, existingEdit.UserID.UUID) != nil {
return nil, ErrUnauthorizedUpdate
}

Expand Down