Skip to content

Commit d471f95

Browse files
miccehedinmarickvantuil
authored andcommitted
Don't verify Id on App Engine tasks
1 parent a6cdf93 commit d471f95

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

src/TaskHandler.php

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ public function handle(?string $task = null): void
5858
$this->setQueue();
5959
Log::debug(json_encode($this->queue));
6060

61-
OpenIdVerificator::verify(request()->bearerToken(), $this->config);
61+
if (!$this->config['app_engine']) {
62+
OpenIdVerificator::verify(request()->bearerToken(), $this->config);
63+
}
6264

6365
$this->handleTask($task);
6466
}
@@ -67,7 +69,6 @@ public function handle(?string $task = null): void
6769
* @param string|array|null $task
6870
* @return array
6971
* @throws JsonException
70-
* @throws ValidationException
7172
*/
7273
private function captureTask($task): array
7374
{
@@ -79,31 +80,29 @@ private function captureTask($task): array
7980
$array = [];
8081
}
8182

82-
$nameHeader = config('queue.connections.cloudtasks.app_engine')
83-
? 'X-AppEngine-TaskName'
84-
: 'X-CloudTasks-TaskName';
85-
Log::debug($nameHeader);
83+
// $nameHeader = config('queue.connections.cloudtasks.app_engine')
84+
// ? 'X-AppEngine-TaskName'
85+
// : 'X-CloudTasks-TaskName';
8686
$validator = validator([
8787
'json' => $task,
8888
'task' => $array,
89-
'name_header' => request()->header($nameHeader),
89+
'name_header' => request()->header('X-CloudTasks-TaskName') ?? request()->header('X-AppEngine-TaskName'),
9090
], [
9191
'json' => 'required|json',
9292
'task' => 'required|array',
9393
'task.data' => 'required|array',
9494
'name_header' => 'required|string',
9595
]);
9696

97-
$validator->validate();
98-
// try {
99-
// $validator->validate();
100-
// } catch (ValidationException $e) {
101-
// if (config('app.debug')) {
102-
// throw $e;
103-
// } else {
104-
// abort(404);
105-
// }
106-
// }
97+
try {
98+
$validator->validate();
99+
} catch (ValidationException $e) {
100+
if (config('app.debug')) {
101+
throw $e;
102+
} else {
103+
abort(404);
104+
}
105+
}
107106

108107
return json_decode($task, true);
109108
}

0 commit comments

Comments
 (0)