5
5
use Google \ApiCore \ApiException ;
6
6
use Google \Cloud \Tasks \V2 \CloudTasksClient ;
7
7
use Google \Cloud \Tasks \V2 \RetryConfig ;
8
- use Illuminate \Bus \Queueable ;
9
8
use Illuminate \Contracts \Encryption \Encrypter ;
10
- use Illuminate \Queue \Jobs \Job ;
11
- use Illuminate \Queue \QueueManager ;
12
9
use Illuminate \Queue \WorkerOptions ;
13
10
use Illuminate \Support \Facades \Log ;
14
11
use Illuminate \Support \Str ;
15
12
use Illuminate \Validation \ValidationException ;
16
13
use Safe \Exceptions \JsonException ;
17
14
use UnexpectedValueException ;
15
+ use stdClass ;
18
16
19
17
use function Safe \json_decode ;
20
18
@@ -69,6 +67,7 @@ public function handle(?string $task = null): void
69
67
* @param string|array|null $task
70
68
* @return array
71
69
* @throws JsonException
70
+ * @throws ValidationException
72
71
*/
73
72
private function captureTask ($ task ): array
74
73
{
@@ -80,26 +79,31 @@ private function captureTask($task): array
80
79
$ array = [];
81
80
}
82
81
82
+ $ nameHeader = config ('queue.connections.cloudtasks.app_engine ' )
83
+ ? 'X-AppEngine-TaskName '
84
+ : 'X-CloudTasks-TaskName ' ;
85
+ Log::debug ($ nameHeader );
83
86
$ validator = validator ([
84
87
'json ' => $ task ,
85
88
'task ' => $ array ,
86
- 'name_header ' => request ()->header (' X-CloudTasks-Taskname ' ),
89
+ 'name_header ' => request ()->header ($ nameHeader ),
87
90
], [
88
91
'json ' => 'required|json ' ,
89
92
'task ' => 'required|array ' ,
90
93
'task.data ' => 'required|array ' ,
91
94
'name_header ' => 'required|string ' ,
92
95
]);
93
96
94
- try {
95
- $ validator ->validate ();
96
- } catch (ValidationException $ e ) {
97
- if (config ('app.debug ' )) {
98
- throw $ e ;
99
- } else {
100
- abort (404 );
101
- }
102
- }
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
+ // }
103
107
104
108
return json_decode ($ task , true );
105
109
}
0 commit comments