add-to-calendar-button 2.6.21 → 2.7.1

package/dist/module/index.js

@@ -6,15 +6,15 @@ import { tzlib_get_ical_block, tzlib_get_offset, tzlib_get_timezones } from 'tim
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.6.21
+ *  Version: 2.7.1
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.6.21';
-const atcbCssTemplate = {
+const atcbVersion = '2.7.1';
+const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
   } else {
@@ -547,8 +547,9 @@ function atcb_decorate_data_description(data, i) {
     description = cleanDescription(description);
     if (data.customVar) {
       for (const key in data.customVar) {
-        const sanitizedKey = key.replace(/[^\w\-.]/g, '');
-        description = description.replace(new RegExp(`%%${sanitizedKey}%%`, 'g'), data.customVar[`${key}`]);
+        const sanitizedKey = '%%' + key.replace(/[^\w\-.]/g, '') + '%%';
+        // eslint-disable-next-line security/detect-non-literal-regexp
+        description = description.replace(new RegExp(sanitizedKey, 'gi'), data.customVar[`${key}`]);
       }
     }
     const descriptionHtmlFree = atcb_rewrite_html_elements(description, true);
@@ -606,9 +607,11 @@ function atcb_decorate_data_extend(data) {
     }
     if (data.customVar) {
       for (const key in data.customVar) {
-        const sanitizedKey = key.replace(/[^\w\-.]/g, '');
-        data.dates[`${i}`].name = data.dates[`${i}`].name.replace(new RegExp(`%%${sanitizedKey}%%`, 'g'), data.customVar[`${key}`]);
-        data.dates[`${i}`].location = data.dates[`${i}`].location.replace(new RegExp(`%%${sanitizedKey}%%`, 'g'), data.customVar[`${key}`]);
+        const sanitizedKey = '%%' + key.replace(/[^\w\-.]/g, '') + '%%';
+        // eslint-disable-next-line security/detect-non-literal-regexp
+        data.dates[`${i}`].name = data.dates[`${i}`].name.replace(new RegExp(sanitizedKey, 'gi'), data.customVar[`${key}`]);
+        // eslint-disable-next-line security/detect-non-literal-regexp
+        data.dates[`${i}`].location = data.dates[`${i}`].location.replace(new RegExp(sanitizedKey, 'gi'), data.customVar[`${key}`]);
       }
     }
   }
@@ -621,26 +624,31 @@ function atcb_decorate_data_extend(data) {
   return data;
 }
 function atcb_date_cleanup(dateTimeData) {
+  function isValidDateFormat(dateStr) {
+    return /^\d\d\d\d-\d\d-\d\d(?:T\d\d:\d\d)?(?::\d\d)?(?:.\d\d\d)?Z?$/i.test(dateStr);
+  }
+  function isValidTodayFormat(dateStr) {
+    return /^today(?:\+(?:\d|\d\d|\d\d\d|\d\d\d\d))?$/i.test(dateStr);
+  }
   if (!dateTimeData.endDate || dateTimeData.endDate === '') {
     dateTimeData.endDate = dateTimeData.startDate;
   }
   const endpoints = ['start', 'end'];
   endpoints.forEach(function (point) {
-    if (!/^(?:\d{4}-\d{2}-\d{2}T?(?:\d{2}:\d{2})?Z?|today(?:\+\d{1,4})?)$/i.test(dateTimeData[point + 'Date'])) {
+    const dateStr = dateTimeData[point + 'Date'];
+    if (!isValidDateFormat(dateStr) && !isValidTodayFormat(dateStr)) {
       dateTimeData[point + 'Date'] = 'badly-formed';
     } else {
-      dateTimeData[point + 'Date'] = atcb_date_calculation(dateTimeData[point + 'Date']);
+      if (isValidTodayFormat(dateStr)) dateTimeData[point + 'Date'] = atcb_date_calculation(dateStr);
       if (dateTimeData[point + 'Date']) {
-        dateTimeData[point + 'Date'] = dateTimeData[point + 'Date'].replace(/\.\d{3}/, '').replace('Z', '');
         const tmpSplitStartDate = dateTimeData[point + 'Date'].split('T');
         if (tmpSplitStartDate[1]) {
           dateTimeData[point + 'Date'] = tmpSplitStartDate[0];
           dateTimeData[point + 'Time'] = tmpSplitStartDate[1];
         }
       }
-      if (dateTimeData[point + 'Time'] && dateTimeData[point + 'Time'].length === 8) {
-        const timeStr = dateTimeData[point + 'Time'];
-        dateTimeData[point + 'Time'] = timeStr.substring(0, timeStr.length - 3);
+      if (dateTimeData[point + 'Time'] && dateTimeData[point + 'Time'].length > 5) {
+        dateTimeData[point + 'Time'] = dateTimeData[point + 'Time'].substring(0, 5);
       }
     }
   });
@@ -685,12 +693,7 @@ function atcb_date_calculation(dateString) {
   dateString = dateString.replace(/today/gi, todayString);
   const dateStringParts = dateString.split('+');
   const dateParts = dateStringParts[0].split('-');
-  let newDate = (function () {
-    if (dateParts[0].length < 4) {
-      return new Date(Date.UTC(dateParts[2], dateParts[0] - 1, dateParts[1]));
-    }
-    return new Date(Date.UTC(dateParts[0], dateParts[1] - 1, dateParts[2]));
-  })();
+  const newDate = new Date(Date.UTC(dateParts[0], dateParts[1] - 1, dateParts[2].substring(0, 2)));
   if (dateStringParts[1] && dateStringParts[1] > 0) {
     newDate.setDate(newDate.getDate() + parseInt(dateStringParts[1]));
   }
@@ -733,19 +736,25 @@ function atcb_decorate_data_button_status_handling(data) {
   return data;
 }
 async function atcb_decorate_data_rsvp(data) {
-  if (typeof atcb_check_booked_out !== 'function' || !data.rsvp || Object.keys(data.rsvp).length === 0) return data;
+  if (typeof atcb_check_bookings !== 'function' || !data.rsvp || !data.proKey || Object.keys(data.rsvp).length === 0) return data;
   data.rsvp.expired = (function () {
     if (data.rsvp && data.rsvp.expires && new Date(data.rsvp.expires) < new Date()) {
       return true;
     }
     return false;
   })();
-  data.rsvp.bookedOut = await atcb_check_booked_out(data);
-  if (data.rsvp.expired || data.rsvp.bookedOut) {
-    data.blockInteraction = true;
-  }
-  if (data.blockInteraction) {
-    data.disabled = true;
+  if (data.rsvp.max) {
+    const bookings = await atcb_check_bookings(data.proKey, data.dev);
+    data.rsvp.seatsLeft = data.rsvp.max - bookings;
+    if (data.rsvp.seatsLeft < 1) {
+      data.rsvp.bookedOut = true;
+    }
+    if (data.rsvp.expired || data.rsvp.bookedOut) {
+      data.blockInteraction = true;
+    }
+    if (data.blockInteraction) {
+      data.disabled = true;
+    }
   }
   return data;
 }
@@ -1484,6 +1493,9 @@ async function atcb_generate_rsvp_form(host, data, hostEl, keyboardTrigger = fal
     ' class="atcb-modal-btn atcb-modal-btn-primary atcb-modal-btn-border">' +
     atcb_translate_hook('submit', data) +
     '</button><span id="pro-form-submitting" class="pro-waiting"><span>.</span><span>.</span><span>.</span></span></p>';
+  if (rsvpData.seatsLeft && rsvpData.seatsLeft > 0) {
+    rsvpContent += '<p class="pro-form-fine">' + atcb_translate_hook('form.seatsleft', data) + ': <b>' + rsvpData.seatsLeft + '</b></p>';
+  }
   rsvpContent += '</form>';
   rsvpContent += '</div></div>';
   let rsvpHost = null;
@@ -1723,24 +1735,20 @@ async function atcb_generate_rsvp_button(host, data) {
   }
   return true;
 }
-async function atcb_check_booked_out(data) {
-  if (data.rsvp && data.rsvp.max && data.proKey && data.proKey !== '') {
-    try {
-      const response = await fetch('https://api.add-to-calendar-pro.com/dffb8bbd-ee5e-4a4f-a7ea-503af98ca468?prokey=' + data.proKey + (data.dev ? '&dev=true' : ''), {
-        method: 'GET',
-      });
-      if (!response.ok) {
-        throw new Error('Network response was not ok');
-      }
-      const responseJson = await response.json();
-      if (parseInt(responseJson.total) >= data.rsvp.max) {
-        return true;
-      }
-    } catch (error) {
-      console.error('Error:', error);
+async function atcb_check_bookings(proKey, dev = false) {
+  try {
+    const response = await fetch('https://api.add-to-calendar-pro.com/dffb8bbd-ee5e-4a4f-a7ea-503af98ca468?prokey=' + proKey + (dev ? '&dev=true' : ''), {
+      method: 'GET',
+    });
+    if (!response.ok) {
+      throw new Error('Network response was not ok');
     }
+    const responseJson = await response.json();
+    return parseInt(responseJson.total);
+  } catch (error) {
+    console.error('Error:', error);
   }
-  return false;
+  return 0;
 }
 function atcb_build_form(fields, identifier = '', disabled = false) {
   /*!
@@ -2860,7 +2868,7 @@ function atcb_generate_subscribe_links(host, linkType, data, keyboardTrigger) {
         atcb_subscribe_ical(data, data.icsFile);
         break;
       }
-      atcb_subscribe_ical(data, adjustedFileUrl);
+      atcb_subscribe_ical(data, adjustedFileUrl, host, keyboardTrigger);
       break;
     case 'google':
       atcb_subscribe_google(data, adjustedFileUrl);
@@ -2929,7 +2937,11 @@ function atcb_set_fully_successful(host, data, multiDateModal = false) {
     atcb_toggle(host, 'close');
   }
 }
-function atcb_subscribe_ical(data, fileUrl) {
+function atcb_subscribe_ical(data, fileUrl, host = null, keyboardTrigger = false) {
+  if ((atcbIsiOS() || data.fakeIOS) && !atcbIsSafari()) {
+    atcb_ical_copy_note(host, fileUrl, data, keyboardTrigger);
+    return;
+  }
   atcb_open_cal_url(data, 'ical', fileUrl, true);
 }
 function atcb_subscribe_google(data, fileUrl) {
@@ -3254,7 +3266,7 @@ function atcb_generate_ical(host, data, subEvent = 'all', keyboardTrigger = fals
     }
     return 'data:text/calendar;charset=utf-8,' + encodeURIComponent(ics_lines.join('\r\n'));
   })();
-  if ((atcbIsiOS() && !atcbIsSafari()) || (atcbIsWebView() && (atcbIsiOS() || (atcbIsAndroid() && atcbIsProblematicWebView())))) {
+  if (((atcbIsiOS() || data.fakeIOS) && !atcbIsSafari()) || (atcbIsWebView() && (atcbIsiOS() || data.fakeIOS || ((atcbIsAndroid() || data.fakeAndroid) && atcbIsProblematicWebView())))) {
     atcb_ical_copy_note(host, dataUrl, data, keyboardTrigger);
     return;
   }
@@ -3280,7 +3292,7 @@ function atcb_determine_ical_filename(data, subEvent) {
 }
 function atcb_ical_copy_note(host, dataUrl, data, keyboardTrigger) {
   atcb_copy_to_clipboard(dataUrl);
-  if (atcbIsiOS() && !atcbIsSafari()) {
+  if ((atcbIsiOS() || data.fakeIOS) && !atcbIsSafari()) {
     atcb_create_modal(
       host,
       data,
@@ -4797,27 +4809,26 @@ if (atcbIsBrowser()) {
         }
         this.proOverride = !proOverrideVal || proOverrideVal === 'true' || proOverrideVal === '' ? true : false;
       }
-      if ((this.hasAttribute('proKey') && this.getAttribute('proKey') !== '') || (this.hasAttribute('prokey') && this.getAttribute('prokey') !== '')) {
-        if (this.hasAttribute('proKey') && this.getAttribute('proKey') !== '') {
-          this.data = await atcb_get_pro_data(this.getAttribute('proKey'), this);
+      try {
+        if ((this.hasAttribute('proKey') && this.getAttribute('proKey') !== '') || (this.hasAttribute('prokey') && this.getAttribute('prokey') !== '')) {
+          if (this.hasAttribute('proKey') && this.getAttribute('proKey') !== '') {
+            this.data = await atcb_get_pro_data(this.getAttribute('proKey'), this);
+          } else {
+            this.data = await atcb_get_pro_data(this.getAttribute('prokey'), this);
+          }
+          if (this.data.proKey) this.proKey = this.data.proKey;
         } else {
-          this.data = await atcb_get_pro_data(this.getAttribute('prokey'), this);
-        }
-        if (this.data.proKey) this.proKey = this.data.proKey;
-      }
-      if (!this.data.name || this.data.name === '') {
-        this.data.proKey = '';
-        try {
+          this.data.proKey = '';
           this.data = await atcb_process_inline_data(this, this.debug);
-        } catch (e) {
-          if (this.debug) {
-            console.error(e);
-            atcb_render_debug_msg(this.shadowRoot, e);
-          }
-          this.state.initializing = false;
-          this.state.ready = true;
-          return;
         }
+      } catch (e) {
+        if (this.debug) {
+          console.error(e);
+          atcb_render_debug_msg(this.shadowRoot, e);
+        }
+        this.state.initializing = false;
+        this.state.ready = true;
+        return;
       }
       await this.initButton();
       this.state.initializing = false;
@@ -4872,24 +4883,23 @@ if (atcbIsBrowser()) {
       const elem = document.createElement('template');
       elem.innerHTML = template;
       this.shadowRoot.append(elem.content.cloneNode(true));
-      if (this.hasAttribute('proKey') && this.getAttribute('proKey') !== '') {
-        this.data = await atcb_get_pro_data(this.getAttribute('proKey'), this);
-        if (this.data.proKey) this.proKey = this.data.proKey;
-      } else if (this.hasAttribute('prokey') && this.getAttribute('prokey') !== '') {
-        this.data = await atcb_get_pro_data(this.getAttribute('prokey'), this);
-        if (this.data.proKey) this.proKey = this.data.proKey;
-      }
-      if (!this.data.name || this.data.name === '') {
-        try {
+      try {
+        if (this.hasAttribute('proKey') && this.getAttribute('proKey') !== '') {
+          this.data = await atcb_get_pro_data(this.getAttribute('proKey'), this);
+          if (this.data.proKey) this.proKey = this.data.proKey;
+        } else if (this.hasAttribute('prokey') && this.getAttribute('prokey') !== '') {
+          this.data = await atcb_get_pro_data(this.getAttribute('prokey'), this);
+          if (this.data.proKey) this.proKey = this.data.proKey;
+        } else {
           this.data = await atcb_process_inline_data(this, this.debug);
-        } catch (e) {
-          if (this.debug) {
-            console.error(e);
-            atcb_render_debug_msg(this.shadowRoot, e);
-          }
-          this.updatePending = false;
-          return;
         }
+      } catch (e) {
+        if (this.debug) {
+          console.error(e);
+          atcb_render_debug_msg(this.shadowRoot, e);
+        }
+        this.updatePending = false;
+        return;
       }
       atcb_cleanup(this.shadowRoot, this.identifier);
       await this.initButton();
@@ -5220,19 +5230,28 @@ async function atcb_action(inputData, triggerElement, keyboardTrigger = false) {
   if (!atcbIsBrowser()) {
     return;
   }
-  let data = await (async function () {
-    const cleanedInput = atcb_secure_content(inputData);
-    if (cleanedInput.prokey && cleanedInput.prokey !== '') {
-      cleanedInput.proKey = cleanedInput.prokey;
-    }
-    if (cleanedInput.proKey && cleanedInput.proKey !== '') {
-      const proData = await atcb_get_pro_data(cleanedInput.proKey, null, cleanedInput);
-      if (proData.name && proData.name != '') {
-        return proData;
+  let data;
+  try {
+    data = await (async function () {
+      const cleanedInput = atcb_secure_content(inputData);
+      if (cleanedInput.prokey && cleanedInput.prokey !== '') {
+        cleanedInput.proKey = cleanedInput.prokey;
       }
-    }
-    return cleanedInput;
-  })();
+      if (cleanedInput.proKey && cleanedInput.proKey !== '') {
+        try {
+          const proData = await atcb_get_pro_data(cleanedInput.proKey, null, cleanedInput);
+          return proData;
+        } catch (e) {
+          throw new Error(e.message);
+        }
+      } else {
+        return cleanedInput;
+      }
+    })();
+  } catch (e) {
+    console.error(e);
+    return;
+  }
   data.debug = data.debug === 'true';
   try {
     await atcb_check_required(data);
@@ -5370,9 +5389,6 @@ async function atcb_get_pro_data(licenseKey, el = null, directData = {}) {
       const response = await fetch((dataOverrides.dev ? 'https://event-dev.caldn.net/' : 'https://event.caldn.net/') + licenseKey + '/config.json');
       if (response.ok) {
         const data = await response.json();
-        if (!data.name || data.name === '') {
-          throw new Error('Not possible to read proKey config from server...');
-        }
         if (proOverride) {
           atcbWcParams.forEach((key) => {
             if (Object.prototype.hasOwnProperty.call(dataOverrides, key) && ['hideBranding', 'hidebranding', 'rsvp', 'ty'].indexOf(key) === -1) {
@@ -5386,13 +5402,16 @@ async function atcb_get_pro_data(licenseKey, el = null, directData = {}) {
             }
           });
         }
+        if (!data.name || data.name === '') {
+          throw new Error('Not possible to read proKey config from server...');
+        }
         data.proKey = licenseKey;
         data.identifier = licenseKey;
         return data;
       }
       throw new Error('Not possible to read proKey config from server...');
     } catch {
-      console.error('Add to Calendar Button proKey invalid or server not responding! Falling back to local data...');
+      throw new Error('Add to Calendar Button proKey invalid or server not responding!');
     }
   }
   return {};