Updated URLs, fixed bug w/ addScans (handling updated response schema)

README.md

@@ -1,4 +1,4 @@
-<img src="https://equalify.dev/equalify.svg" alt="Equalify Logo" width="300">
+<img src="https://dashboard.equalify.app/equalify.svg" alt="Equalify Logo" width="300">
 
 # Equalify API
 
@@ -13,10 +13,10 @@ Our API is stateless and is intended to run ephemerally on serverless environmen
 ## Important Links
 
 [Postman Collection](https://documenter.getpostman.com/view/26880150/2sA3BoarvB)  
-[GitBook Documentation](https://docs.equalify.dev/)
+[GitBook Documentation](https://docs.equalify.app/)
 
-Production environment: https://api.equalify.dev  
-Staging environment: https://api-staging.equalify.dev  
+Production environment: https://api.equalify.app +
+Staging environment: https://api.equalify.dev  
 Local environment: http://localhost:3000
 
 ## Setup

src/cognito/customMessageForgotPassword.ts

@@ -2,6 +2,6 @@ import { formatEmail } from '#src/utils';
 
 export const customMessageForgotPassword = async (event) => {
     event.response.emailSubject = `Please reset your password`;
-    event.response.emailMessage = formatEmail({ body: `<p>${event.request.userAttributes['name'] ?? 'Hello there'},</p><p>Please reset your password by <a href="https://${process.env.STAGING ? 'staging.' : ''}equalify.dev/reset?username=${event.userName}&code=${event.request.codeParameter}">clicking here</a>.<p>Thank you,<br/>Equalify<div style="display:none"><a>${event.request.codeParameter}</a><a>${event.request.codeParameter}</a></div>` });
+    event.response.emailMessage = formatEmail({ body: `<p>${event.request.userAttributes['name'] ?? 'Hello there'},</p><p>Please reset your password by <a href="https://${process.env.STAGING ? 'equalify.dev' : 'dashboard.equalify.app'}/reset?username=${event.userName}&code=${event.request.codeParameter}">clicking here</a>.<p>Thank you,<br/>Equalify<div style="display:none"><a>${event.request.codeParameter}</a><a>${event.request.codeParameter}</a></div>` });
     return event;
 }

src/cognito/customMessageUpdateUserAttribute.ts

@@ -2,7 +2,7 @@ import { formatEmail } from '#src/utils';
 
 export const customMessageUpdateUserAttribute = async (event) => {
     event.response.emailSubject = `Please confirm your new email address`;
-    event.response.emailMessage = formatEmail({ body: `<p>${event.request.userAttributes['name']},</p><p>Please confirm your new email address by <a href="https://${process.env.STAGING ? 'staging.' : ''}equalify.dev/verify?type=email&code=${event.request.codeParameter}">clicking here</a>.<p>Thank you,<br/>Equalify<div style="display:none"><a>${event.request.codeParameter}</a><a>${event.request.codeParameter}</a></div>` });
+    event.response.emailMessage = formatEmail({ body: `<p>${event.request.userAttributes['name']},</p><p>Please confirm your new email address by <a href="https://${process.env.STAGING ? 'equalify.dev' : 'dashboard.equalify.app'}/verify?type=email&code=${event.request.codeParameter}">clicking here</a>.<p>Thank you,<br/>Equalify<div style="display:none"><a>${event.request.codeParameter}</a><a>${event.request.codeParameter}</a></div>` });
 
     return event;
 }

src/cognito/customMessageVerifyUserAttribute.ts

@@ -1,5 +1,5 @@
 export const customMessageVerifyUserAttribute = async (event) => {
-    event.response.smsMessage = `Equalify: Verify your phone number by visting "https://${process.env.STAGING ? 'staging.' : ''}equalify.dev/verify?type=phone_number&code=${event.request.codeParameter}"`;
+    event.response.smsMessage = `Equalify: Verify your phone number by visting "https://${process.env.STAGING ? 'equalify.dev' : 'dashboard.equalify.app'}/verify?type=phone_number&code=${event.request.codeParameter}"`;
 
     return event;
 }

src/routes/addScans.ts

@@ -39,9 +39,8 @@ export const addScans = async ({ request, reply }) => {
                         body: JSON.stringify({ url: (propertyDiscovery === 'sitemap' && !url.endsWith('.xml')) ? `${url}/sitemap.xml` : url })
                     })).json();
                     console.log(JSON.stringify({ scanResponse }));
-                    const scanArray = scanResponse?.jobID ? [{ JobID: scanResponse?.jobID, url: url }] : scanResponse.map(obj => ({ JobID: obj.JobID, url: obj.URL }));
 
-                    for (const { JobID, url } of scanArray) {
+                    for (const { jobId, url } of scanResponse?.jobs ?? []) {
                         const urlId = (await db.query({
                             text: `SELECT "id" FROM "urls" WHERE "user_id"=$1 AND "url"=$2 AND "property_id"=$3`,
                             values: [jwtClaims.sub, url, propertyId],
@@ -52,7 +51,7 @@ export const addScans = async ({ request, reply }) => {
 
                         await db.query({
                             text: `INSERT INTO "scans" ("user_id", "property_id", "url_id", "job_id") VALUES ($1, $2, $3, $4) RETURNING "id"`,
-                            values: [jwtClaims.sub, propertyId, urlId, parseInt(JobID)]
+                            values: [jwtClaims.sub, propertyId, urlId, parseInt(jobId)]
                         });
                     }
                 }

src/scheduled/processScans.ts

@@ -4,6 +4,7 @@ export const processScans = async () => {
     // This route is called once every minute by Amazon EventBridge Scheduler
     await db.connect();
     const scans = (await db.query(`SELECT "id", "job_id", "property_id", "user_id" FROM "scans" WHERE "processing"=TRUE ORDER BY "created_at" DESC`)).rows;
+    console.log(scans);
     await Promise.allSettled(scans.map(scan => new Promise(async (res) => {
         try {
             const { result, status } = await (await fetch(`https://scan.equalify.app/results/${scan.job_id}`)).json();

src/utils/formatEmail.ts

@@ -1,3 +1,3 @@
 export const formatEmail = ({ body }) => {
-    return `<p><img style="width:300px" src="https://equalify.dev/social.jpg"/></p>${body}`;
+    return `<p><img style="width:300px" src="https://dashboard.equalify.app/social.jpg"/></p>${body}`;
 };