@@ -249,7 +249,7 @@ public function triggerStartEventApi(Process $process, Request $request)
         $apiRequest = new ApiProcessController();
         $response = $apiRequest->triggerStartEvent($process, $request);
 
-        return redirect('/requests/' . $response->id . '?fromRedirect=true');
+        return redirect('/requests/' . $response->id)->cookie('fromTriggerStartEvent', true, 1);
     }
 
     private function checkAuth()
 
@@ -78,14 +78,14 @@ public function show(ProcessRequest $request, Media $mediaItems)
                 if (isset($definition['allowInterstitial'])) {
                     $allowInterstitial = filter_var($definition['allowInterstitial'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
                 }
-                if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromRedirect')) {
+                if ($allowInterstitial && $request->user_id == Auth::id() && request()->cookie('fromTriggerStartEvent')) {
                     $active = $request->tokens()
                         ->where('user_id', Auth::id())
                         ->where('element_type', 'task')
                         ->where('status', 'ACTIVE')
                         ->orderBy('id')->first();
 
-                    return redirect(route('tasks.edit', ['task' => $active ? $active->getKey() : $startEvent->getKey()]));
+                    return redirect(route('tasks.edit', ['task' => $active ? $active->getKey() : $startEvent->getKey()]))->withoutCookie('fromTriggerStartEvent');
                 }
             }
         }
 
@@ -20,5 +20,6 @@ class EncryptCookies extends BaseEncrypter
          * Add any cookie names where we should not encrypt it's data here
          */
         'device_id',
+        'fromTriggerStartEvent',
     ];
 }
@@ -59,10 +59,11 @@ export default {
         .then(response => {
           this.spin = 0;
           var instance = response.data;
+          this.$cookies.set('fromTriggerStartEvent', true, '1min');
           if (this.$cookies.get("isMobile")) {
-            window.location = "/requests/mobile/" + instance.id + '?fromRedirect=true';
+            window.location = "/requests/mobile/" + instance.id;
           } else {
-            window.location = "/requests/" + instance.id + '?fromRedirect=true';
+            window.location = "/requests/" + instance.id;
           }
         }).catch((err) => {
           this.disabled = false;
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ public function triggerStartEventApi(Process $process, Request $request)`
`249`	`249`	`$apiRequest = new ApiProcessController();`
`250`	`250`	`$response = $apiRequest->triggerStartEvent($process, $request);`
`251`	`251`
`252`		`- return redirect('/requests/' . $response->id . '?fromRedirect=true');`
	`252`	`+ return redirect('/requests/' . $response->id)->cookie('fromTriggerStartEvent', true, 1);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`private function checkAuth()`
Original file line number	Diff line number	Diff line change
`@@ -78,14 +78,14 @@ public function show(ProcessRequest $request, Media $mediaItems)`
`78`	`78`	`if (isset($definition['allowInterstitial'])) {`
`79`	`79`	`$allowInterstitial = filter_var($definition['allowInterstitial'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);`
`80`	`80`	`}`
`81`		`- if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromRedirect')) {`
	`81`	`+ if ($allowInterstitial && $request->user_id == Auth::id() && request()->cookie('fromTriggerStartEvent')) {`
`82`	`82`	`$active = $request->tokens()`
`83`	`83`	`->where('user_id', Auth::id())`
`84`	`84`	`->where('element_type', 'task')`
`85`	`85`	`->where('status', 'ACTIVE')`
`86`	`86`	`->orderBy('id')->first();`
`87`	`87`
`88`		`- return redirect(route('tasks.edit', ['task' => $active ? $active->getKey() : $startEvent->getKey()]));`
	`88`	`+ return redirect(route('tasks.edit', ['task' => $active ? $active->getKey() : $startEvent->getKey()]))->withoutCookie('fromTriggerStartEvent');`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,6 @@ class EncryptCookies extends BaseEncrypter`
`20`	`20`	`* Add any cookie names where we should not encrypt it's data here`
`21`	`21`	`*/`
`22`	`22`	`'device_id',`
	`23`	`+ 'fromTriggerStartEvent',`
`23`	`24`	`];`
`24`	`25`	`}`