Skip to content
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.

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

Already on GitHub? Sign in to your account

fix: 馃悰 login middleware redirect #12

Merged
merged 1 commit into from
Jun 8, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/Middleware/LoginMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Maicol07\SSO\Middleware;

use Flarum\Foundation\Config;
use Flarum\Http\RequestUtil;
use Flarum\Http\SessionAccessToken;
use Flarum\Http\SessionAuthenticator;
Expand All @@ -14,6 +15,19 @@

class LoginMiddleware implements MiddlewareInterface
{
/**
* @var Config
*/
private $config;

/**
* @param Config $config
*/
public function __construct(Config $config)
{
$this->config = $config;
}

final public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{
$actor = RequestUtil::getActor($request);
Expand All @@ -23,7 +37,7 @@ final public function process(ServerRequestInterface $request, RequestHandlerInt

if ($token !== null and $actor->isGuest()) {
resolve(SessionAuthenticator::class)->logIn($session, $token);
return new RedirectResponse($request->getUri());
return new RedirectResponse($this->config->url() . $request->getUri()->getPath());
}

return $handler->handle($request);
Expand Down