Merge pull request #7 from warrant-dev/FixWarrantsProcessing

Deep clone warrants array before processing

Author: stanleyphu

src/ProtectedRoute.tsx

@@ -31,7 +31,8 @@ const ProtectedRoute: React.FunctionComponent<ProtectedRouteProps> = ({
         };
 
         if (sessionToken) {
-            warrants.forEach((warrant) => {
+            let warrantsToCheck = [...warrants].map(warrant => ({...warrant}));
+            warrantsToCheck.forEach((warrant) => {
                 if (computedMatch.params[warrant.objectId]) {
                     /** @ts-ignore */
                     warrant.objectId = computedMatch.params[warrant.objectId];
@@ -42,7 +43,7 @@ const ProtectedRoute: React.FunctionComponent<ProtectedRouteProps> = ({
                 }
             })   
 
-            checkForWarrant({ op, warrants });
+            checkForWarrant({ op, warrants: warrantsToCheck });
         }
     }, [sessionToken]);
 

src/withWarrant.tsx

@@ -2,8 +2,7 @@ import React, { useEffect, useState } from "react";
 import { WarrantCheck } from "@warrantdev/warrant-js";
 import useWarrant from "./useWarrant";
 
-export interface WithWarrantOptions {
-    warrantCheck: WarrantCheck;
+export interface WithWarrantOptions extends WarrantCheck {
     redirectTo: string;
 }
 
@@ -16,13 +15,13 @@ export interface WithWarrantOptions {
  */
 const withWarrant = (WrappedComponent: React.ComponentClass, options: WithWarrantOptions) => {
     return (props: any) => {
-        const { warrantCheck, redirectTo } = options;
+        const { op, warrants, redirectTo } = options;
         const { sessionToken, hasWarrant } = useWarrant();
         const [showWrappedComponent, setShowWrappedComponent] = useState<boolean>(false);
 
         useEffect(() => {
             const checkWarrant = async () => {
-                setShowWrappedComponent(await hasWarrant(warrantCheck));
+                setShowWrappedComponent(await hasWarrant({ op, warrants }));
             };
 
             if (sessionToken) {