diff --git a/api/main_endpoints/routes/Cleezy.js b/api/main_endpoints/routes/Cleezy.js index 1de62d989..e634f55f5 100644 --- a/api/main_endpoints/routes/Cleezy.js +++ b/api/main_endpoints/routes/Cleezy.js @@ -12,7 +12,7 @@ const logger = require('../../util/logger'); const { Cleezy } = require('../../config/config.json'); const { ENABLED } = Cleezy; const cleezyHelpers = require('../util/cleezyHelpers.js'); -const { membershipState } = require('../../../src/Enums.js'); +const { MEMBERSHIP_STATE } = require('../../util/constants.js'); let CLEEZY_URL = process.env.CLEEZY_URL || 'http://localhost:8000'; @@ -26,7 +26,7 @@ router.get('/list', async (req, res) => { }); } const { page = 0, search, sortColumn = 'created_at', sortOrder = 'DESC'} = req.query; - const decoded = await decodeToken(req, membershipState.OFFICER); + const decoded = await decodeToken(req, MEMBERSHIP_STATE.OFFICER); if (decoded.status !== OK) { return res.sendStatus(decoded.status); } @@ -44,7 +44,7 @@ router.get('/list', async (req, res) => { }); router.post('/createUrl', async (req, res) => { - const decoded = await decodeToken(req, membershipState.OFFICER); + const decoded = await decodeToken(req, MEMBERSHIP_STATE.OFFICER); if (decoded.status !== OK) { return res.sendStatus(decoded.status); } @@ -64,7 +64,7 @@ router.post('/createUrl', async (req, res) => { }); router.post('/deleteUrl', async (req, res) => { - const decoded = await decodeToken(req, membershipState.OFFICER); + const decoded = await decodeToken(req, MEMBERSHIP_STATE.OFFICER); if (decoded.status !== OK) { return res.sendStatus(decoded.status); } diff --git a/api/main_endpoints/routes/LedSign.js b/api/main_endpoints/routes/LedSign.js index 551dec994..89a309ee3 100644 --- a/api/main_endpoints/routes/LedSign.js +++ b/api/main_endpoints/routes/LedSign.js @@ -13,7 +13,7 @@ const AuditLog = require('../models/AuditLog.js'); const { LED_SIGN = {} } = require('../../config/config.json'); -const { membershipState } = require('../../../src/Enums.js'); +const { MEMBERSHIP_STATE } = require('../../util/constants.js'); const runningInTest = process.env.NODE_ENV === 'test'; @@ -35,7 +35,7 @@ router.get('/healthCheck', async (req, res) => { }); router.post('/updateSignText', async (req, res) => { - const decoded = await decodeToken(req, membershipState.OFFICER); + const decoded = await decodeToken(req, MEMBERSHIP_STATE.OFFICER); if (decoded.status !== OK) { logger.warn('/updateSignText was requested with an invalid token'); return res.sendStatus(decoded.status); diff --git a/src/Pages/LedSign/LedSign.js b/src/Pages/LedSign/LedSign.js index dd2cf48e9..a0cd1dfe7 100644 --- a/src/Pages/LedSign/LedSign.js +++ b/src/Pages/LedSign/LedSign.js @@ -194,7 +194,7 @@ function LedSign() { async function checkSignHealth() { setLoading(true); const status = await healthCheck(user.firstName); - if (status && !status.error) { + if (status.responseData && !status.error) { setSignHealthy(true); const { responseData } = status; if (Object.keys(responseData).length > 0) {