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

package/package.json

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

package/src/contextProvider.ts

@@ -30,6 +30,10 @@ export class FastlyHttpContextProvider implements IConnectorContextProvider {
     getEnqueueTokenProvider(): null {
         return null;
     }
+
+    getResponseHeaders(): Headers {
+        return (this.res as FastlyHttpResponse).getHeaders();
+    }
 }
 
 export class FastlyHttpRequest implements IHttpRequest {
@@ -57,14 +61,6 @@ export class FastlyHttpRequest implements IHttpRequest {
             return;
         }
         this.bodyFetched = true;
-        const rawBody: ArrayBuffer | null = null; // this.context.req.arrayBuffer();
-        if (rawBody == null) {
-            return;
-        }
-        if (rawBody!.byteLength == 0) {
-            return;
-        }
-
         this.body = ''; // this.context.req.text()
     }
 

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,79 +57,72 @@ 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
   // behind e.g. a load balancer that modifies the host name or port, reformat requestUrlWithoutToken before proceeding.
-  const validationResultPair = KnownUser.validateRequestByIntegrationConfig(
-    requestUrlWithoutToken,
-    queueItToken,
-    integrationConfigJson,
-    conf.customerId,
-    conf.secretKey,
-    httpProvider!
-  );
-
-  if (
-    validationResultPair.first != null &&
-    validationResultPair.first!.doRedirect()
-  ) {
-    const validationResult = validationResultPair.first!;
+  try {
+    const validationResult = await KnownUser.validateRequestByIntegrationConfig(
+      requestUrlWithoutToken,
+      queueItToken,
+      integrationConfigJson,
+      conf.customerId,
+      conf.secretKey,
+      httpProvider!
+    );
 
-    if (validationResult.isAjaxResult) {
-      let response = new Response(null, {
-        status: 200,
-        headers: httpProvider!.getHttpResponse().getHeaders(),
-      });
-      // In case of ajax call send the user to the queue by sending a custom queue-it header and redirecting user to queue from javascript
-      response.headers.set("Access-Control-Expose-Headers", validationResult.getAjaxQueueRedirectHeaderKey());
-      response.headers.set(
-        validationResult.getAjaxQueueRedirectHeaderKey(),
-        QueueITHelper.addKUPlatformVersion(
-          validationResult.getAjaxRedirectUrl()
-        )
-      );
-      Utils.addNoCacheHeaders(response);
-      return response;
-    } else {
-      let response = new Response(null, {
-        status: 302,
-        headers: httpProvider!.getHttpResponse().getHeaders(),
-      });
-      // Send the user to the queue - either because hash was missing or because is was invalid
-      response.headers.set(
-        "Location",
-        QueueITHelper.addKUPlatformVersion(validationResult.redirectUrl)
-      );
-      Utils.addNoCacheHeaders(response);
-      return response;
-    }
-  } else if (validationResultPair.first != null) {
-    const validationResult = validationResultPair.first!;
-    // Request can continue - we remove queueittoken form querystring parameter to avoid sharing of user specific token
-    // Support mobile scenario adding the condition !validationResult.isAjaxResult
-    if (
-      queueItToken != "" &&
-      !validationResult.isAjaxResult &&
-      validationResult.actionType == "Queue"
-    ) {
-      let response = new Response(null, {
-        status: 302,
-        headers: httpProvider!.getHttpResponse().getHeaders(),
-      });
-      response.headers.set("Location", requestUrlWithoutToken);
-      Utils.addNoCacheHeaders(response);
-      return response;
+    if (validationResult.doRedirect()) {
+      if (validationResult.isAjaxResult) {
+        let response = new Response(null, {
+          status: 200,
+          headers: httpProvider!.getResponseHeaders(),
+        });
+        // In case of ajax call send the user to the queue by sending a custom queue-it header and redirecting user to queue from javascript
+        response.headers.set("Access-Control-Expose-Headers", validationResult.getAjaxQueueRedirectHeaderKey());
+        response.headers.set(
+          validationResult.getAjaxQueueRedirectHeaderKey(),
+          QueueITHelper.addKUPlatformVersion(
+            validationResult.getAjaxRedirectUrl()
+          )
+        );
+        addNoCacheHeaders(response);
+        return response;
+      } else {
+        let response = new Response(null, {
+          status: 302,
+          headers: httpProvider!.getResponseHeaders(),
+        });
+        // Send the user to the queue - either because hash was missing or because is was invalid
+        response.headers.set(
+          "Location",
+          QueueITHelper.addKUPlatformVersion(validationResult.redirectUrl)
+        );
+        addNoCacheHeaders(response);
+        return response;
+      }
     } else {
-      // lets caller decide the next step, or just serve the request normally
-      return null;
+      // Request can continue - we remove queueittoken from querystring parameter to avoid sharing of user specific token
+      // Support mobile scenario adding the condition !validationResult.isAjaxResult
+      if (
+        queueItToken != "" &&
+        !validationResult.isAjaxResult &&
+        validationResult.actionType == "Queue"
+      ) {
+        let response = new Response(null, {
+          status: 302,
+          headers: httpProvider!.getResponseHeaders(),
+        });
+        response.headers.set("Location", requestUrlWithoutToken);
+        addNoCacheHeaders(response);
+        return response;
+      } else {
+        // lets caller decide the next step, or just serve the request normally
+        return null;
+      }
     }
-  } else if (validationResultPair.second != null) {
+  } catch {
     httpProvider!.isError = true;
   }
 
@@ -115,7 +131,7 @@ export async function onQueueITRequest(
 
 //Fill in the Queue-it headers
 export function onQueueITResponse(res: Response): void {
-  const contextHeaders = httpProvider!.getHttpResponse().getHeaders();
+  const contextHeaders = httpProvider!.getResponseHeaders();
 
   if (httpProvider!.isError) {
     res.headers.append(QUEUEIT_FAILED_HEADERNAME, "true");