Skip to content

Bind SessionState handler interface in container #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 16, 2019
Merged

Bind SessionState handler interface in container #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
583a91e
Setup the CODEOWNERS for pull request reviews
damieng Oct 8, 2019
63ec44e
Setup the CODEOWNERS for pull request reviews
damieng Oct 8, 2019
aad8af6
Bind SessionState handler interface in contianer
nstapelbroek Oct 10, 2019
2d807b5
Make Auth0Service constructor arguments required
nstapelbroek Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @auth0/sdk-team-approvers
* @auth0/dx-sdks-approver
23 changes: 6 additions & 17 deletions src/Auth0/Login/Auth0Service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@

namespace Auth0\Login;

use Auth0\SDK\API\Helpers\State\SessionStateHandler;
use Auth0\SDK\API\Helpers\State\StateHandler;
use Auth0\SDK\Auth0;
use Auth0\SDK\Helpers\Cache\CacheHandler;
use Auth0\SDK\JWTVerifier;
use Auth0\SDK\Store\StoreInterface;
use Config;
use Illuminate\Contracts\Config\Repository;
use Illuminate\Contracts\Container\BindingResolutionException;
use Illuminate\Http\RedirectResponse;

Expand All @@ -31,28 +30,18 @@ class Auth0Service
*
* @param array $auth0Config
* @param StoreInterface $sessionStorage
* @param StateHandler|null $stateHandler
*
* @throws \Auth0\SDK\Exception\CoreException
*/
public function __construct(
array $auth0Config = null,
StoreInterface $sessionStorage = null,
SessionStateHandler $sessionStateHandler = null
array $auth0Config,
StoreInterface $sessionStorage,
StateHandler $stateHandler
)
{
// Backwards compatible fallbacks
if (!$auth0Config instanceof Repository && !is_array($auth0Config)) {
$auth0Config = config('laravel-auth0');
}
if (!$sessionStorage instanceof StoreInterface) {
$sessionStorage = new LaravelSessionStore();
}
if (!$sessionStateHandler instanceof SessionStateHandler) {
$sessionStateHandler = new SessionStateHandler($sessionStorage);
}

$auth0Config['store'] = $sessionStorage;
$auth0Config['state_handler'] = $sessionStateHandler;
$auth0Config['state_handler'] = $stateHandler;
$this->auth0 = new Auth0($auth0Config);
}

Expand Down
3 changes: 2 additions & 1 deletion src/Auth0/Login/LoginServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Auth0\SDK\API\Helpers\ApiClient;
use Auth0\SDK\API\Helpers\InformationHeaders;
use Auth0\SDK\API\Helpers\State\SessionStateHandler;
use Auth0\SDK\API\Helpers\State\StateHandler;
use Auth0\SDK\Store\StoreInterface;
use Illuminate\Support\ServiceProvider;

Expand Down Expand Up @@ -49,7 +50,7 @@ public function register()
return new LaravelSessionStore();
});

$this->app->bind(SessionStateHandler::class, function ($app) {
$this->app->bind(StateHandler::class, function ($app) {
return new SessionStateHandler($app->make(LaravelSessionStore::class));
});

Expand Down