Update PDF util

server/lib/fetch.js

@@ -0,0 +1,44 @@
+import { get } from 'lodash';
+import fetch from 'node-fetch';
+
+import logger from './logger';
+
+/**
+ * Make a fetch call with a timeout. Returns a thenable Promise.
+ * @param {String} url The url to fetch.
+ * @param {Object} [fetchOptions] The method, headers, and other options for node-fetch. Default method is GET.
+ * @param {Number} [fetchOptions.timeoutInMs] The timeout in ms. Default is 5000.
+ */
+
+export const fetchWithTimeout = (url, fetchOptions) => {
+  const timeoutInMs = get(fetchOptions, 'timeoutInMs', 5000);
+
+  return new Promise((resolve, reject) => {
+    let timedOut = false;
+
+    const timer = setTimeout(() => {
+      timedOut = true;
+      logger.warn(`Fetch request to ${url} timed out`);
+      return reject(new Error(`Fetch request to ${url} timed out`));
+    }, timeoutInMs);
+
+    fetch(url, fetchOptions)
+      .then(
+        response => {
+          if (!timedOut) {
+            logger.info(`Fetch request to ${url} successful`);
+            return resolve(response);
+          }
+        },
+        err => {
+          if (timedOut) {
+            return;
+          }
+          return reject(new Error(`Fetch error: ${err.message}`));
+        },
+      )
+      .finally(() => {
+        clearTimeout(timer);
+      });
+  });
+};

server/lib/payments.js

@@ -6,6 +6,7 @@ import { find, get, includes, omit, pick } from 'lodash';
 
 import activities from '../constants/activities';
 import status from '../constants/order_status';
+import { PAYMENT_METHOD_TYPES } from '../constants/paymentMethods';
 import roles from '../constants/roles';
 import tiers from '../constants/tiers';
 import { FEES_ON_TOP_TRANSACTION_PROPERTIES, OC_FEE_PERCENT } from '../constants/transactions';
@@ -394,7 +395,7 @@ const validatePayment = payment => {
 const sendOrderConfirmedEmail = async (order, transaction) => {
   let pdf;
   const attachments = [];
-  const { collective, tier, interval, fromCollective } = order;
+  const { collective, tier, interval, fromCollective, paymentMethod } = order;
   const user = order.createdByUser;
   const host = await collective.getHostCollective();
 
@@ -428,8 +429,10 @@ const sendOrderConfirmedEmail = async (order, transaction) => {
       subscriptionsLink: interval && `${config.host.website}/${fromCollective.slug}/recurring-contributions`,
     };
 
-    // hit PDF service and get PDF
-    pdf = await getTransactionPdf(transaction, user);
+    // hit PDF service and get PDF (unless payment method type is gift card)
+    if (paymentMethod?.type !== PAYMENT_METHOD_TYPES.VIRTUALCARD) {
+      pdf = await getTransactionPdf(transaction, user);
+    }
 
     // attach pdf
     if (pdf) {

server/lib/pdf.js

@@ -1,8 +1,8 @@
 import config from 'config';
-import fetch from 'node-fetch';
 
-import { TOKEN_EXPIRATION_LOGIN } from '../lib/auth';
-import logger from '../lib/logger';
+import { TOKEN_EXPIRATION_LOGIN } from './auth';
+import { fetchWithTimeout } from './fetch';
+import logger from './logger';
 
 export const getTransactionPdf = async (transaction, user) => {
   if (['ci', 'test'].includes(config.env)) {
@@ -13,7 +13,8 @@ export const getTransactionPdf = async (transaction, user) => {
   const headers = {
     Authorization: `Bearer ${accessToken}`,
   };
-  return await fetch(pdfUrl, { method: 'get', headers })
+
+  return fetchWithTimeout(pdfUrl, { method: 'get', headers, timeoutInMs: 10000 })
     .then(response => {
       const { status } = response;
       if (status >= 200 && status < 300) {
@@ -24,6 +25,6 @@ export const getTransactionPdf = async (transaction, user) => {
       }
     })
     .catch(error => {
-      logger.error(`Error fetching PDF: ${error}`);
+      logger.error(`Error fetching PDF: ${error.message}`);
     });
 };