Merge pull request #90 from staadecker/upgrade-and-logging

Upgrade packages and enable more logging.

Author: staadecker

components/expired-members-remover/index.js

@@ -61,14 +61,16 @@ const loadConfigFromGoogleSecretManager = async () => {
 /**
  * Useful to avoid unhandled promise rejection errors
  */
-const errorHandler = (func) => async (...args) => {
-  try {
-    await func(...args);
-  } catch (e) {
-    console.error(e);
-    throw e;
-  }
-};
+const errorHandler =
+  (func) =>
+  async (...args) => {
+    try {
+      await func(...args);
+    } catch (e) {
+      console.error(e);
+      throw e;
+    }
+  };
 
 const sendRemovingEmail = async (expiredMember) => {
   const msg = {
@@ -179,7 +181,7 @@ const getMembersInGroup = async (googleGroupClient) => {
     if (!res.data.members) continue; // If no members don't try map()
 
     const emailsForPage = res.data.members.map(
-      (m) => ({id: m.id, email: parseEmailForComparing(m.email)}) // makes emails lower case and removes . in gmail addresses
+      (m) => ({ id: m.id, email: parseEmailForComparing(m.email) }) // makes emails lower case and removes . in gmail addresses
     );
     emails = emails.concat(emailsForPage); // append to list of all emails
   } while (pageToken !== undefined);
@@ -227,7 +229,10 @@ const getName = (member) => {
  */
 const getExpiredMembers = async (membersInGroup, emailsInDb) => {
   const expiredEmails = membersInGroup.filter((member) => {
-    return !emailsInDb.hasOwnProperty(member.email) || emailsInDb[member.email].expired;
+    return (
+      !emailsInDb.hasOwnProperty(member.email) ||
+      emailsInDb[member.email].expired
+    );
   });
 
   return expiredEmails.map((member) => ({

components/expired-members-remover/index.test.js

@@ -10,7 +10,7 @@ describe("all tests", () => {
     ];
 
     for (let test_case of test_data) {
-        expect(getName(test_case.input)).toBe(test_case.expected);
+      expect(getName(test_case.input)).toBe(test_case.expected);
     }
   });
 
@@ -21,10 +21,10 @@ describe("all tests", () => {
       { input: "smith.John@gmail.com", expected: "smithjohn@gmail.com" },
       { input: "smithjohn@gMail.com", expected: "smithjohn@gmail.com" },
       { input: "smith.john@outlook.com", expected: "smith.john@outlook.com" },
-    ]
+    ];
 
     for (let test_case of test_data) {
       expect(parseEmailForComparing(test_case.input)).toBe(test_case.expected);
     }
-  })
+  });
 });

components/expired-members-remover/package.json

@@ -12,15 +12,15 @@
   "license": "MIT",
   "devDependencies": {
     "cross-env": "^7.0.2",
-    "dotenv": "^8.2.0",
-    "jest": "^26.1.0",
+    "dotenv": "^16.0.0",
+    "jest": "^27.5.1",
     "supertest": "^6.0.1"
   },
   "dependencies": {
     "@google-cloud/secret-manager": "^3.10.0",
     "@sendgrid/mail": "^7.4.4",
     "google-spreadsheet": "^3.0.11",
-    "googleapis": "^74.2.0"
+    "googleapis": "^100.0.0"
   },
   "jest": {
     "testEnvironment": "node",

components/membership-form-backend-trigger/index.js

@@ -9,9 +9,15 @@ module.exports.main = async (req, res) => {
     console.log("Received request.");
 
     console.log("Publishing request body to Pub/Sub...");
-    await pubSubClient
-      .topic(TOPIC_NAME)
-      .publish(Buffer.from(JSON.stringify(req.body), "utf8"));
+    await pubSubClient.topic(TOPIC_NAME).publish(
+      Buffer.from(
+        JSON.stringify({
+          additionalInfo: { ip: req.ip, ...req.headers },
+          ...req.body,
+        }),
+        "utf8"
+      )
+    );
 
     console.log("Redirecting to welcome page...");
     // We don't use res.redirect since that would redirect only the iFrame not the entire page

components/membership-form-backend/index.js

@@ -230,10 +230,8 @@ const validatePayment = async (orderID, payPalClient, expectedPayment) => {
   );
 
   if (expectedPayment !== authorizedPayment) {
-    console.log(
-      `Received payment (${authorizedPayment}$) doesn't match expected payment (${expectedPayment}$).`
-    );
-    throw new Error("Received payment doesn't match expected payment.");
+    throw new Error(`Received payment (${authorizedPayment}$) doesn't match expected payment (${expectedPayment}$). 
+    The webmaster should reach out to the member to help them retry the payment.`);
   }
 };
 

components/membership-form-backend/package.json

@@ -13,15 +13,15 @@
   "devDependencies": {
     "cross-env": "^7.0.2",
     "express": "^4.17.1",
-    "jest": "^26.1.0",
+    "jest": "^27.5.1",
     "supertest": "^6.0.1"
   },
   "dependencies": {
     "@google-cloud/secret-manager": "^3.10.0",
     "@paypal/checkout-server-sdk": "^1.0.2",
     "@sendgrid/mail": "^7.4.4",
     "google-spreadsheet": "^3.0.11",
-    "googleapis": "^74.2.0",
+    "googleapis": "^100.0.0",
     "moment": "^2.29.2"
   },
   "jest": {

components/membership-form-frontend/script.js

@@ -35,9 +35,10 @@ function toPaymentTab() {
       },
       createOrder: function (data, actions) {
         const typeDropdown = document.getElementById("membership_type");
-        const value = PRICING[
-          typeDropdown.options[typeDropdown.selectedIndex].value
-        ].toString();
+        const value =
+          PRICING[
+            typeDropdown.options[typeDropdown.selectedIndex].value
+          ].toString();
         return actions.order.create({
           purchase_units: [{ amount: { value } }],
         });

package.json

@@ -15,7 +15,7 @@
     "components/*"
   ],
   "devDependencies": {
-    "@google-cloud/functions-framework": "^2.1.0",
+    "@google-cloud/functions-framework": "^3.1.0",
     "firebase-tools": "^10.0.1",
     "prettier": "^2.1.1"
   }