Skip to content

Restore admin claim deletion #21

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
darthnithin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Restore admin claim deletion #21

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
28 changes: 21 additions & 7 deletions apps/dashboard/app/api/claims/[action]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import * as schema from "@/lib/server/schema";
import {
fetchLiveClaimCodeFromGet,
} from "@/lib/server/claims/get-claim-code";
import { getAdminIdentityFromRequest } from "@/lib/server/admin-auth";
import {
getDonorUsageForDonor,
rankDonorCandidatesForClaim,
Expand Down Expand Up @@ -655,15 +656,11 @@ async function handleDelete(req: NextRequest) {
}

try {
const auth = await authenticateAppUser(req);
if ("response" in auth) {
return auth.response;
}

const { claimCodeId } = (await req.json()) as {
const adminIdentity = getAdminIdentityFromRequest(req);
const { userId: requestedUserId, claimCodeId } = (await req.json()) as {
userId?: string;
claimCodeId?: string;
};
const userId = auth.user.id;

if (!claimCodeId) {
return NextResponse.json(
Expand All @@ -672,6 +669,23 @@ async function handleDelete(req: NextRequest) {
);
}

let userId: string;
if (adminIdentity) {
if (!requestedUserId) {
return NextResponse.json(
{ error: "Missing userId" },
{ status: 400 }
);
}
userId = requestedUserId;
} else {
const auth = await authenticateAppUser(req);
if ("response" in auth) {
return auth.response;
}
userId = auth.user.id;
}

// Fetch the claim to verify ownership and get amount
const claim = await db
.select()
Expand Down
Loading