3
3
namespace Wertmenschen \CamundaApi \Models ;
4
4
5
5
use GuzzleHttp \Client ;
6
+ use Illuminate \Support \Arr ;
6
7
use Illuminate \Support \Str ;
7
8
use Illuminate \Support \Facades \Config ;
8
9
@@ -27,28 +28,37 @@ public function __construct($id = null, $attributes = [])
27
28
28
29
protected function post ($ url , $ data = [], $ json = false )
29
30
{
30
- $ data = $ json ? ['json ' => $ data ] : array_merge (['json ' => ['a ' => 'b ' ]], $ data );
31
- return $ this ->request ($ url , 'post ' , $ data );
31
+ return $ this ->request ($ url , 'post ' , $ this ->getData ($ data , $ json ));
32
32
}
33
33
34
34
protected function put ($ url , $ data = [], $ json = false )
35
35
{
36
- $ data = $ json ? ['json ' => $ data ] : array_merge (['json ' => ['a ' => 'b ' ]], $ data );
37
- return $ this ->request ($ url , 'put ' , $ data );
36
+ return $ this ->request ($ url , 'put ' , $ this ->getData ($ data , $ json ));
38
37
}
39
38
40
39
protected function delete ($ url , $ data = [], $ json = false )
41
40
{
42
- $ data = $ json ? ['json ' => $ data ] : array_merge (['json ' => ['a ' => 'b ' ]], $ data );
43
- return $ this ->request ($ url , 'delete ' , $ data );
41
+ return $ this ->request ($ url , 'delete ' , $ this ->getData ($ data , $ json ));
42
+ }
43
+
44
+ protected function getData ($ data , $ json )
45
+ {
46
+ if (Arr::has ($ data , 'multipart ' )) {
47
+ return $ data ;
48
+ }
49
+ elseif ($ json ) {
50
+ return ['json ' => $ data ];
51
+ }
52
+ else {
53
+ return array_merge (['json ' => ['a ' => 'b ' ]], $ data );
54
+ }
44
55
}
45
56
46
57
protected function get ($ url )
47
58
{
48
59
return $ this ->request ($ url , 'get ' );
49
60
}
50
61
51
-
52
62
private function request ($ url , $ method , $ data = [])
53
63
{
54
64
$ data ['auth ' ] = [Config::get ('camunda.api.auth.user ' ), Config::get ('camunda.api.auth.password ' )];
@@ -77,4 +87,4 @@ protected function tenant()
77
87
{
78
88
return strlen (Config::get ('camunda.api.tenant-id ' )) ? '/tenant-id/ ' . Config::get ('camunda.api.tenant-id ' ) : '' ;
79
89
}
80
- }
90
+ }
0 commit comments