@@ -9,92 +9,92 @@ |
||
9 | 9 | |
10 | 10 | class AccessTokenRequest |
11 | 11 | { |
12 | - /** |
|
13 | - * The authentication endpoint |
|
14 | - * |
|
15 | - * @var string |
|
16 | - */ |
|
17 | - const ENDPOINT = '/auth/token'; |
|
12 | + /** |
|
13 | + * The authentication endpoint |
|
14 | + * |
|
15 | + * @var string |
|
16 | + */ |
|
17 | + const ENDPOINT = '/auth/token'; |
|
18 | 18 | |
19 | - /** |
|
20 | - * The client assertion |
|
21 | - * |
|
22 | - * @var \tbclla\Revolut\Auth\ClientAssertion |
|
23 | - */ |
|
24 | - private $clientAssertion; |
|
19 | + /** |
|
20 | + * The client assertion |
|
21 | + * |
|
22 | + * @var \tbclla\Revolut\Auth\ClientAssertion |
|
23 | + */ |
|
24 | + private $clientAssertion; |
|
25 | 25 | |
26 | - /** |
|
27 | - * The HTTP client |
|
28 | - * |
|
29 | - * @var \tbclla\Revolut\Interfaces\MakesHttpRequests |
|
30 | - */ |
|
31 | - private $httpClient; |
|
26 | + /** |
|
27 | + * The HTTP client |
|
28 | + * |
|
29 | + * @var \tbclla\Revolut\Interfaces\MakesHttpRequests |
|
30 | + */ |
|
31 | + private $httpClient; |
|
32 | 32 | |
33 | - /** |
|
34 | - * Create a new access token request instance |
|
35 | - * |
|
36 | - * @param \tbclla\Revolut\Auth\ClientAssertion $clientAssertion |
|
37 | - * @param \tbclla\Revolut\Interfaces\MakesHttpRequests $httpClient |
|
38 | - * @return void |
|
39 | - */ |
|
40 | - public function __construct(ClientAssertion $clientAssertion, MakesHttpRequests $httpClient) |
|
41 | - { |
|
42 | - $this->clientAssertion = $clientAssertion; |
|
43 | - $this->httpClient = $httpClient; |
|
44 | - } |
|
33 | + /** |
|
34 | + * Create a new access token request instance |
|
35 | + * |
|
36 | + * @param \tbclla\Revolut\Auth\ClientAssertion $clientAssertion |
|
37 | + * @param \tbclla\Revolut\Interfaces\MakesHttpRequests $httpClient |
|
38 | + * @return void |
|
39 | + */ |
|
40 | + public function __construct(ClientAssertion $clientAssertion, MakesHttpRequests $httpClient) |
|
41 | + { |
|
42 | + $this->clientAssertion = $clientAssertion; |
|
43 | + $this->httpClient = $httpClient; |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Exchange an authorization code or a refresh token for an access token |
|
48 | - * |
|
49 | - * @param \tbclla\Revolut\Interfaces\GrantsAccessTokens $requestToken |
|
50 | - * @return array |
|
51 | - */ |
|
52 | - public function exchange(GrantsAccessTokens $requestToken) |
|
53 | - { |
|
54 | - return $this->httpClient->post($this->uri(), [ |
|
55 | - 'form_params' => array_merge( |
|
56 | - $this->buildClientParams(), |
|
57 | - $this->buildGrantParams($requestToken) |
|
58 | - ) |
|
59 | - ]); |
|
60 | - } |
|
46 | + /** |
|
47 | + * Exchange an authorization code or a refresh token for an access token |
|
48 | + * |
|
49 | + * @param \tbclla\Revolut\Interfaces\GrantsAccessTokens $requestToken |
|
50 | + * @return array |
|
51 | + */ |
|
52 | + public function exchange(GrantsAccessTokens $requestToken) |
|
53 | + { |
|
54 | + return $this->httpClient->post($this->uri(), [ |
|
55 | + 'form_params' => array_merge( |
|
56 | + $this->buildClientParams(), |
|
57 | + $this->buildGrantParams($requestToken) |
|
58 | + ) |
|
59 | + ]); |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * Get the Uri for the request |
|
64 | - * |
|
65 | - * @return string |
|
66 | - */ |
|
67 | - public static function uri() |
|
68 | - { |
|
69 | - return RevolutClient::buildUri(self::ENDPOINT); |
|
70 | - } |
|
62 | + /** |
|
63 | + * Get the Uri for the request |
|
64 | + * |
|
65 | + * @return string |
|
66 | + */ |
|
67 | + public static function uri() |
|
68 | + { |
|
69 | + return RevolutClient::buildUri(self::ENDPOINT); |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * Build the client parameters |
|
74 | - * The request must inlude the client ID, the client assertion (JWT) and client assertion type |
|
75 | - * |
|
76 | - * @return array |
|
77 | - */ |
|
78 | - private function buildClientParams() |
|
79 | - { |
|
80 | - return [ |
|
81 | - 'client_assertion_type' => $this->clientAssertion::TYPE, |
|
82 | - 'client_id' => $this->clientAssertion->clientId, |
|
83 | - 'client_assertion' => $this->clientAssertion->build(), |
|
84 | - ]; |
|
85 | - } |
|
72 | + /** |
|
73 | + * Build the client parameters |
|
74 | + * The request must inlude the client ID, the client assertion (JWT) and client assertion type |
|
75 | + * |
|
76 | + * @return array |
|
77 | + */ |
|
78 | + private function buildClientParams() |
|
79 | + { |
|
80 | + return [ |
|
81 | + 'client_assertion_type' => $this->clientAssertion::TYPE, |
|
82 | + 'client_id' => $this->clientAssertion->clientId, |
|
83 | + 'client_assertion' => $this->clientAssertion->build(), |
|
84 | + ]; |
|
85 | + } |
|
86 | 86 | |
87 | - /** |
|
88 | - * Build the grant parameters |
|
89 | - * |
|
90 | - * @param \tbclla\Revolut\Interfaces\GrantsAccessTokens $requestToken |
|
91 | - * @return array |
|
92 | - */ |
|
93 | - private function buildGrantParams(GrantsAccessTokens $requestToken) |
|
94 | - { |
|
95 | - return [ |
|
96 | - 'grant_type' => $requestToken->getGrantType(), |
|
97 | - $requestToken->getType() => $requestToken->getValue(), |
|
98 | - ]; |
|
99 | - } |
|
87 | + /** |
|
88 | + * Build the grant parameters |
|
89 | + * |
|
90 | + * @param \tbclla\Revolut\Interfaces\GrantsAccessTokens $requestToken |
|
91 | + * @return array |
|
92 | + */ |
|
93 | + private function buildGrantParams(GrantsAccessTokens $requestToken) |
|
94 | + { |
|
95 | + return [ |
|
96 | + 'grant_type' => $requestToken->getGrantType(), |
|
97 | + $requestToken->getType() => $requestToken->getValue(), |
|
98 | + ]; |
|
99 | + } |
|
100 | 100 | } |
@@ -4,113 +4,113 @@ |
||
4 | 4 | |
5 | 5 | class AuthorizationCodeRequest |
6 | 6 | { |
7 | - /** |
|
8 | - * The sandbox URL |
|
9 | - * |
|
10 | - * @var string |
|
11 | - */ |
|
12 | - const SANDBOX_URL = 'https://sandbox-business.revolut.com'; |
|
7 | + /** |
|
8 | + * The sandbox URL |
|
9 | + * |
|
10 | + * @var string |
|
11 | + */ |
|
12 | + const SANDBOX_URL = 'https://sandbox-business.revolut.com'; |
|
13 | 13 | |
14 | - /** |
|
15 | - * The production URL |
|
16 | - * |
|
17 | - * @var string |
|
18 | - */ |
|
19 | - const PRODUCTION_URL = 'https://business.revolut.com'; |
|
14 | + /** |
|
15 | + * The production URL |
|
16 | + * |
|
17 | + * @var string |
|
18 | + */ |
|
19 | + const PRODUCTION_URL = 'https://business.revolut.com'; |
|
20 | 20 | |
21 | - /** |
|
22 | - * The app authorization endpoint |
|
23 | - * |
|
24 | - * @var string |
|
25 | - */ |
|
26 | - const ENDPOINT = '/app-confirm'; |
|
21 | + /** |
|
22 | + * The app authorization endpoint |
|
23 | + * |
|
24 | + * @var string |
|
25 | + */ |
|
26 | + const ENDPOINT = '/app-confirm'; |
|
27 | 27 | |
28 | - /** |
|
29 | - * A token repository |
|
30 | - * |
|
31 | - * @var string The client Id |
|
32 | - */ |
|
33 | - private $clientId; |
|
28 | + /** |
|
29 | + * A token repository |
|
30 | + * |
|
31 | + * @var string The client Id |
|
32 | + */ |
|
33 | + private $clientId; |
|
34 | 34 | |
35 | - /** |
|
36 | - * A token repository |
|
37 | - * |
|
38 | - * @var string The redirect URI |
|
39 | - */ |
|
40 | - private $redirectUri; |
|
35 | + /** |
|
36 | + * A token repository |
|
37 | + * |
|
38 | + * @var string The redirect URI |
|
39 | + */ |
|
40 | + private $redirectUri; |
|
41 | 41 | |
42 | - /** |
|
43 | - * A token repository |
|
44 | - * |
|
45 | - * @var bool The environment |
|
46 | - */ |
|
47 | - private $sandbox; |
|
42 | + /** |
|
43 | + * A token repository |
|
44 | + * |
|
45 | + * @var bool The environment |
|
46 | + */ |
|
47 | + private $sandbox; |
|
48 | 48 | |
49 | - /** |
|
50 | - * A state value |
|
51 | - * |
|
52 | - * @var string |
|
53 | - */ |
|
54 | - public $state; |
|
49 | + /** |
|
50 | + * A state value |
|
51 | + * |
|
52 | + * @var string |
|
53 | + */ |
|
54 | + public $state; |
|
55 | 55 | |
56 | - /** |
|
57 | - * Create a new request |
|
58 | - * |
|
59 | - * @param string $clientId The Revolut Business Client ID |
|
60 | - * @param string $redirectUri The OAuth redirect URI |
|
61 | - * @param bool $sandbox Whether or not to use the sandbox environment |
|
62 | - * @return void |
|
63 | - */ |
|
64 | - public function __construct(string $clientId, string $redirectUri, bool $sandbox = true) |
|
65 | - { |
|
66 | - $this->clientId = $clientId; |
|
67 | - $this->redirectUri = $redirectUri; |
|
68 | - $this->sandbox = $sandbox; |
|
69 | - $this->state = $this->generateState(); |
|
70 | - } |
|
56 | + /** |
|
57 | + * Create a new request |
|
58 | + * |
|
59 | + * @param string $clientId The Revolut Business Client ID |
|
60 | + * @param string $redirectUri The OAuth redirect URI |
|
61 | + * @param bool $sandbox Whether or not to use the sandbox environment |
|
62 | + * @return void |
|
63 | + */ |
|
64 | + public function __construct(string $clientId, string $redirectUri, bool $sandbox = true) |
|
65 | + { |
|
66 | + $this->clientId = $clientId; |
|
67 | + $this->redirectUri = $redirectUri; |
|
68 | + $this->sandbox = $sandbox; |
|
69 | + $this->state = $this->generateState(); |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * Build the request |
|
74 | - * |
|
75 | - * @return string |
|
76 | - */ |
|
77 | - public function build() |
|
78 | - { |
|
79 | - return $this->baseUri() . self::ENDPOINT . '?' . $this->buildQuery(); |
|
80 | - } |
|
72 | + /** |
|
73 | + * Build the request |
|
74 | + * |
|
75 | + * @return string |
|
76 | + */ |
|
77 | + public function build() |
|
78 | + { |
|
79 | + return $this->baseUri() . self::ENDPOINT . '?' . $this->buildQuery(); |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * Build the base URI |
|
84 | - * |
|
85 | - * @return string |
|
86 | - */ |
|
87 | - private function baseUri() |
|
88 | - { |
|
89 | - return $this->sandbox ? self::SANDBOX_URL : self::PRODUCTION_URL; |
|
90 | - } |
|
82 | + /** |
|
83 | + * Build the base URI |
|
84 | + * |
|
85 | + * @return string |
|
86 | + */ |
|
87 | + private function baseUri() |
|
88 | + { |
|
89 | + return $this->sandbox ? self::SANDBOX_URL : self::PRODUCTION_URL; |
|
90 | + } |
|
91 | 91 | |
92 | - /** |
|
93 | - * Build the query |
|
94 | - * |
|
95 | - * @return string |
|
96 | - */ |
|
97 | - private function buildQuery() |
|
98 | - { |
|
99 | - return http_build_query([ |
|
100 | - 'response_type' => 'request_token', |
|
101 | - 'client_id' => $this->clientId, |
|
102 | - 'redirect_uri' => $this->redirectUri, |
|
103 | - 'state' => $this->state |
|
104 | - ]); |
|
105 | - } |
|
92 | + /** |
|
93 | + * Build the query |
|
94 | + * |
|
95 | + * @return string |
|
96 | + */ |
|
97 | + private function buildQuery() |
|
98 | + { |
|
99 | + return http_build_query([ |
|
100 | + 'response_type' => 'request_token', |
|
101 | + 'client_id' => $this->clientId, |
|
102 | + 'redirect_uri' => $this->redirectUri, |
|
103 | + 'state' => $this->state |
|
104 | + ]); |
|
105 | + } |
|
106 | 106 | |
107 | - /** |
|
108 | - * Generate a state value |
|
109 | - * |
|
110 | - * @return string |
|
111 | - */ |
|
112 | - private function generateState() |
|
113 | - { |
|
114 | - return base64_encode(random_bytes(32)); |
|
115 | - } |
|
107 | + /** |
|
108 | + * Generate a state value |
|
109 | + * |
|
110 | + * @return string |
|
111 | + */ |
|
112 | + private function generateState() |
|
113 | + { |
|
114 | + return base64_encode(random_bytes(32)); |
|
115 | + } |
|
116 | 116 | } |
@@ -7,27 +7,27 @@ |
||
7 | 7 | |
8 | 8 | class AccessToken extends Token implements PersistableToken |
9 | 9 | { |
10 | - /** |
|
11 | - * The name of the token |
|
12 | - * |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - const TYPE = 'access_token'; |
|
10 | + /** |
|
11 | + * The name of the token |
|
12 | + * |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + const TYPE = 'access_token'; |
|
16 | 16 | |
17 | - /** |
|
18 | - * The time to live in minutes |
|
19 | - * |
|
20 | - * @var int |
|
21 | - */ |
|
22 | - const TTL = 40; |
|
17 | + /** |
|
18 | + * The time to live in minutes |
|
19 | + * |
|
20 | + * @var int |
|
21 | + */ |
|
22 | + const TTL = 40; |
|
23 | 23 | |
24 | - public static function getType() |
|
25 | - { |
|
26 | - return self::TYPE; |
|
27 | - } |
|
24 | + public static function getType() |
|
25 | + { |
|
26 | + return self::TYPE; |
|
27 | + } |
|
28 | 28 | |
29 | - public static function getExpiration() |
|
30 | - { |
|
31 | - return now()->addMinutes(self::TTL); |
|
32 | - } |
|
29 | + public static function getExpiration() |
|
30 | + { |
|
31 | + return now()->addMinutes(self::TTL); |
|
32 | + } |
|
33 | 33 | } |
@@ -8,49 +8,49 @@ |
||
8 | 8 | |
9 | 9 | class RefreshToken extends Token implements GrantsAccessTokens, PersistableToken |
10 | 10 | { |
11 | - /** |
|
12 | - * The type of the token |
|
13 | - * |
|
14 | - * @var string |
|
15 | - */ |
|
16 | - const TYPE = 'refresh_token'; |
|
17 | - |
|
18 | - /** |
|
19 | - * The grant type of the token |
|
20 | - * |
|
21 | - * @var string |
|
22 | - */ |
|
23 | - const GRANT_TYPE = 'refresh_token'; |
|
24 | - |
|
25 | - public function getValue() |
|
26 | - { |
|
27 | - return $this->value; |
|
28 | - } |
|
29 | - |
|
30 | - public static function getType() |
|
31 | - { |
|
32 | - return self::TYPE; |
|
33 | - } |
|
34 | - |
|
35 | - public static function getGrantType() |
|
36 | - { |
|
37 | - return self::GRANT_TYPE; |
|
38 | - } |
|
39 | - |
|
40 | - public static function getExpiration() |
|
41 | - { |
|
42 | - return null; |
|
43 | - } |
|
44 | - |
|
45 | - /** |
|
46 | - * Delete all expired refresh tokens |
|
47 | - * |
|
48 | - * @return int The number of deleted tokens |
|
49 | - */ |
|
50 | - public static function clearExpired() |
|
51 | - { |
|
52 | - $latest = self::latest()->select('id')->first(); |
|
53 | - |
|
54 | - return (int) self::where('id', '!=', $latest->id)->delete(); |
|
55 | - } |
|
11 | + /** |
|
12 | + * The type of the token |
|
13 | + * |
|
14 | + * @var string |
|
15 | + */ |
|
16 | + const TYPE = 'refresh_token'; |
|
17 | + |
|
18 | + /** |
|
19 | + * The grant type of the token |
|
20 | + * |
|
21 | + * @var string |
|
22 | + */ |
|
23 | + const GRANT_TYPE = 'refresh_token'; |
|
24 | + |
|
25 | + public function getValue() |
|
26 | + { |
|
27 | + return $this->value; |
|
28 | + } |
|
29 | + |
|
30 | + public static function getType() |
|
31 | + { |
|
32 | + return self::TYPE; |
|
33 | + } |
|
34 | + |
|
35 | + public static function getGrantType() |
|
36 | + { |
|
37 | + return self::GRANT_TYPE; |
|
38 | + } |
|
39 | + |
|
40 | + public static function getExpiration() |
|
41 | + { |
|
42 | + return null; |
|
43 | + } |
|
44 | + |
|
45 | + /** |
|
46 | + * Delete all expired refresh tokens |
|
47 | + * |
|
48 | + * @return int The number of deleted tokens |
|
49 | + */ |
|
50 | + public static function clearExpired() |
|
51 | + { |
|
52 | + $latest = self::latest()->select('id')->first(); |
|
53 | + |
|
54 | + return (int) self::where('id', '!=', $latest->id)->delete(); |
|
55 | + } |
|
56 | 56 | } |
@@ -8,143 +8,143 @@ |
||
8 | 8 | |
9 | 9 | class ClientAssertion |
10 | 10 | { |
11 | - /** |
|
12 | - * The client assertion type |
|
13 | - * @link https://revolut-engineering.github.io/api-docs/business-api/#oauth-exchange-authorisation-code |
|
14 | - * |
|
15 | - * @var string |
|
16 | - */ |
|
17 | - const TYPE = 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer'; |
|
18 | - |
|
19 | - /** |
|
20 | - * The JWT's audience parameter |
|
21 | - * @link https://revolut-engineering.github.io/api-docs/business-api/#authentication-setting-up-access-to-your-business-account |
|
22 | - * |
|
23 | - * @var string |
|
24 | - */ |
|
25 | - const AUDIENCE = 'https://revolut.com'; |
|
26 | - |
|
27 | - /** |
|
28 | - * The JWT's algorythm parameter |
|
29 | - * @link https://revolut-engineering.github.io/api-docs/business-api/#authentication-setting-up-access-to-your-business-account |
|
30 | - * |
|
31 | - * @var string |
|
32 | - */ |
|
33 | - const ALGORYTHM = 'RS256'; |
|
34 | - |
|
35 | - /** |
|
36 | - * The JWT client |
|
37 | - * |
|
38 | - * @var \firebase\JWT\JWT |
|
39 | - */ |
|
40 | - private $jwtClient; |
|
41 | - |
|
42 | - /** |
|
43 | - * The client ID |
|
44 | - * |
|
45 | - * @var string |
|
46 | - */ |
|
47 | - public $clientId; |
|
48 | - |
|
49 | - /** |
|
50 | - * The private key path |
|
51 | - * |
|
52 | - * @var string |
|
53 | - */ |
|
54 | - private $privateKey; |
|
55 | - |
|
56 | - /** |
|
57 | - * The redirect URI |
|
58 | - * |
|
59 | - * @var string |
|
60 | - */ |
|
61 | - private $redirectUri; |
|
62 | - |
|
63 | - /** |
|
64 | - * Create a new client assertion |
|
65 | - * |
|
66 | - * @param string $clientId The client ID |
|
67 | - * @param string $privateKey The path to the private key |
|
68 | - * @param string $redirectUri The Oauth redirect URI |
|
69 | - * @return void |
|
70 | - */ |
|
71 | - public function __construct(string $clientId, string $privateKey, string $redirectUri) |
|
72 | - { |
|
73 | - $this->jwtClient = new JWT; |
|
74 | - $this->clientId = $clientId; |
|
75 | - $this->privateKey = $privateKey; |
|
76 | - $this->redirectUri = $redirectUri; |
|
77 | - } |
|
78 | - |
|
79 | - /** |
|
80 | - * Build the JWT |
|
81 | - * |
|
82 | - * @return string The assertion string |
|
83 | - * @throws \tbclla\Revolut\Exceptions\ConfigurationException |
|
84 | - */ |
|
85 | - public function build() |
|
86 | - { |
|
87 | - try { |
|
88 | - return $this->jwtClient->encode($this->buildPayload(), $this->getPrivateKey(), self::ALGORYTHM); |
|
89 | - } catch (Exception $e) { |
|
90 | - throw new ConfigurationException('Failed to create JWT - ' . $e->getMessage(), null, $e); |
|
91 | - } |
|
92 | - } |
|
93 | - |
|
94 | - /** |
|
95 | - * Build the payload for the JWT |
|
96 | - * |
|
97 | - * @return array |
|
98 | - */ |
|
99 | - private function buildPayload() |
|
100 | - { |
|
101 | - return [ |
|
102 | - 'sub' => $this->clientId, |
|
103 | - 'iss' => $this->getIssuer(), |
|
104 | - 'exp' => self::getExpiration(), |
|
105 | - 'aud' => self::AUDIENCE, |
|
106 | - ]; |
|
107 | - } |
|
108 | - |
|
109 | - /** |
|
110 | - * Get the contents of the private key |
|
111 | - * |
|
112 | - * @return string |
|
113 | - * @throws \tbclla\Revolut\Exceptions\ConfigurationException |
|
114 | - */ |
|
115 | - private function getPrivateKey() |
|
116 | - { |
|
117 | - try { |
|
118 | - return file_get_contents($this->privateKey); |
|
119 | - } catch (Exception $e) { |
|
120 | - throw new ConfigurationException('Private Key not configured correctly! ' . $e->getMessage(), null, $e); |
|
121 | - } |
|
122 | - } |
|
123 | - |
|
124 | - /** |
|
125 | - * Get the JWT issuer |
|
126 | - * |
|
127 | - * @return string |
|
128 | - * @throws \tbclla\Revolut\Exceptions\ConfigurationException |
|
129 | - */ |
|
130 | - private function getIssuer() |
|
131 | - { |
|
132 | - $domain = parse_url($this->redirectUri); |
|
133 | - |
|
134 | - if (empty($domain['host'])) { |
|
135 | - throw new ConfigurationException('Invalid redirect URI.'); |
|
136 | - } |
|
137 | - |
|
138 | - return $domain['host']; |
|
139 | - } |
|
140 | - |
|
141 | - /** |
|
142 | - * Get the expiration time in the form of a unix timestamp |
|
143 | - * |
|
144 | - * @return int |
|
145 | - */ |
|
146 | - private static function getExpiration() |
|
147 | - { |
|
148 | - return time() + (60 * 5); |
|
149 | - } |
|
11 | + /** |
|
12 | + * The client assertion type |
|
13 | + * @link https://revolut-engineering.github.io/api-docs/business-api/#oauth-exchange-authorisation-code |
|
14 | + * |
|
15 | + * @var string |
|
16 | + */ |
|
17 | + const TYPE = 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer'; |
|
18 | + |
|
19 | + /** |
|
20 | + * The JWT's audience parameter |
|
21 | + * @link https://revolut-engineering.github.io/api-docs/business-api/#authentication-setting-up-access-to-your-business-account |
|
22 | + * |
|
23 | + * @var string |
|
24 | + */ |
|
25 | + const AUDIENCE = 'https://revolut.com'; |
|
26 | + |
|
27 | + /** |
|
28 | + * The JWT's algorythm parameter |
|
29 | + * @link https://revolut-engineering.github.io/api-docs/business-api/#authentication-setting-up-access-to-your-business-account |
|
30 | + * |
|
31 | + * @var string |
|
32 | + */ |
|
33 | + const ALGORYTHM = 'RS256'; |
|
34 | + |
|
35 | + /** |
|
36 | + * The JWT client |
|
37 | + * |
|
38 | + * @var \firebase\JWT\JWT |
|
39 | + */ |
|
40 | + private $jwtClient; |
|
41 | + |
|
42 | + /** |
|
43 | + * The client ID |
|
44 | + * |
|
45 | + * @var string |
|
46 | + */ |
|
47 | + public $clientId; |
|
48 | + |
|
49 | + /** |
|
50 | + * The private key path |
|
51 | + * |
|
52 | + * @var string |
|
53 | + */ |
|
54 | + private $privateKey; |
|
55 | + |
|
56 | + /** |
|
57 | + * The redirect URI |
|
58 | + * |
|
59 | + * @var string |
|
60 | + */ |
|
61 | + private $redirectUri; |
|
62 | + |
|
63 | + /** |
|
64 | + * Create a new client assertion |
|
65 | + * |
|
66 | + * @param string $clientId The client ID |
|
67 | + * @param string $privateKey The path to the private key |
|
68 | + * @param string $redirectUri The Oauth redirect URI |
|
69 | + * @return void |
|
70 | + */ |
|
71 | + public function __construct(string $clientId, string $privateKey, string $redirectUri) |
|
72 | + { |
|
73 | + $this->jwtClient = new JWT; |
|
74 | + $this->clientId = $clientId; |
|
75 | + $this->privateKey = $privateKey; |
|
76 | + $this->redirectUri = $redirectUri; |
|
77 | + } |
|
78 | + |
|
79 | + /** |
|
80 | + * Build the JWT |
|
81 | + * |
|
82 | + * @return string The assertion string |
|
83 | + * @throws \tbclla\Revolut\Exceptions\ConfigurationException |
|
84 | + */ |
|
85 | + public function build() |
|
86 | + { |
|
87 | + try { |
|
88 | + return $this->jwtClient->encode($this->buildPayload(), $this->getPrivateKey(), self::ALGORYTHM); |
|
89 | + } catch (Exception $e) { |
|
90 | + throw new ConfigurationException('Failed to create JWT - ' . $e->getMessage(), null, $e); |
|
91 | + } |
|
92 | + } |
|
93 | + |
|
94 | + /** |
|
95 | + * Build the payload for the JWT |
|
96 | + * |
|
97 | + * @return array |
|
98 | + */ |
|
99 | + private function buildPayload() |
|
100 | + { |
|
101 | + return [ |
|
102 | + 'sub' => $this->clientId, |
|
103 | + 'iss' => $this->getIssuer(), |
|
104 | + 'exp' => self::getExpiration(), |
|
105 | + 'aud' => self::AUDIENCE, |
|
106 | + ]; |
|
107 | + } |
|
108 | + |
|
109 | + /** |
|
110 | + * Get the contents of the private key |
|
111 | + * |
|
112 | + * @return string |
|
113 | + * @throws \tbclla\Revolut\Exceptions\ConfigurationException |
|
114 | + */ |
|
115 | + private function getPrivateKey() |
|
116 | + { |
|
117 | + try { |
|
118 | + return file_get_contents($this->privateKey); |
|
119 | + } catch (Exception $e) { |
|
120 | + throw new ConfigurationException('Private Key not configured correctly! ' . $e->getMessage(), null, $e); |
|
121 | + } |
|
122 | + } |
|
123 | + |
|
124 | + /** |
|
125 | + * Get the JWT issuer |
|
126 | + * |
|
127 | + * @return string |
|
128 | + * @throws \tbclla\Revolut\Exceptions\ConfigurationException |
|
129 | + */ |
|
130 | + private function getIssuer() |
|
131 | + { |
|
132 | + $domain = parse_url($this->redirectUri); |
|
133 | + |
|
134 | + if (empty($domain['host'])) { |
|
135 | + throw new ConfigurationException('Invalid redirect URI.'); |
|
136 | + } |
|
137 | + |
|
138 | + return $domain['host']; |
|
139 | + } |
|
140 | + |
|
141 | + /** |
|
142 | + * Get the expiration time in the form of a unix timestamp |
|
143 | + * |
|
144 | + * @return int |
|
145 | + */ |
|
146 | + private static function getExpiration() |
|
147 | + { |
|
148 | + return time() + (60 * 5); |
|
149 | + } |
|
150 | 150 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Environment |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | | Default is true. |
12 | 12 | | |
13 | 13 | */ |
14 | - 'sandbox' => env('REVOLUT_SANDBOX', true), |
|
14 | + 'sandbox' => env('REVOLUT_SANDBOX', true), |
|
15 | 15 | |
16 | - /* |
|
16 | + /* |
|
17 | 17 | |-------------------------------------------------------------------------- |
18 | 18 | | Private Key Path |
19 | 19 | |-------------------------------------------------------------------------- |
@@ -23,9 +23,9 @@ discard block |
||
23 | 23 | | authorization process. |
24 | 24 | | |
25 | 25 | */ |
26 | - 'private_key' => env('REVOLUT_PRIVATE_KEY'), |
|
26 | + 'private_key' => env('REVOLUT_PRIVATE_KEY'), |
|
27 | 27 | |
28 | - /* |
|
28 | + /* |
|
29 | 29 | |-------------------------------------------------------------------------- |
30 | 30 | | Client ID |
31 | 31 | |-------------------------------------------------------------------------- |
@@ -35,9 +35,9 @@ discard block |
||
35 | 35 | | selecting the relevant API certificate. |
36 | 36 | | |
37 | 37 | */ |
38 | - 'client_id' => env('REVOLUT_CLIENT_ID'), |
|
38 | + 'client_id' => env('REVOLUT_CLIENT_ID'), |
|
39 | 39 | |
40 | - /* |
|
40 | + /* |
|
41 | 41 | |-------------------------------------------------------------------------- |
42 | 42 | | Oauth Redirect URI |
43 | 43 | |-------------------------------------------------------------------------- |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | | necessary route and controllers. |
50 | 50 | | |
51 | 51 | */ |
52 | - 'redirect_uri' => env('REVOLUT_REDIRECT_URI'), |
|
52 | + 'redirect_uri' => env('REVOLUT_REDIRECT_URI'), |
|
53 | 53 | |
54 | - /* |
|
54 | + /* |
|
55 | 55 | |-------------------------------------------------------------------------- |
56 | 56 | | Tokens |
57 | 57 | |-------------------------------------------------------------------------- |
@@ -68,22 +68,22 @@ discard block |
||
68 | 68 | | Supported stores: 'database', 'cache' |
69 | 69 | | |
70 | 70 | */ |
71 | - 'tokens' => [ |
|
71 | + 'tokens' => [ |
|
72 | 72 | |
73 | - 'encrypt' => true, |
|
73 | + 'encrypt' => true, |
|
74 | 74 | |
75 | - 'store' => 'database', |
|
75 | + 'store' => 'database', |
|
76 | 76 | |
77 | - 'database' => [ |
|
78 | - 'table_name' => 'revolut_tokens' |
|
79 | - ], |
|
77 | + 'database' => [ |
|
78 | + 'table_name' => 'revolut_tokens' |
|
79 | + ], |
|
80 | 80 | |
81 | - 'cache' => [ |
|
82 | - 'driver' => null, |
|
83 | - ], |
|
84 | - ], |
|
81 | + 'cache' => [ |
|
82 | + 'driver' => null, |
|
83 | + ], |
|
84 | + ], |
|
85 | 85 | |
86 | - /* |
|
86 | + /* |
|
87 | 87 | |-------------------------------------------------------------------------- |
88 | 88 | | Authorization Route |
89 | 89 | |-------------------------------------------------------------------------- |
@@ -94,12 +94,12 @@ discard block |
||
94 | 94 | | therefore applied automatically and does not need to be specified |
95 | 95 | | |
96 | 96 | */ |
97 | - 'auth_route' => [ |
|
97 | + 'auth_route' => [ |
|
98 | 98 | |
99 | - 'name' => 'revolut-authorization', |
|
99 | + 'name' => 'revolut-authorization', |
|
100 | 100 | |
101 | - 'middleware' => [ |
|
102 | - // 'auth' |
|
103 | - ] |
|
104 | - ], |
|
101 | + 'middleware' => [ |
|
102 | + // 'auth' |
|
103 | + ] |
|
104 | + ], |
|
105 | 105 | ]; |
@@ -4,100 +4,100 @@ |
||
4 | 4 | |
5 | 5 | class TransferBuilder extends Builder |
6 | 6 | { |
7 | - /** |
|
8 | - * The source account ID |
|
9 | - * |
|
10 | - * @var string |
|
11 | - */ |
|
12 | - public $source_account_id; |
|
7 | + /** |
|
8 | + * The source account ID |
|
9 | + * |
|
10 | + * @var string |
|
11 | + */ |
|
12 | + public $source_account_id; |
|
13 | 13 | |
14 | - /** |
|
15 | - * The target account ID |
|
16 | - * |
|
17 | - * @var string |
|
18 | - */ |
|
19 | - public $target_account_id; |
|
14 | + /** |
|
15 | + * The target account ID |
|
16 | + * |
|
17 | + * @var string |
|
18 | + */ |
|
19 | + public $target_account_id; |
|
20 | 20 | |
21 | - /** |
|
22 | - * The amount |
|
23 | - * |
|
24 | - * @var float |
|
25 | - */ |
|
26 | - public $amount; |
|
21 | + /** |
|
22 | + * The amount |
|
23 | + * |
|
24 | + * @var float |
|
25 | + */ |
|
26 | + public $amount; |
|
27 | 27 | |
28 | - /** |
|
29 | - * The currency in 3-letter ISO format |
|
30 | - * |
|
31 | - * @var string |
|
32 | - */ |
|
33 | - public $currency; |
|
28 | + /** |
|
29 | + * The currency in 3-letter ISO format |
|
30 | + * |
|
31 | + * @var string |
|
32 | + */ |
|
33 | + public $currency; |
|
34 | 34 | |
35 | - /** |
|
36 | - * An optional reference |
|
37 | - * |
|
38 | - * @var string |
|
39 | - */ |
|
40 | - public $reference; |
|
35 | + /** |
|
36 | + * An optional reference |
|
37 | + * |
|
38 | + * @var string |
|
39 | + */ |
|
40 | + public $reference; |
|
41 | 41 | |
42 | - /** |
|
43 | - * The unique request ID |
|
44 | - * |
|
45 | - * @var string |
|
46 | - */ |
|
47 | - public $request_id; |
|
42 | + /** |
|
43 | + * The unique request ID |
|
44 | + * |
|
45 | + * @var string |
|
46 | + */ |
|
47 | + public $request_id; |
|
48 | 48 | |
49 | - /** |
|
50 | - * Set the source account ID |
|
51 | - * |
|
52 | - * @param string $id |
|
53 | - * @return self |
|
54 | - */ |
|
55 | - public function sourceAccount(string $id) |
|
56 | - { |
|
57 | - return $this->setAttribute('source_account_id', $id); |
|
58 | - } |
|
49 | + /** |
|
50 | + * Set the source account ID |
|
51 | + * |
|
52 | + * @param string $id |
|
53 | + * @return self |
|
54 | + */ |
|
55 | + public function sourceAccount(string $id) |
|
56 | + { |
|
57 | + return $this->setAttribute('source_account_id', $id); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Set the target account ID |
|
62 | - * |
|
63 | - * @param string $id |
|
64 | - * @return self |
|
65 | - */ |
|
66 | - public function targetAccount(string $id) |
|
67 | - { |
|
68 | - return $this->setAttribute('target_account_id', $id); |
|
69 | - } |
|
60 | + /** |
|
61 | + * Set the target account ID |
|
62 | + * |
|
63 | + * @param string $id |
|
64 | + * @return self |
|
65 | + */ |
|
66 | + public function targetAccount(string $id) |
|
67 | + { |
|
68 | + return $this->setAttribute('target_account_id', $id); |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * Set the transfer amount |
|
73 | - * |
|
74 | - * @param float $amount |
|
75 | - * @return self |
|
76 | - */ |
|
77 | - public function amount(float $amount) |
|
78 | - { |
|
79 | - return $this->setAttribute('amount', $amount); |
|
80 | - } |
|
71 | + /** |
|
72 | + * Set the transfer amount |
|
73 | + * |
|
74 | + * @param float $amount |
|
75 | + * @return self |
|
76 | + */ |
|
77 | + public function amount(float $amount) |
|
78 | + { |
|
79 | + return $this->setAttribute('amount', $amount); |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * Set the transfer currency |
|
84 | - * |
|
85 | - * @param string $currency |
|
86 | - * @return self |
|
87 | - */ |
|
88 | - public function currency(string $currency) |
|
89 | - { |
|
90 | - return $this->setAttribute('currency', $currency); |
|
91 | - } |
|
82 | + /** |
|
83 | + * Set the transfer currency |
|
84 | + * |
|
85 | + * @param string $currency |
|
86 | + * @return self |
|
87 | + */ |
|
88 | + public function currency(string $currency) |
|
89 | + { |
|
90 | + return $this->setAttribute('currency', $currency); |
|
91 | + } |
|
92 | 92 | |
93 | - /** |
|
94 | - * Set the optional transfer reference |
|
95 | - * |
|
96 | - * @param string $reference |
|
97 | - * @return self |
|
98 | - */ |
|
99 | - public function reference(string $reference) |
|
100 | - { |
|
101 | - return $this->setAttribute('reference', $reference); |
|
102 | - } |
|
93 | + /** |
|
94 | + * Set the optional transfer reference |
|
95 | + * |
|
96 | + * @param string $reference |
|
97 | + * @return self |
|
98 | + */ |
|
99 | + public function reference(string $reference) |
|
100 | + { |
|
101 | + return $this->setAttribute('reference', $reference); |
|
102 | + } |
|
103 | 103 | } |
@@ -4,85 +4,85 @@ |
||
4 | 4 | |
5 | 5 | class ExchangeBuilder extends Builder |
6 | 6 | { |
7 | - /** |
|
8 | - * Information about the account you want to exchange from |
|
9 | - * |
|
10 | - * @var array |
|
11 | - */ |
|
12 | - public $from; |
|
7 | + /** |
|
8 | + * Information about the account you want to exchange from |
|
9 | + * |
|
10 | + * @var array |
|
11 | + */ |
|
12 | + public $from; |
|
13 | 13 | |
14 | - /** |
|
15 | - * Information about the account you want to exchange to |
|
16 | - * |
|
17 | - * @var array |
|
18 | - */ |
|
19 | - public $to; |
|
14 | + /** |
|
15 | + * Information about the account you want to exchange to |
|
16 | + * |
|
17 | + * @var array |
|
18 | + */ |
|
19 | + public $to; |
|
20 | 20 | |
21 | 21 | |
22 | - /** |
|
23 | - * An optional reference |
|
24 | - * |
|
25 | - * @var string |
|
26 | - */ |
|
27 | - public $reference; |
|
22 | + /** |
|
23 | + * An optional reference |
|
24 | + * |
|
25 | + * @var string |
|
26 | + */ |
|
27 | + public $reference; |
|
28 | 28 | |
29 | - /** |
|
30 | - * Set the outgoing account |
|
31 | - * |
|
32 | - * @param string $accountId the account ID |
|
33 | - * @param string $currency the account currency |
|
34 | - * @param float $amount the amount of currency to sell (only when selling) |
|
35 | - * @return self |
|
36 | - */ |
|
37 | - public function from(string $accountId, string $currency, float $amount = null) |
|
38 | - { |
|
39 | - return $this->setAccount('from', $accountId, $currency, $amount); |
|
40 | - } |
|
29 | + /** |
|
30 | + * Set the outgoing account |
|
31 | + * |
|
32 | + * @param string $accountId the account ID |
|
33 | + * @param string $currency the account currency |
|
34 | + * @param float $amount the amount of currency to sell (only when selling) |
|
35 | + * @return self |
|
36 | + */ |
|
37 | + public function from(string $accountId, string $currency, float $amount = null) |
|
38 | + { |
|
39 | + return $this->setAccount('from', $accountId, $currency, $amount); |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * Set the receiving account |
|
44 | - * |
|
45 | - * @param string $accountId the account ID |
|
46 | - * @param string $currency the account currency |
|
47 | - * @param float $amount the amount of currency to buy (only when buying) |
|
48 | - * @return self |
|
49 | - */ |
|
50 | - public function to(string $accountId, string $currency, float $amount = null) |
|
51 | - { |
|
52 | - return $this->setAccount('to', $accountId, $currency, $amount); |
|
53 | - } |
|
42 | + /** |
|
43 | + * Set the receiving account |
|
44 | + * |
|
45 | + * @param string $accountId the account ID |
|
46 | + * @param string $currency the account currency |
|
47 | + * @param float $amount the amount of currency to buy (only when buying) |
|
48 | + * @return self |
|
49 | + */ |
|
50 | + public function to(string $accountId, string $currency, float $amount = null) |
|
51 | + { |
|
52 | + return $this->setAccount('to', $accountId, $currency, $amount); |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * Set an optional reference |
|
57 | - * |
|
58 | - * @param string $reference |
|
59 | - * @return self |
|
60 | - */ |
|
61 | - public function reference(string $reference) |
|
62 | - { |
|
63 | - return $this->setAttribute('reference', $reference); |
|
64 | - } |
|
55 | + /** |
|
56 | + * Set an optional reference |
|
57 | + * |
|
58 | + * @param string $reference |
|
59 | + * @return self |
|
60 | + */ |
|
61 | + public function reference(string $reference) |
|
62 | + { |
|
63 | + return $this->setAttribute('reference', $reference); |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * Set the account information |
|
68 | - * |
|
69 | - * @param string $type |
|
70 | - * @param string $accountId |
|
71 | - * @param string $currency |
|
72 | - * @param float $amount |
|
73 | - * @return self |
|
74 | - */ |
|
75 | - private function setAccount(string $type, string $accountId, string $currency, $amount) |
|
76 | - { |
|
77 | - $account = [ |
|
78 | - 'account_id' => $accountId, |
|
79 | - 'currency' => $currency, |
|
80 | - ]; |
|
66 | + /** |
|
67 | + * Set the account information |
|
68 | + * |
|
69 | + * @param string $type |
|
70 | + * @param string $accountId |
|
71 | + * @param string $currency |
|
72 | + * @param float $amount |
|
73 | + * @return self |
|
74 | + */ |
|
75 | + private function setAccount(string $type, string $accountId, string $currency, $amount) |
|
76 | + { |
|
77 | + $account = [ |
|
78 | + 'account_id' => $accountId, |
|
79 | + 'currency' => $currency, |
|
80 | + ]; |
|
81 | 81 | |
82 | - if ($amount) { |
|
83 | - $account['amount'] = $amount; |
|
84 | - } |
|
82 | + if ($amount) { |
|
83 | + $account['amount'] = $amount; |
|
84 | + } |
|
85 | 85 | |
86 | - return $this->setAttribute($type, $account); |
|
87 | - } |
|
86 | + return $this->setAttribute($type, $account); |
|
87 | + } |
|
88 | 88 | } |
@@ -6,83 +6,83 @@ |
||
6 | 6 | |
7 | 7 | abstract Class Builder |
8 | 8 | { |
9 | - /** |
|
10 | - * The API resource |
|
11 | - * |
|
12 | - * @var \tbclla\Revolut\Interfaces\Buildable |
|
13 | - */ |
|
14 | - protected $resource; |
|
9 | + /** |
|
10 | + * The API resource |
|
11 | + * |
|
12 | + * @var \tbclla\Revolut\Interfaces\Buildable |
|
13 | + */ |
|
14 | + protected $resource; |
|
15 | 15 | |
16 | - /** |
|
17 | - * The unique ID of the request |
|
18 | - * |
|
19 | - * @var string |
|
20 | - */ |
|
21 | - public $request_id; |
|
16 | + /** |
|
17 | + * The unique ID of the request |
|
18 | + * |
|
19 | + * @var string |
|
20 | + */ |
|
21 | + public $request_id; |
|
22 | 22 | |
23 | - /** |
|
24 | - * Create a new builder instance |
|
25 | - * |
|
26 | - * @param \tbclla\Revolut\Resources\Resource $resource |
|
27 | - * @param string $requestId |
|
28 | - * @return void |
|
29 | - */ |
|
30 | - public function __construct(Buildable $resource, string $requestId = null) |
|
31 | - { |
|
32 | - $this->resource = $resource; |
|
33 | - $this->request_id = $requestId; |
|
34 | - } |
|
23 | + /** |
|
24 | + * Create a new builder instance |
|
25 | + * |
|
26 | + * @param \tbclla\Revolut\Resources\Resource $resource |
|
27 | + * @param string $requestId |
|
28 | + * @return void |
|
29 | + */ |
|
30 | + public function __construct(Buildable $resource, string $requestId = null) |
|
31 | + { |
|
32 | + $this->resource = $resource; |
|
33 | + $this->request_id = $requestId; |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
37 | - * Execute the create request |
|
38 | - * |
|
39 | - * @return array |
|
40 | - */ |
|
41 | - public function create() |
|
42 | - { |
|
43 | - return $this->resource->create($this->toArray()); |
|
44 | - } |
|
36 | + /** |
|
37 | + * Execute the create request |
|
38 | + * |
|
39 | + * @return array |
|
40 | + */ |
|
41 | + public function create() |
|
42 | + { |
|
43 | + return $this->resource->create($this->toArray()); |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Set the unique equest ID |
|
48 | - * |
|
49 | - * @param string $id |
|
50 | - * @return self |
|
51 | - */ |
|
52 | - public function requestId(string $id) |
|
53 | - { |
|
54 | - return $this->setAttribute('request_id', $id); |
|
55 | - } |
|
46 | + /** |
|
47 | + * Set the unique equest ID |
|
48 | + * |
|
49 | + * @param string $id |
|
50 | + * @return self |
|
51 | + */ |
|
52 | + public function requestId(string $id) |
|
53 | + { |
|
54 | + return $this->setAttribute('request_id', $id); |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * Set the value of an attribute |
|
59 | - * |
|
60 | - * @param string $attribute |
|
61 | - * @param mixed $value |
|
62 | - * @return self |
|
63 | - */ |
|
64 | - protected function setAttribute(string $attribute, $value) |
|
65 | - { |
|
66 | - $this->$attribute = $value; |
|
57 | + /** |
|
58 | + * Set the value of an attribute |
|
59 | + * |
|
60 | + * @param string $attribute |
|
61 | + * @param mixed $value |
|
62 | + * @return self |
|
63 | + */ |
|
64 | + protected function setAttribute(string $attribute, $value) |
|
65 | + { |
|
66 | + $this->$attribute = $value; |
|
67 | 67 | |
68 | - return $this; |
|
69 | - } |
|
68 | + return $this; |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * Build the request data array |
|
73 | - * |
|
74 | - * @return array |
|
75 | - */ |
|
76 | - public function toArray() |
|
77 | - { |
|
78 | - $data = []; |
|
71 | + /** |
|
72 | + * Build the request data array |
|
73 | + * |
|
74 | + * @return array |
|
75 | + */ |
|
76 | + public function toArray() |
|
77 | + { |
|
78 | + $data = []; |
|
79 | 79 | |
80 | - foreach (get_object_vars($this) as $attribute => $value) { |
|
81 | - if ($attribute != 'resource' and !empty($value)) { |
|
82 | - $data[$attribute] = $value; |
|
83 | - } |
|
84 | - } |
|
80 | + foreach (get_object_vars($this) as $attribute => $value) { |
|
81 | + if ($attribute != 'resource' and !empty($value)) { |
|
82 | + $data[$attribute] = $value; |
|
83 | + } |
|
84 | + } |
|
85 | 85 | |
86 | - return $data; |
|
87 | - } |
|
86 | + return $data; |
|
87 | + } |
|
88 | 88 | } |