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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@queue-it/fastly",
-  "version": "2.0.3-beta.2",
+  "version": "2.0.3-beta.4",
   "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/helper.ts

@@ -1,11 +1,11 @@
-export class QueueITHelper {
-  static readonly KUP_VERSION: string = "fastly-2.0.3-beta.1";
-
-  static addKUPlatformVersion(redirectQueueUrl: string): string {
-    return redirectQueueUrl + "&kupver=" + QueueITHelper.KUP_VERSION;
-  }
-}
-
-export interface RequestLogger {
-  log(message: string): void;
-}
+export class QueueITHelper {
+  static readonly KUP_VERSION: string = "fastly-2.0.3-beta.4";
+
+  static addKUPlatformVersion(redirectQueueUrl: string): string {
+    return redirectQueueUrl + "&kupver=" + QueueITHelper.KUP_VERSION;
+  }
+}
+
+export interface RequestLogger {
+  log(message: string): void;
+}

package/src/requestResponseHandler.ts

@@ -63,70 +63,66 @@ export async function onQueueITRequest(
   // 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!
-  );
+  try {
+    const validationResult = await KnownUser.validateRequestByIntegrationConfig(
+      requestUrlWithoutToken,
+      queueItToken,
+      integrationConfigJson,
+      conf.customerId,
+      conf.secretKey,
+      httpProvider!
+    );
 
-  if (
-    validationResultPair.first != null &&
-    validationResultPair.first!.doRedirect()
-  ) {
-    const validationResult = validationResultPair.first!;
-
-    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()
-        )
-      );
-      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)
-      );
-      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);
-      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;
   }
 
@@ -135,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");