From fe987055da14662a18353e05589899f34e755753 Mon Sep 17 00:00:00 2001 From: EJ Huang Date: Fri, 17 Jan 2025 07:44:24 +0800 Subject: [PATCH] add request.userid from feTS --- .../moderation/__fixtures__/awardBadge.ts | 4 ++++ src/adm/index.ts | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/adm/handlers/moderation/__fixtures__/awardBadge.ts b/src/adm/handlers/moderation/__fixtures__/awardBadge.ts index 03e846fc..ac394c60 100644 --- a/src/adm/handlers/moderation/__fixtures__/awardBadge.ts +++ b/src/adm/handlers/moderation/__fixtures__/awardBadge.ts @@ -26,7 +26,11 @@ export default { '/badges/doc/test-certification-001': { name: 'Test Certification', + displayName: 'Test Certification', description: 'A test certification badge', + link: 'https://badge.source.com', + icon: 'https://badge.source.com/icon.png', + borderImage: 'https://badge.source.com/border.png', issuers: ['authorized-issuer@test.com', 'service-token-123'], createdAt: '2020-01-01T00:00:00.000Z', updatedAt: '2020-01-01T00:00:00.000Z', diff --git a/src/adm/index.ts b/src/adm/index.ts index b1219e86..132459f8 100644 --- a/src/adm/index.ts +++ b/src/adm/index.ts @@ -3,7 +3,7 @@ import 'dotenv/config'; import { createServer } from 'node:http'; import { readFileSync } from 'node:fs'; import path from 'node:path'; -import { createRouter, Response } from 'fets'; +import { createRouter, Response, Request } from 'fets'; import { Type } from '@sinclair/typebox'; import { useAuditLog, useAuth } from './util'; @@ -50,7 +50,7 @@ const router = createRouter({ ), }, }, - handler: async (request) => + handler: async (request: Request) => Response.json(pingHandler(await request.json())), }) .route({ @@ -81,7 +81,7 @@ const router = createRouter({ }), }, }, - handler: async (request) => + handler: async (request: Request) => Response.json(await blockUser(await request.json())), }) .route({ @@ -112,8 +112,15 @@ const router = createRouter({ }), }, }, - handler: async (request) => - Response.json(await awardBadge(await request.json())), + handler: async (request: Request) => { + const body = await request.json(); + return Response.json( + await awardBadge({ + ...body, + request, // Pass the entire request object from feTS + }) + ); + }, }); createServer(router).listen(process.env.ADM_PORT, () => {