From 0d2524394b88a20a269a3281070ce5802782ab2a Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Tue, 22 Aug 2023 13:37:25 -0500 Subject: [PATCH 1/3] chore(cleanup) cleaning up console logs --- src/data/db.ts | 2 -- src/data/messages.ts | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/data/db.ts b/src/data/db.ts index 3b1ebd4..5e415d2 100644 --- a/src/data/db.ts +++ b/src/data/db.ts @@ -72,7 +72,6 @@ export async function getRoomsByIdentity(identity: string): Promise { rooms.forEach((room) => { r.push(room.roomId); }); - console.log(r); return r; } catch (err) { console.error(err); @@ -255,7 +254,6 @@ export async function createRoom( membershipType?: string ): Promise { const claimCodes: { claimcode: string }[] = genClaimCodeArray(numClaimCodes); - console.log(claimCodes); const mockUsers: string[] = genMockUsers(approxNumMockUsers); const roomData = { where: { diff --git a/src/data/messages.ts b/src/data/messages.ts index e0a6788..7f03d1b 100644 --- a/src/data/messages.ts +++ b/src/data/messages.ts @@ -109,8 +109,7 @@ export function createMessage(roomId: string, message: MessageI): createMessageR .then((collisionResult) => { if (!collisionResult.collision) { addMessageToRoom(roomId, message) - .then((roomToUpdate) => { - console.log(roomToUpdate); + .then(() => { return { success: true }; }) .catch((error) => { @@ -118,7 +117,7 @@ export function createMessage(roomId: string, message: MessageI): createMessageR return false; }); } else { - console.log('Collision found'); + console.debug('Collision found'); const identityCommitment = getIdentityCommitmentFromSecret(collisionResult.secret!); removeIdentityFromRoom(identityCommitment.toString(), room) .then(() => { From d102ee5fe51ff21d2dbf7f052655f1200520462d Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Tue, 22 Aug 2023 13:40:22 -0500 Subject: [PATCH 2/3] chore(cleanup) deleting more console logs --- src/endpoints/index.ts | 5 +---- tests/express.test.ts | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/endpoints/index.ts b/src/endpoints/index.ts index 1bd4885..9af3c6a 100644 --- a/src/endpoints/index.ts +++ b/src/endpoints/index.ts @@ -112,7 +112,7 @@ export function initEndpoints(app: Express, adminAuth: RequestHandler) { res.status(400).json({ message: '{code: string, idc: string} expected' }); } const { code, idc } = parsedBody; - console.log('Invite Code:', code); + console.debug('Invite Code:', code); // Check if claim code is valid and not used before const codeStatus = await findClaimCode(code); @@ -154,9 +154,7 @@ export function initEndpoints(app: Express, adminAuth: RequestHandler) { /* ~~~~ ADMIN ENDPOINTS ~~~~ */ app.post(['/room/add', '/api/room/add'], adminAuth, (req, res) => { - console.log(req.body); const roomMetadata = req.body as addRoomData; - console.log(roomMetadata); const roomName = roomMetadata.roomName; const rateLimit = roomMetadata.rateLimit; const userMessageLimit = roomMetadata.userMessageLimit; @@ -180,7 +178,6 @@ export function initEndpoints(app: Express, adminAuth: RequestHandler) { membershipType ) .then((result) => { - console.log(result); if (result) { // TODO should return roomID and claim codes if they are generated res.status(200).json({ message: 'Room created successfully' }); diff --git a/tests/express.test.ts b/tests/express.test.ts index 00c587d..8398ee3 100644 --- a/tests/express.test.ts +++ b/tests/express.test.ts @@ -31,7 +31,7 @@ const room = { }; const roomByIdTest = genId(serverConfig.id as bigint, room.roomName).toString(); -let testCode = ""; +let testCode = ''; const testIdentity = randBigint(); const username = 'admin'; const password = process.env.PASSWORD; @@ -42,7 +42,9 @@ describe('Endpoints should all work hopefully', () => { .get('/') .then((res) => { expect(res.status).toBe(200); - expect(res.header['content-type']).toBe('application/json; charset=utf-8'); + expect(res.header['content-type']).toBe( + 'application/json; charset=utf-8' + ); expect(res.body.id).toBe(serverConfig.id); }) .catch((error) => pp("GET '/' - " + error, 'error')); @@ -51,7 +53,9 @@ describe('Endpoints should all work hopefully', () => { test('It should add a new room to the database', async () => { const username = 'admin'; const password = process.env.PASSWORD; - const base64Credentials = Buffer.from(`${username}:${password}`).toString('base64'); + const base64Credentials = Buffer.from(`${username}:${password}`).toString( + 'base64' + ); await request(_app) .post('/room/add') .set('Authorization', `Basic ${base64Credentials}`) @@ -84,7 +88,9 @@ describe('Endpoints should all work hopefully', () => { test('It should return all rooms', async () => { const username = 'admin'; const password = process.env.PASSWORD; - const base64Credentials = Buffer.from(`${username}:${password}`).toString('base64'); + const base64Credentials = Buffer.from(`${username}:${password}`).toString( + 'base64' + ); await request(_app) .get('/api/rooms') @@ -104,7 +110,9 @@ describe('Endpoints should all work hopefully', () => { test("It should return all claim codes and add a user's identity to the rooms the claim code is associated with", async () => { const username = 'admin'; const password = process.env.PASSWORD; - const base64Credentials = Buffer.from(`${username}:${password}`).toString('base64'); + const base64Credentials = Buffer.from(`${username}:${password}`).toString( + 'base64' + ); await request(_app) .get('/logclaimcodes') @@ -136,14 +144,12 @@ describe('Endpoints should all work hopefully', () => { console.error('Error in request: ', error); }); }); - console.log(testIdentity); test('It should return all rooms associated with the given identity', async () => { await request(_app) .get(`/api/rooms/${testIdentity}`) .then((res) => { try { - console.log(res.body); expect(res.statusCode).toEqual(200); } catch (error) { pp('GET /api/rooms/:idc - ' + error, 'error'); @@ -156,7 +162,9 @@ describe('Endpoints should all work hopefully', () => { const message = { message: 'Test message' }; - const base64Credentials = Buffer.from(`${username}:${password}`).toString('base64'); + const base64Credentials = Buffer.from(`${username}:${password}`).toString( + 'base64' + ); await request(_app) .post('/admin/message') .set('Authorization', `Basic ${base64Credentials}`) From 8be6d53e096b00bda134ed501851c6cc93204360 Mon Sep 17 00:00:00 2001 From: Tanner Shaw Date: Tue, 22 Aug 2023 14:29:41 -0500 Subject: [PATCH 3/3] fix(express) await handling joining identity list rooms --- src/data/db.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/db.ts b/src/data/db.ts index 5e415d2..d9fe6fd 100644 --- a/src/data/db.ts +++ b/src/data/db.ts @@ -108,12 +108,12 @@ function sanitizeIDC(idc: string): string { export async function updateRoomIdentities(idc: string, roomIds: string[]): Promise { const identityCommitment = sanitizeIDC(idc); - return prisma.rooms + return await prisma.rooms .findMany({ where: { id: { in: roomIds } } }) - .then((rooms) => { - addIdentityToIdentityListRooms(rooms, identityCommitment); + .then(async (rooms) => { + await addIdentityToIdentityListRooms(rooms, identityCommitment); addIdentityToBandadaRooms(rooms, identityCommitment); }) .catch((err) => {