@queue-it/fastly 2.0.3-beta.1 → 2.0.3-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@queue-it/fastly",
-  "version": "2.0.3-beta.1",
+  "version": "2.0.3-beta.2",
   "description": "Queue-it connector for Fastly",
   "main": "src/index.ts",
   "author": "devs@queue-it.com",

package/src/requestResponseHandler.ts

@@ -1,4 +1,4 @@
-import { KnownUser, Utils } from "@queue-it/connector-javascript";
+import { KnownUser } from "@queue-it/connector-javascript";
 import { QueueITHelper } from "./helper";
 import { FastlyHttpContextProvider, getHttpHandler } from "./contextProvider";
 import {
@@ -8,6 +8,29 @@ import {
   QueueItIntegrationEndpointProvider,
 } from "./integrationConfigProvider";
 
+function getParameterByName(url: string, name: string): string {
+  name = name.replace(/[\[\]]/g, '\\$&');
+  const regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)');
+  const results = regex.exec(url);
+  if (!results) return '';
+  if (!results[2]) return '';
+  return results[2].replace(/\+/g, ' ');
+}
+
+function removeQueueItToken(url: string): string {
+  const pattern = new RegExp("([?&])(" + KnownUser.QueueITTokenKey + "=[^&]*)", 'gi');
+  const match = pattern.exec(url);
+  if (match === null) return url;
+  url = url.replaceAll(match[0], '');
+  return url;
+}
+
+function addNoCacheHeaders(res: Response): void {
+  res.headers.set('Cache-Control', 'no-cache, no-store, must-revalidate, max-age=0');
+  res.headers.set('Pragma', 'no-cache');
+  res.headers.set('Expires', 'Fri, 01 Jan 1990 00:00:00 GMT');
+}
+
 const QUEUEIT_FAILED_HEADERNAME = "x-queueit-failed";
 let httpProvider: FastlyHttpContextProvider | null = null;
 
@@ -34,11 +57,8 @@ export async function onQueueITRequest(
   let integrationConfigJson = await getIntegrationConfig(conf, integrationProvider);
   const requestUrl: string = conf.resolveWorkerRequestUrl(req.url);
 
-  const queueItToken = Utils.getParameterByName(
-    requestUrl,
-    KnownUser.QueueITTokenKey
-  );
-  const requestUrlWithoutToken: string = Utils.removeQueueItToken(requestUrl);
+  const queueItToken = getParameterByName(requestUrl, KnownUser.QueueITTokenKey);
+  const requestUrlWithoutToken: string = removeQueueItToken(requestUrl);
 
   // The requestUrlWithoutToken is used to match Triggers and as the Target url (where to return the users to).
   // It is therefor important that this is exactly the url of the users browsers. So, if your webserver is
@@ -71,7 +91,7 @@ export async function onQueueITRequest(
           validationResult.getAjaxRedirectUrl()
         )
       );
-      Utils.addNoCacheHeaders(response);
+      addNoCacheHeaders(response);
       return response;
     } else {
       let response = new Response(null, {
@@ -83,7 +103,7 @@ export async function onQueueITRequest(
         "Location",
         QueueITHelper.addKUPlatformVersion(validationResult.redirectUrl)
       );
-      Utils.addNoCacheHeaders(response);
+      addNoCacheHeaders(response);
       return response;
     }
   } else if (validationResultPair.first != null) {
@@ -100,7 +120,7 @@ export async function onQueueITRequest(
         headers: httpProvider!.getHttpResponse().getHeaders(),
       });
       response.headers.set("Location", requestUrlWithoutToken);
-      Utils.addNoCacheHeaders(response);
+      addNoCacheHeaders(response);
       return response;
     } else {
       // lets caller decide the next step, or just serve the request normally