tbclla / laravel-revolut-business

src/Repositories/CacheTokenRepository.php

Indentation +67 added lines, -67 removed lines

@@ -10,81 +10,81 @@
 
 class CacheTokenRepository implements TokenRepository
 {
-    /**
-     * The cache key prefix
-     * 
-     * @var string
-     */
-    const PREFIX = 'revolut_';
+	/**
+	 * The cache key prefix
+	 * 
+	 * @var string
+	 */
+	const PREFIX = 'revolut_';
 
-    /**
-     * A cache repository
-     * 
-     * @var \Illuminate\Cache\Repository
-     */
-    private $cache;
+	/**
+	 * A cache repository
+	 * 
+	 * @var \Illuminate\Cache\Repository
+	 */
+	private $cache;
 
-    /**
-     * @param \Illuminate\Contracts\Cache\Factory $cache
-     * @param string $driver
-     * @return void
-     */
-    public function __construct(CacheFactory $cache, string $driver = null)
-    {
-        $this->cache = $cache->store($driver);
-    }
+	/**
+	 * @param \Illuminate\Contracts\Cache\Factory $cache
+	 * @param string $driver
+	 * @return void
+	 */
+	public function __construct(CacheFactory $cache, string $driver = null)
+	{
+		$this->cache = $cache->store($driver);
+	}
 
-    public function getAccessToken()
-    {
-        return $this->cache->get($this->getKey(AccessToken::TYPE));
-    }
+	public function getAccessToken()
+	{
+		return $this->cache->get($this->getKey(AccessToken::TYPE));
+	}
 
-    public function getRefreshToken()
-    {
-        return $this->cache->get($this->getKey(RefreshToken::TYPE));
-    }
+	public function getRefreshToken()
+	{
+		return $this->cache->get($this->getKey(RefreshToken::TYPE));
+	}
 
-    public function createAccessToken(string $value)
-    {
-        $this->createToken($accessToken = new AccessToken([
-            'value' => $value
-        ]));
+	public function createAccessToken(string $value)
+	{
+		$this->createToken($accessToken = new AccessToken([
+			'value' => $value
+		]));
 
-        return $accessToken;
-    }
+		return $accessToken;
+	}
 
-    public function createRefreshToken(string $value)
-    {
-        $this->createToken($refreshToken = new RefreshToken([
-            'value' => $value
-        ]));
+	public function createRefreshToken(string $value)
+	{
+		$this->createToken($refreshToken = new RefreshToken([
+			'value' => $value
+		]));
 
-        return $refreshToken;
-    }
+		return $refreshToken;
+	}
 
-    /**
-     * Put the token into the cache
-     * 
-     * @param \tbclla\Revolut\Interfaces\PersistableToken $token
-     * @return void
-     */
-    private function createToken(PersistableToken $token)
-    {
-        $this->cache->put(
-            $this->getKey($token->getType()),
-            $token,
-            $token->getExpiration()
-        );
-    }
+	/**
+	 * Put the token into the cache
+	 * 
+	 * @param \tbclla\Revolut\Interfaces\PersistableToken $token
+	 * @return void
+	 */
+	private function createToken(PersistableToken $token)
+	{
+		$this->cache->put(
+			$this->getKey($token->getType()),
+			$token,
+			$token->getExpiration()
+		);
+	}
 
-    /**
-     * Get the cache key
-     *
-     * @param string $type
-     * @return string
-     */
-    public function getKey(string $type)
-    {
-        return self::PREFIX . $type;
-    }
+	/**
+	 * Get the cache key
+	 *
+	 * @param string $type
+	 * @return string
+	 */
+	public function getKey(string $type)
+	{
+		return self::PREFIX . $type;
+	}
 }

src/Repositories/DatabaseTokenRepository.php

Indentation +20 added lines, -20 removed lines

@@ -8,27 +8,27 @@
 
 class DatabaseTokenRepository implements TokenRepository
 {
-    public function getAccessToken()
-    {
-        return AccessToken::active()->orderBy('id', 'desc')->first();
-    }
+	public function getAccessToken()
+	{
+		return AccessToken::active()->orderBy('id', 'desc')->first();
+	}
 
-    public function getRefreshToken()
-    {
-        return RefreshToken::orderBy('id', 'desc')->first();
-    }
+	public function getRefreshToken()
+	{
+		return RefreshToken::orderBy('id', 'desc')->first();
+	}
 
-    public function createAccessToken(string $value)
-    {
-        return AccessToken::create([
-            'value' => $value
-        ]);
-    }
+	public function createAccessToken(string $value)
+	{
+		return AccessToken::create([
+			'value' => $value
+		]);
+	}
 
-    public function createRefreshToken(string $value)
-    {
-        return RefreshToken::create([
-            'value' => $value
-        ]);
-    }
+	public function createRefreshToken(string $value)
+	{
+		return RefreshToken::create([
+			'value' => $value
+		]);
+	}
 }

src/Auth/AuthorizationCode.php

Indentation +27 added lines, -27 removed lines

@@ -6,35 +6,35 @@
 
 class AuthorizationCode implements GrantsAccessTokens
 {
-    /**
-     * The token value
-     * 
-     * @var string
-     */
-    public $value;
+	/**
+	 * The token value
+	 * 
+	 * @var string
+	 */
+	public $value;
 
-    /**
-     * Create a new authorization code instance
-     * 
-     * @param string $value The authorization code supplied by Revolut
-     */
-    public function __construct(string $value)
-    {
-        $this->value = $value;
-    }
+	/**
+	 * Create a new authorization code instance
+	 * 
+	 * @param string $value The authorization code supplied by Revolut
+	 */
+	public function __construct(string $value)
+	{
+		$this->value = $value;
+	}
 
-    public function getValue()
-    {
-        return $this->value;
-    }
+	public function getValue()
+	{
+		return $this->value;
+	}
 
-    public static function getType()
-    {
-        return 'code';
-    }
+	public static function getType()
+	{
+		return 'code';
+	}
 
-    public static function getGrantType()
-    {
-        return 'authorization_code';
-    }
+	public static function getGrantType()
+	{
+		return 'authorization_code';
+	}
 }

src/Auth/TokenManager.php

Indentation +91 added lines, -91 removed lines

@@ -9,107 +9,107 @@
 
 class TokenManager
 {
-    /**
-     * The token repository
-     *
-     * @var \tbclla\Revolut\Interfaces\TokenRepository
-     */
-    private $tokenRepository;
+	/**
+	 * The token repository
+	 *
+	 * @var \tbclla\Revolut\Interfaces\TokenRepository
+	 */
+	private $tokenRepository;
 
-    /**
-     * The access token request
-     *
-     * @var \tbclla\Revolut\Auth\Requests\AccessTokenRequest
-     */
-    private $accessTokenRequest;
+	/**
+	 * The access token request
+	 *
+	 * @var \tbclla\Revolut\Auth\Requests\AccessTokenRequest
+	 */
+	private $accessTokenRequest;
 
-    /**
-     * Create a token manager
-     *
-     * @param \tbclla\Revolut\Interfaces\TokenRepository $tokenRepository
-     * @param \tbclla\Revolut\Auth\Requests\AccessTokenRequest $accessTokenRequest
-     * @return void
-     */
-    public function __construct(TokenRepository $tokenRepository, AccessTokenRequest $accessTokenRequest)
-    {
-        $this->tokenRepository = $tokenRepository;
-        $this->accessTokenRequest = $accessTokenRequest;
-    }
+	/**
+	 * Create a token manager
+	 *
+	 * @param \tbclla\Revolut\Interfaces\TokenRepository $tokenRepository
+	 * @param \tbclla\Revolut\Auth\Requests\AccessTokenRequest $accessTokenRequest
+	 * @return void
+	 */
+	public function __construct(TokenRepository $tokenRepository, AccessTokenRequest $accessTokenRequest)
+	{
+		$this->tokenRepository = $tokenRepository;
+		$this->accessTokenRequest = $accessTokenRequest;
+	}
 
-    /**
-     * Get an access token from the repository,
-     * or request a new access token
-     *
-     * @return \tbclla\Revolut\Auth\AccessToken
-     */
-    public function getAccessToken()
-    {
-        $accessToken = $this->tokenRepository->getAccessToken();
+	/**
+	 * Get an access token from the repository,
+	 * or request a new access token
+	 *
+	 * @return \tbclla\Revolut\Auth\AccessToken
+	 */
+	public function getAccessToken()
+	{
+		$accessToken = $this->tokenRepository->getAccessToken();
 
-        return $accessToken ?? $this->refreshAccessToken();
-    }
+		return $accessToken ?? $this->refreshAccessToken();
+	}
 
-    /**
-     * Get a refresh token from the repository
-     *
-     * @return \tbclla\Revolut\Auth\RefreshToken|null
-     */
-    public function getRefreshToken()
-    {
-        return $this->tokenRepository->getRefreshToken();
-    }
+	/**
+	 * Get a refresh token from the repository
+	 *
+	 * @return \tbclla\Revolut\Auth\RefreshToken|null
+	 */
+	public function getRefreshToken()
+	{
+		return $this->tokenRepository->getRefreshToken();
+	}
 
-    /**
-     * Store a new access token
-     *
-     * @param string $value
-     * @return \tbclla\Revolut\Auth\AccessToken
-     */
-    public function createAccessToken(string $value)
-    {
-        return $this->tokenRepository->createAccessToken($value);
-    }
+	/**
+	 * Store a new access token
+	 *
+	 * @param string $value
+	 * @return \tbclla\Revolut\Auth\AccessToken
+	 */
+	public function createAccessToken(string $value)
+	{
+		return $this->tokenRepository->createAccessToken($value);
+	}
 
-    /**
-     * Store a new refresh token
-     *
-     * @param string $value
-     * @return \tbclla\Revolut\Auth\RefreshToken
-     */
-    public function createRefreshToken(string $value)
-    {
-        return $this->tokenRepository->createRefreshToken($value);
-    }
+	/**
+	 * Store a new refresh token
+	 *
+	 * @param string $value
+	 * @return \tbclla\Revolut\Auth\RefreshToken
+	 */
+	public function createRefreshToken(string $value)
+	{
+		return $this->tokenRepository->createRefreshToken($value);
+	}
 
-    /**
-     * Exchange a refresh token for a new access token
-     *
-     * @return \tbclla\Revolut\Auth\AccessToken
-     * @throws \tbclla\Revolut\Exceptions\AppUnauthorizedException
-     */
-    public function refreshAccessToken()
-    {
-        if (!$refreshToken = $this->getRefreshToken()) {
-            throw new AppUnauthorizedException('No refresh token found. Re-authorization required.');
-        }
+	/**
+	 * Exchange a refresh token for a new access token
+	 *
+	 * @return \tbclla\Revolut\Auth\AccessToken
+	 * @throws \tbclla\Revolut\Exceptions\AppUnauthorizedException
+	 */
+	public function refreshAccessToken()
+	{
+		if (!$refreshToken = $this->getRefreshToken()) {
+			throw new AppUnauthorizedException('No refresh token found. Re-authorization required.');
+		}
 
-        return $this->requestAccessToken($refreshToken);
-    }
+		return $this->requestAccessToken($refreshToken);
+	}
 
-    /**
-     * Request a new access token
-     *
-     * @param \tbclla\Revolut\Interfaces\GrantsAccessTokens $token
-     * @return \tbclla\Revolut\Auth\AccessToken
-     */
-    public function requestAccessToken(GrantsAccessTokens $token)
-    {
-        $response = $this->accessTokenRequest->exchange($token);
+	/**
+	 * Request a new access token
+	 *
+	 * @param \tbclla\Revolut\Interfaces\GrantsAccessTokens $token
+	 * @return \tbclla\Revolut\Auth\AccessToken
+	 */
+	public function requestAccessToken(GrantsAccessTokens $token)
+	{
+		$response = $this->accessTokenRequest->exchange($token);
 
-        if (isset($response['refresh_token'])) {
-            $this->createRefreshToken($response['refresh_token']);
-        }
+		if (isset($response['refresh_token'])) {
+			$this->createRefreshToken($response['refresh_token']);
+		}
 
-        return $this->createAccessToken($response['access_token']);
-    }
+		return $this->createAccessToken($response['access_token']);
+	}
 }

src/Auth/Requests/AccessTokenRequest.php

Indentation +81 added lines, -81 removed lines

@@ -9,92 +9,92 @@
 
 class AccessTokenRequest
 {
-    /**
-     * The authentication endpoint
-     * 
-     * @var string
-     */
-    const ENDPOINT = '/auth/token';
+	/**
+	 * The authentication endpoint
+	 * 
+	 * @var string
+	 */
+	const ENDPOINT = '/auth/token';
 
-    /**
-     * The client assertion
-     *
-     * @var \tbclla\Revolut\Auth\ClientAssertion
-     */
-    private $clientAssertion;
+	/**
+	 * The client assertion
+	 *
+	 * @var \tbclla\Revolut\Auth\ClientAssertion
+	 */
+	private $clientAssertion;
 
-    /**
-     * The HTTP client
-     *
-     * @var \tbclla\Revolut\Interfaces\MakesHttpRequests
-     */
-    private $httpClient;
+	/**
+	 * The HTTP client
+	 *
+	 * @var \tbclla\Revolut\Interfaces\MakesHttpRequests
+	 */
+	private $httpClient;
 
-    /**
-     * Create a new access token request instance
-     * 
-     * @param \tbclla\Revolut\Auth\ClientAssertion $clientAssertion
-     * @param \tbclla\Revolut\Interfaces\MakesHttpRequests $httpClient
-     * @return void
-     */
-    public function __construct(ClientAssertion $clientAssertion, MakesHttpRequests $httpClient)
-    {
-        $this->clientAssertion = $clientAssertion;
-        $this->httpClient = $httpClient;
-    }
+	/**
+	 * Create a new access token request instance
+	 * 
+	 * @param \tbclla\Revolut\Auth\ClientAssertion $clientAssertion
+	 * @param \tbclla\Revolut\Interfaces\MakesHttpRequests $httpClient
+	 * @return void
+	 */
+	public function __construct(ClientAssertion $clientAssertion, MakesHttpRequests $httpClient)
+	{
+		$this->clientAssertion = $clientAssertion;
+		$this->httpClient = $httpClient;
+	}
 
-    /**
-     * Exchange an authorization code or a refresh token for an access token
-     *
-     * @param \tbclla\Revolut\Interfaces\GrantsAccessTokens $requestToken
-     * @return array
-     */
-    public function exchange(GrantsAccessTokens $requestToken)
-    {
-        return $this->httpClient->post($this->uri(), [
-            'form_params' => array_merge(
-                $this->buildClientParams(),
-                $this->buildGrantParams($requestToken)
-            )
-        ]);
-    }
+	/**
+	 * Exchange an authorization code or a refresh token for an access token
+	 *
+	 * @param \tbclla\Revolut\Interfaces\GrantsAccessTokens $requestToken
+	 * @return array
+	 */
+	public function exchange(GrantsAccessTokens $requestToken)
+	{
+		return $this->httpClient->post($this->uri(), [
+			'form_params' => array_merge(
+				$this->buildClientParams(),
+				$this->buildGrantParams($requestToken)
+			)
+		]);
+	}
 
-    /**
-     * Get the Uri for the request
-     * 
-     * @return string
-     */
-    public static function uri()
-    {
-        return RevolutClient::buildUri(self::ENDPOINT);
-    }
+	/**
+	 * Get the Uri for the request
+	 * 
+	 * @return string
+	 */
+	public static function uri()
+	{
+		return RevolutClient::buildUri(self::ENDPOINT);
+	}
 
-    /**
-     * Build the client parameters
-     * The request must inlude the client ID, the client assertion (JWT) and client assertion type
-     * 
-     * @return array
-     */
-    private function buildClientParams()
-    {
-        return [
-            'client_assertion_type' => $this->clientAssertion::TYPE,
-            'client_id' => $this->clientAssertion->clientId,
-            'client_assertion' => $this->clientAssertion->build(),
-        ];
-    }
+	/**
+	 * Build the client parameters
+	 * The request must inlude the client ID, the client assertion (JWT) and client assertion type
+	 * 
+	 * @return array
+	 */
+	private function buildClientParams()
+	{
+		return [
+			'client_assertion_type' => $this->clientAssertion::TYPE,
+			'client_id' => $this->clientAssertion->clientId,
+			'client_assertion' => $this->clientAssertion->build(),
+		];
+	}
 
-    /**
-     * Build the grant parameters
-     * 
-     * @param \tbclla\Revolut\Interfaces\GrantsAccessTokens $requestToken
-     * @return array
-     */
-    private function buildGrantParams(GrantsAccessTokens $requestToken)
-    {
-        return [
-            'grant_type' => $requestToken->getGrantType(),
-            $requestToken->getType() => $requestToken->getValue(),
-        ];
-    }
+	/**
+	 * Build the grant parameters
+	 * 
+	 * @param \tbclla\Revolut\Interfaces\GrantsAccessTokens $requestToken
+	 * @return array
+	 */
+	private function buildGrantParams(GrantsAccessTokens $requestToken)
+	{
+		return [
+			'grant_type' => $requestToken->getGrantType(),
+			$requestToken->getType() => $requestToken->getValue(),
+		];
+	}
 }

src/Auth/Requests/AuthorizationCodeRequest.php

Indentation +98 added lines, -98 removed lines

@@ -4,113 +4,113 @@
 
 class AuthorizationCodeRequest
 {
-    /**
-     * The sandbox URL
-     * 
-     * @var string
-     */
-    const SANDBOX_URL = 'https://sandbox-business.revolut.com';
+	/**
+	 * The sandbox URL
+	 * 
+	 * @var string
+	 */
+	const SANDBOX_URL = 'https://sandbox-business.revolut.com';
 
-    /**
-     * The production URL
-     * 
-     * @var string
-     */
-    const PRODUCTION_URL = 'https://business.revolut.com';
+	/**
+	 * The production URL
+	 * 
+	 * @var string
+	 */
+	const PRODUCTION_URL = 'https://business.revolut.com';
 
-    /**
-     * The app authorization endpoint
-     * 
-     * @var string
-     */
-    const ENDPOINT = '/app-confirm';
+	/**
+	 * The app authorization endpoint
+	 * 
+	 * @var string
+	 */
+	const ENDPOINT = '/app-confirm';
 
-    /**
-     * A token repository
-     *
-     * @var string The client Id
-     */
-    private $clientId;
+	/**
+	 * A token repository
+	 *
+	 * @var string The client Id
+	 */
+	private $clientId;
 
-    /**
-     * A token repository
-     *
-     * @var string The redirect URI
-     */
-    private $redirectUri;
+	/**
+	 * A token repository
+	 *
+	 * @var string The redirect URI
+	 */
+	private $redirectUri;
 
-    /**
-     * A token repository
-     *
-     * @var bool The environment
-     */
-    private $sandbox;
+	/**
+	 * A token repository
+	 *
+	 * @var bool The environment
+	 */
+	private $sandbox;
 
-    /**
-     * A state value
-     *
-     * @var string
-     */
-    public $state;
+	/**
+	 * A state value
+	 *
+	 * @var string
+	 */
+	public $state;
 
-    /**
-     * Create a new request
-     *
-     * @param string $clientId The Revolut Business Client ID
-     * @param string $redirectUri The OAuth redirect URI
-     * @param bool $sandbox Whether or not to use the sandbox environment
-     * @return void
-     */
-    public function __construct(string $clientId, string $redirectUri, bool $sandbox = true)
-    {
-        $this->clientId = $clientId;
-        $this->redirectUri = $redirectUri;
-        $this->sandbox = $sandbox;
-        $this->state = $this->generateState();
-    }
+	/**
+	 * Create a new request
+	 *
+	 * @param string $clientId The Revolut Business Client ID
+	 * @param string $redirectUri The OAuth redirect URI
+	 * @param bool $sandbox Whether or not to use the sandbox environment
+	 * @return void
+	 */
+	public function __construct(string $clientId, string $redirectUri, bool $sandbox = true)
+	{
+		$this->clientId = $clientId;
+		$this->redirectUri = $redirectUri;
+		$this->sandbox = $sandbox;
+		$this->state = $this->generateState();
+	}
 
-    /**
-     * Build the request
-     * 
-     * @return string
-     */
-    public function build()
-    {
-        return $this->baseUri() . self::ENDPOINT . '?' . $this->buildQuery();
-    }
+	/**
+	 * Build the request
+	 * 
+	 * @return string
+	 */
+	public function build()
+	{
+		return $this->baseUri() . self::ENDPOINT . '?' . $this->buildQuery();
+	}
 
-    /**
-     * Build the base URI
-     * 
-     * @return string
-     */
-    private function baseUri()
-    {
-        return $this->sandbox ? self::SANDBOX_URL : self::PRODUCTION_URL;
-    }
+	/**
+	 * Build the base URI
+	 * 
+	 * @return string
+	 */
+	private function baseUri()
+	{
+		return $this->sandbox ? self::SANDBOX_URL : self::PRODUCTION_URL;
+	}
 
-    /**
-     * Build the query
-     * 
-     * @return string
-     */
-    private function buildQuery()
-    {
-        return http_build_query([
-            'response_type' => 'request_token',
-            'client_id' => $this->clientId,
-            'redirect_uri' => $this->redirectUri,
-            'state' => $this->state
-        ]);
-    }
+	/**
+	 * Build the query
+	 * 
+	 * @return string
+	 */
+	private function buildQuery()
+	{
+		return http_build_query([
+			'response_type' => 'request_token',
+			'client_id' => $this->clientId,
+			'redirect_uri' => $this->redirectUri,
+			'state' => $this->state
+		]);
+	}
 
-    /**
-     * Generate a state value
-     *
-     * @return string
-     */
-    private function generateState()
-    {
-        return base64_encode(random_bytes(32));
-    }
+	/**
+	 * Generate a state value
+	 *
+	 * @return string
+	 */
+	private function generateState()
+	{
+		return base64_encode(random_bytes(32));
+	}
 }

src/Auth/Token.php

Indentation +80 added lines, -80 removed lines

@@ -16,95 +16,95 @@
  */
 abstract class Token extends Model
 {
-    use Encryptable;
+	use Encryptable;
 
-    /**
-     * Whether or not to use timestamps
-     * 
-     * @var bool
-     */
-    public $timestamps = false;
+	/**
+	 * Whether or not to use timestamps
+	 * 
+	 * @var bool
+	 */
+	public $timestamps = false;
 
-    /**
-     * The attributes that are fillable
-     * 
-     * @var array
-     */
-    protected $fillable = ['value'];
+	/**
+	 * The attributes that are fillable
+	 * 
+	 * @var array
+	 */
+	protected $fillable = ['value'];
 
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array
-     */
-    protected $casts = [
-        'is_encrypted' => 'boolean',
-        'expires_at' => 'datetime',
-        'created_at' => 'datetime',
-    ];
+	/**
+	 * The attributes that should be cast to native types.
+	 *
+	 * @var array
+	 */
+	protected $casts = [
+		'is_encrypted' => 'boolean',
+		'expires_at' => 'datetime',
+		'created_at' => 'datetime',
+	];
 
-    /**
-     * The "booting" method of the model.
-     * 
-     * @return void
-     */
-    protected static function boot()
-    {
-        parent::boot();
+	/**
+	 * The "booting" method of the model.
+	 * 
+	 * @return void
+	 */
+	protected static function boot()
+	{
+		parent::boot();
 
-        static::creating(function($model) {
-            $model->type = static::getType();
-            $model->expires_at = static::getExpiration();
-        });
+		static::creating(function($model) {
+			$model->type = static::getType();
+			$model->expires_at = static::getExpiration();
+		});
         
-        static::addGlobalScope('type', function(Builder $builder) {
-            $builder->whereType(static::getType());
-        });
-    }
+		static::addGlobalScope('type', function(Builder $builder) {
+			$builder->whereType(static::getType());
+		});
+	}
 
-    /**
-     * Get the name of the tokens table
-     * 
-     * @return string
-     */
-    public function getTable()
-    {
-        return config('revolut.tokens.table_name');
-    }
+	/**
+	 * Get the name of the tokens table
+	 * 
+	 * @return string
+	 */
+	public function getTable()
+	{
+		return config('revolut.tokens.table_name');
+	}
 
-    /**
-     * Check if the token has expired
-     * 
-     * @return bool
-     */
-    public function hasExpired()
-    {
-        return $this->expires_at ? $this->expires_at < now() : false;
-    }
+	/**
+	 * Check if the token has expired
+	 * 
+	 * @return bool
+	 */
+	public function hasExpired()
+	{
+		return $this->expires_at ? $this->expires_at < now() : false;
+	}
 
-    /**
-     * Scope a query to only inlcude active tokens
-     * 
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param bool  $isActive
-     * @return  \Illuminate\Database\Eloquent\Builder
-     */
-    public function scopeActive($query, bool $isActive = true)
-    {
-        $col = 'expires_at';
+	/**
+	 * Scope a query to only inlcude active tokens
+	 * 
+	 * @param  \Illuminate\Database\Eloquent\Builder  $query
+	 * @param bool  $isActive
+	 * @return  \Illuminate\Database\Eloquent\Builder
+	 */
+	public function scopeActive($query, bool $isActive = true)
+	{
+		$col = 'expires_at';
 
-        return $isActive 
-            ? $query->where($col, '>', now())->orWhereNull($col)
-            : $query->where($col, '<=', now());
-    }
+		return $isActive 
+			? $query->where($col, '>', now())->orWhereNull($col)
+			: $query->where($col, '<=', now());
+	}
 
-    /**
-     * Delete all expired access tokens
-     * 
-     * @return int The number of deleted tokens
-     */
-    public static function clearExpired()
-    {
-        return (int) self::active(false)->delete();
-    }
+	/**
+	 * Delete all expired access tokens
+	 * 
+	 * @return int The number of deleted tokens
+	 */
+	public static function clearExpired()
+	{
+		return (int) self::active(false)->delete();
+	}
 }

src/Auth/AccessToken.php

Indentation +20 added lines, -20 removed lines

@@ -7,27 +7,27 @@
 
 class AccessToken extends Token implements PersistableToken
 {
-    /**
-     * The name of the token
-     * 
-     * @var string
-     */
-    const TYPE = 'access_token';
+	/**
+	 * The name of the token
+	 * 
+	 * @var string
+	 */
+	const TYPE = 'access_token';
 
-    /**
-     * The time to live in minutes
-     * 
-     * @var int
-     */
-    const TTL = 40;
+	/**
+	 * The time to live in minutes
+	 * 
+	 * @var int
+	 */
+	const TTL = 40;
 
-    public static function getType()
-    {
-        return self::TYPE;
-    }
+	public static function getType()
+	{
+		return self::TYPE;
+	}
 
-    public static function getExpiration()
-    {
-        return now()->addMinutes(self::TTL);
-    }
+	public static function getExpiration()
+	{
+		return now()->addMinutes(self::TTL);
+	}
 }

src/Auth/RefreshToken.php

Indentation +45 added lines, -45 removed lines

@@ -8,49 +8,49 @@
 
 class RefreshToken extends Token implements GrantsAccessTokens, PersistableToken
 {
-    /**
-     * The type of the token
-     * 
-     * @var string
-     */
-    const TYPE = 'refresh_token';
-
-    /**
-     * The grant type of the token
-     * 
-     * @var string
-     */
-    const GRANT_TYPE = 'refresh_token';
-
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    public static function getType()
-    {
-        return self::TYPE;
-    }
-
-    public static function getGrantType()
-    {
-        return self::GRANT_TYPE;
-    }
-
-    public static function getExpiration()
-    {
-        return null;
-    }
-
-    /**
-     * Delete all expired refresh tokens
-     * 
-     * @return int The number of deleted tokens
-     */
-    public static function clearExpired()
-    {
-        $latest = self::latest()->select('id')->first();
-
-        return (int) self::where('id', '!=', $latest->id)->delete();
-    }
+	/**
+	 * The type of the token
+	 * 
+	 * @var string
+	 */
+	const TYPE = 'refresh_token';
+
+	/**
+	 * The grant type of the token
+	 * 
+	 * @var string
+	 */
+	const GRANT_TYPE = 'refresh_token';
+
+	public function getValue()
+	{
+		return $this->value;
+	}
+
+	public static function getType()
+	{
+		return self::TYPE;
+	}
+
+	public static function getGrantType()
+	{
+		return self::GRANT_TYPE;
+	}
+
+	public static function getExpiration()
+	{
+		return null;
+	}
+
+	/**
+	 * Delete all expired refresh tokens
+	 * 
+	 * @return int The number of deleted tokens
+	 */
+	public static function clearExpired()
+	{
+		$latest = self::latest()->select('id')->first();
+
+		return (int) self::where('id', '!=', $latest->id)->delete();
+	}
 }