revert backend changes

Author: adarshm11

api/main_endpoints/routes/OfficeAccessCard.js

@@ -20,7 +20,6 @@ const {
   checkIfCardExists,
   generateAlias,
   deleteCard,
-  editAlias,
 } = require('../util/OfficeAccessCard.js');
 const AuditLogActions = require('../util/auditLogActions.js');
 const AuditLog = require('../models/AuditLog.js');
@@ -81,20 +80,12 @@ router.get('/verify', async (req, res) => {
     return res.status(BAD_REQUEST).send(`${missingValue.title} missing from request`);
   }
 
-  if (!apiKey) {
-    writeLogToClient(req.method, {
-      statusCode: UNAUTHORIZED,
-      message: 'API key missing from request',
-    });
-    return res.sendStatus(UNAUTHORIZED);
-  }
-
   if (apiKey !== API_KEY) {
     writeLogToClient(req.method, {
-      statusCode: FORBIDDEN,
+      statusCode: UNAUTHORIZED,
       message: `Invalid API key: ${apiKey}`,
     });
-    return res.sendStatus(FORBIDDEN);
+    return res.sendStatus(UNAUTHORIZED);
   }
 
   const cardExists = await checkIfCardExists({ cardBytes });
@@ -218,56 +209,6 @@ router.post('/getAllCards', async (req, res) => {
   }
 });
 
-router.post('/edit', async (req, res) => {
-  const decoded = await decodeToken(req);
-  if (decoded.status !== OK) {
-    return res.sendStatus(decoded.status);
-  }
-
-  const { _id, alias } = req.body;
-
-  if (!_id || !alias) {
-    return res.status(BAD_REQUEST).send('_id and alias are required in request body');
-  }
-
-  // Validate alias is not empty or whitespace only
-  if (!alias.trim()) {
-    return res.status(BAD_REQUEST).send('alias cannot be empty or whitespace only');
-  }
-
-  // Validate _id is a valid ObjectId format
-  if (!/^[0-9a-fA-F]{24}$/.test(_id)) {
-    return res.status(BAD_REQUEST).send('_id must be a valid ObjectId');
-  }
-
-  try {
-    const updatedCard = await editAlias(_id, alias);
-
-    if (!updatedCard) {
-      return res.status(NOT_FOUND).send('Card not found');
-    }
-
-    // Log the edit action
-    AuditLog.create({
-      userId: decoded.token._id,
-      action: AuditLogActions.EDIT_CARD,
-      details: {
-        newAlias: alias,
-        oldAlias: updatedCard.alias !== alias ? 'unknown' : alias
-      }
-    });
-
-    logger.info(`Card alias updated successfully for card ID: ${_id}`);
-    return res.status(OK).json({
-      message: 'Card alias updated successfully',
-      card: updatedCard
-    });
-  } catch (error) {
-    logger.error('Error updating card alias: ', error);
-    return res.status(SERVER_ERROR).send('Error updating card alias');
-  }
-});
-
 router.get('/listen', async (req, res) => {
   const decoded = await decodeToken(req, membershipState.OFFICER);
   if (decoded.status !== OK) {

api/main_endpoints/util/OfficeAccessCard.js

@@ -20,7 +20,8 @@ function checkIfCardExists({ cardBytes = null, alias = null } = {}) {
             return resolve(false);
           }
           if (!result) {
-            logger.info('Card not found in the database');
+            const { description } = body;
+            logger.info(`Card:${description} not found in the database`);
           }
           return resolve(result); // return the document
         });
@@ -86,30 +87,4 @@ function deleteCard(alias) {
   });
 }
 
-function editAlias(_id, newAlias) {
-  return new Promise((resolve) => {
-    try {
-      OfficeAccessCard.findByIdAndUpdate(
-        _id,
-        { $set: { alias: newAlias } },
-        { new: true, useFindAndModify: false },
-        (error, result) => {
-          if (error) {
-            logger.error('editAlias got an error querying mongodb: ', error);
-            return resolve(false);
-          }
-          if (!result) {
-            logger.info(`Card with id ${_id} not found in the database`);
-            return resolve(false);
-          }
-          return resolve(result);
-        }
-      );
-    } catch (error) {
-      logger.error('editAlias caught an error: ', error);
-      return resolve(false);
-    }
-  });
-}
-
-module.exports = { checkIfCardExists, generateAlias, deleteCard, editAlias };
+module.exports = { checkIfCardExists, generateAlias, deleteCard };

api/main_endpoints/util/auditLogActions.js

@@ -14,7 +14,6 @@ const AuditLogActions = {
   VERIFY_CARD: 'VERIFY_CARD',
   ADD_CARD: 'ADD_CARD',
   DELETE_CARD: 'DELETE_CARD',
-  EDIT_CARD: 'EDIT_CARD',
 };
 
 module.exports = AuditLogActions;

package-lock.json

@@ -55,28 +55,3 @@ export async function deleteCardFromDb(token, alias) {
   }
   return status;
 }
-
-export async function editCardAlias(token, _id, alias) {
-  let status = new ApiResponse();
-  try {
-    const url = new URL('/api/OfficeAccessCard/edit', BASE_API_URL);
-    const res = await fetch(url.href, {
-      method: 'POST',
-      headers: {
-        'Authorization': `Bearer ${token}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ _id, alias }),
-    });
-    if (res.ok) {
-      const result = await res.json();
-      status.responseData = result;
-    } else {
-      status.error = true;
-    }
-  } catch (err) {
-    status.error = true;
-    status.responseData = err;
-  }
-  return status;
-}

src/APIFunctions/CardReader.js

@@ -3,4 +3,3 @@
   "TINYMCE_API_KEY": "XXXXXXXXXXXXXXXXXXXXX",
   "GOOGLE_API_CLIENT_ID": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.apps.googleusercontent.com"
 }
-

src/Pages/Overview/SVG.js

@@ -45,23 +45,17 @@ const token = '';
 describe('OfficeAccessCard', () => {
   let deleteCardStub = null;
   let getAllCardsStub = null;
-  let editAliasStub = null;
-  let testCardId = null;
 
   const VALID_CARD_BYTES = 'wesleys card';
   const NEW_CARD_BYTES = 'dials card';
   const INVALID_CARD_BYTES = 'evans card';
 
   const VALID_ALIAS = 'gauravs card';
   const INVALID_ALIAS = 'bobs card';
-  const NEW_ALIAS = 'updated test card';
-  const EMPTY_ALIAS = '';
-  const WHITESPACE_ALIAS = '   ';
 
   const VERIFY_API_PATH = '/api/OfficeAccessCard/verify';
   const DELETE_API_PATH = '/api/OfficeAccessCard/delete';
   const GET_ALL_CARDS_API_PATH = '/api/OfficeAccessCard/getAllCards';
-  const EDIT_API_PATH = '/api/OfficeAccessCard/edit';
   const INCREMENT_VERIFY_COUNT = 0;
 
   before(() => {
@@ -82,10 +76,7 @@ describe('OfficeAccessCard', () => {
     });
     return new Promise((resolve, reject) => {
       testOfficeAccessCard.save()
-        .then(savedCard => {
-          testCardId = savedCard._id.toString();
-          resolve(savedCard);
-        })
+        .then(resolve)
         .catch(reject);
     });
   });
@@ -125,14 +116,14 @@ describe('OfficeAccessCard', () => {
       expect(result).to.have.status(BAD_REQUEST);
     });
 
-    it('Should return 403 with invalid api key', async () => {
+    it('Should return 401 with invalid api key', async () => {
       const params = new URLSearchParams();
       params.append('cardBytes', VALID_CARD_BYTES);
       const path = VERIFY_API_PATH + '?' + params.toString();
       const invalidApiKey = API_KEY + '-invalid-suffix';
       const result = await test.sendGetRequestWithApiKey(
         invalidApiKey + '', path);
-      expect(result).to.have.status(FORBIDDEN);
+      expect(result).to.have.status(UNAUTHORIZED);
     });
 
     it('Should return 404 with valid api key and unknown card', async () => {
@@ -250,94 +241,4 @@ describe('OfficeAccessCard', () => {
     });
   });
 
-  describe('POST edit', () => {
-    it('Should return 401 when token is not sent', async () => {
-      const result = await test.sendPostRequest(EDIT_API_PATH);
-      expect(result).to.have.status(UNAUTHORIZED);
-    });
-
-    it('Should return 401 when invalid token is sent', async () => {
-      const result = await test.sendPostRequestWithToken(token,
-        EDIT_API_PATH);
-      expect(result).to.have.status(UNAUTHORIZED);
-    });
-
-    it('Should return 400 when _id is missing from request body', async () => {
-      setTokenStatus(true);
-      const result = await test.sendPostRequestWithToken(token,
-        EDIT_API_PATH, { alias: NEW_ALIAS });
-      expect(result).to.have.status(BAD_REQUEST);
-    });
-
-    it('Should return 400 when alias is missing from request body', async () => {
-      setTokenStatus(true);
-      const result = await test.sendPostRequestWithToken(token,
-        EDIT_API_PATH, { _id: testCardId });
-      expect(result).to.have.status(BAD_REQUEST);
-    });
-
-    it('Should return 404 when trying to edit a non-existent card', async () => {
-      setTokenStatus(true);
-      const nonExistentId = new mongoose.Types.ObjectId().toString();
-      const result = await test.sendPostRequestWithToken(token,
-        EDIT_API_PATH, { _id: nonExistentId, alias: NEW_ALIAS });
-      expect(result).to.have.status(NOT_FOUND);
-    });
-
-    it('Should return 400 when _id is not a valid ObjectId', async () => {
-      setTokenStatus(true);
-      const result = await test.sendPostRequestWithToken(token,
-        EDIT_API_PATH, { _id: 'invalid-id', alias: NEW_ALIAS });
-      expect(result).to.have.status(BAD_REQUEST);
-    });
-
-    it('Should return 200 and successfully update alias for valid request', async () => {
-      setTokenStatus(true);
-      const result = await test.sendPostRequestWithToken(token,
-        EDIT_API_PATH, { _id: testCardId, alias: NEW_ALIAS });
-      expect(result).to.have.status(OK);
-      expect(result.body).to.have.property('message', 'Card alias updated successfully');
-      expect(result.body).to.have.property('card');
-      expect(result.body.card).to.have.property('alias', NEW_ALIAS);
-    });
-
-    it('Should actually update the alias in the database', async () => {
-      setTokenStatus(true);
-      await test.sendPostRequestWithToken(token,
-        EDIT_API_PATH, { _id: testCardId, alias: NEW_ALIAS });
-
-      const updatedCard = await OfficeAccessCard.findById(testCardId);
-      expect(updatedCard.alias).to.equal(NEW_ALIAS);
-    });
-
-    it('Should handle empty alias by returning 400', async () => {
-      setTokenStatus(true);
-      const result = await test.sendPostRequestWithToken(token,
-        EDIT_API_PATH, { _id: testCardId, alias: EMPTY_ALIAS });
-      expect(result).to.have.status(BAD_REQUEST);
-    });
-
-    it('Should handle whitespace-only alias by returning 400', async () => {
-      setTokenStatus(true);
-      const result = await test.sendPostRequestWithToken(token,
-        EDIT_API_PATH, { _id: testCardId, alias: WHITESPACE_ALIAS });
-      expect(result).to.have.status(BAD_REQUEST);
-    });
-
-    it('Should preserve other card properties when updating alias', async () => {
-      setTokenStatus(true);
-      const originalCard = await OfficeAccessCard.findById(testCardId);
-      const originalCardBytes = originalCard.cardBytes;
-      const originalVerifiedCount = originalCard.verifiedCount;
-
-      await test.sendPostRequestWithToken(token,
-        EDIT_API_PATH, { _id: testCardId, alias: NEW_ALIAS });
-
-      const updatedCard = await OfficeAccessCard.findById(testCardId);
-      expect(updatedCard.cardBytes).to.equal(originalCardBytes);
-      expect(updatedCard.verifiedCount).to.equal(originalVerifiedCount);
-      expect(updatedCard.alias).to.equal(NEW_ALIAS);
-    });
-  });
-
 });