Skip to content

Commit 11abebf

Browse files
author
Antoine Aflalo
committed
fix(Middleware): Remove Middleware client trait
Impossible to reuse for different use cases
1 parent 9c948d8 commit 11abebf

5 files changed

Lines changed: 41 additions & 46 deletions

File tree

src/Client/Middleware/Error/AuthenticationMiddleware.php

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
use Psr\Http\Message\ResponseInterface;
1212
use ZEROSPAM\Framework\SDK\Client\Exception\TooManyRetriesException;
13+
use ZEROSPAM\Framework\SDK\Client\IOAuthClient;
1314
use ZEROSPAM\Framework\SDK\Client\Middleware\IMiddleware;
14-
use ZEROSPAM\Framework\SDK\Client\Middleware\MiddlewareClient;
1515
use ZEROSPAM\Framework\SDK\Request\Api\IRequest;
1616

1717
/**
@@ -23,9 +23,27 @@
2323
*/
2424
class AuthenticationMiddleware implements IMiddleware
2525
{
26-
use MiddlewareClient;
2726

2827
const MAX_TRIES = 3;
28+
/**
29+
* @var IOAuthClient
30+
*/
31+
protected $client;
32+
33+
/**
34+
* Set the OAuth Client.
35+
*
36+
* @param IOAuthClient $client
37+
*
38+
* @return $this
39+
*/
40+
public function setClient(IOAuthClient $client): IMiddleware
41+
{
42+
$this->client = $client;
43+
44+
return $this;
45+
}
46+
2947

3048
/**
3149
* Which status error code does this middleware manage.

src/Client/Middleware/IMiddleware.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ interface IMiddleware
2828
*
2929
* @return $this
3030
*/
31-
public function setClient(IOAuthClient $client): IMiddleware;
31+
public function setClient(IOAuthClient $client): self;
3232

3333
/**
3434
* Which status error code does this middleware manage.

src/Client/Middleware/IRefreshTokenMiddleware.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ interface IRefreshTokenMiddleware
2121
*
2222
* @return $this
2323
*/
24-
public function setClient(IOAuthClient $client): IMiddleware;
24+
public function setClient(IOAuthClient $client): self;
2525

2626
/**
2727
* Take care of refreshing the token

src/Client/Middleware/MiddlewareClient.php

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/Client/Middleware/RefreshToken/RefreshTokenMiddleware.php

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,30 @@
99
namespace ZEROSPAM\Framework\SDK\Client\Middleware\RefreshToken;
1010

1111
use League\OAuth2\Client\Token\AccessToken;
12+
use ZEROSPAM\Framework\SDK\Client\IOAuthClient;
1213
use ZEROSPAM\Framework\SDK\Client\Middleware\IRefreshTokenMiddleware;
13-
use ZEROSPAM\Framework\SDK\Client\Middleware\MiddlewareClient;
1414

1515
class RefreshTokenMiddleware implements IRefreshTokenMiddleware
1616
{
1717

18-
use MiddlewareClient;
18+
/**
19+
* @var IOAuthClient
20+
*/
21+
protected $client;
22+
23+
/**
24+
* Set the OAuth Client.
25+
*
26+
* @param IOAuthClient $client
27+
*
28+
* @return $this
29+
*/
30+
public function setClient(IOAuthClient $client): IRefreshTokenMiddleware
31+
{
32+
$this->client = $client;
33+
34+
return $this;
35+
}
1936

2037
/**
2138
* Take care of refreshing the token

0 commit comments

Comments
 (0)