diff --git a/api/main_endpoints/routes/Cleezy.js b/api/main_endpoints/routes/Cleezy.js index e634f55f5..452deca52 100644 --- a/api/main_endpoints/routes/Cleezy.js +++ b/api/main_endpoints/routes/Cleezy.js @@ -17,7 +17,7 @@ const { MEMBERSHIP_STATE } = require('../../util/constants.js'); let CLEEZY_URL = process.env.CLEEZY_URL || 'http://localhost:8000'; let URL_SHORTENER_BASE_URL = - process.env.NODE_ENV === 'production' ? 'https://sce.sjsu.edu/s/' : 'http://localhost:8000/find/'; + process.env.NODE_ENV === 'production' ? 'https://sce.sjsu.edu/s/' : 'http://localhost:8000/url/find/'; router.get('/list', async (req, res) => { if(!ENABLED) { @@ -34,7 +34,7 @@ router.get('/list', async (req, res) => { const returnData = await cleezyHelpers.searchCleezyUrls({ page, search, sortColumn, sortOrder }); res.json(returnData); } catch (err) { - logger.error('/listAll had an error', err); + logger.error('/url/list had an error', err); if (err.response && err.response.data) { res.status(err.response.status).json({ error: err.response.data }); } else { @@ -53,12 +53,12 @@ router.post('/createUrl', async (req, res) => { // eslint-disable-next-line camelcase if (expiresAt) jsonbody.expires_at = expiresAt; try { - const response = await axios.post(CLEEZY_URL + '/create_url', jsonbody); + const response = await axios.post(CLEEZY_URL + '/url/create', jsonbody); const data = response.data; const u = new URL( data.alias, URL_SHORTENER_BASE_URL); res.json({ ...data, link: u }); } catch (err) { - logger.error('/createUrl had an error', err); + logger.error('/url/create had an error', err); res.status(err.response.status).json({ error: err.response.data?.detail || err.response.data || 'Unknown error from Cleezy' }); } }); @@ -70,12 +70,12 @@ router.post('/deleteUrl', async (req, res) => { } const { alias } = req.body; axios - .post(CLEEZY_URL + '/delete/' + alias) + .post(CLEEZY_URL + '/url/delete/' + alias) .then(() => { res.sendStatus(OK); }) .catch(err => { - logger.error('/deleteUrl had an error', err); + logger.error('/url/delete had an error', err); res.status(err.response.status).json({ error: err.response.status }); }); }); diff --git a/api/main_endpoints/util/cleezyHelpers.js b/api/main_endpoints/util/cleezyHelpers.js index 18a8766fd..569addc8e 100644 --- a/api/main_endpoints/util/cleezyHelpers.js +++ b/api/main_endpoints/util/cleezyHelpers.js @@ -12,7 +12,7 @@ let URL_SHORTENER_BASE_URL = const searchCleezyUrls = async ({ page, search, sortColumn, sortOrder, limit }) => { try { const cleezyQuery = search?.replace(/[^a-zA-Z0-9]/g, ''); - const cleezyRes = await axios.get(CLEEZY_URL + '/list', { + const cleezyRes = await axios.get(CLEEZY_URL + '/url/list', { params: { page, ...(cleezyQuery !== undefined && { search: cleezyQuery }), diff --git a/nginx.conf b/nginx.conf index b41d91c4f..e3b8790fc 100644 --- a/nginx.conf +++ b/nginx.conf @@ -52,7 +52,7 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass http://cleezy-app/find/$alias; + proxy_pass http://cleezy-app/url/find/$alias; } location ~ ^/qr/(?.*)$ {