refactor: use consistant naming
Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
This commit is contained in:
@@ -92,9 +92,9 @@ class AuthenticationController extends ControllerAbstract
|
|||||||
}
|
}
|
||||||
|
|
||||||
$request = AuthenticationRequest::verify($session, $method, $response);
|
$request = AuthenticationRequest::verify($session, $method, $response);
|
||||||
$authResponse = $this->authManager->handle($request);
|
$response = $this->authManager->handle($request);
|
||||||
|
|
||||||
return $this->buildJsonResponse($authResponse);
|
return $this->buildJsonResponse($response);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -120,8 +120,8 @@ class AuthenticationController extends ControllerAbstract
|
|||||||
$host = $request->getHost();
|
$host = $request->getHost();
|
||||||
$callbackUrl = "{$scheme}://{$host}/auth/callback/{$method}";
|
$callbackUrl = "{$scheme}://{$host}/auth/callback/{$method}";
|
||||||
|
|
||||||
$authRequest = AuthenticationRequest::redirect($sessionId, $method, $callbackUrl, $returnUrl);
|
$request = AuthenticationRequest::redirect($sessionId, $method, $callbackUrl, $returnUrl);
|
||||||
$response = $this->authManager->handle($authRequest);
|
$response = $this->authManager->handle($request);
|
||||||
|
|
||||||
return $this->buildJsonResponse($response);
|
return $this->buildJsonResponse($response);
|
||||||
}
|
}
|
||||||
@@ -142,8 +142,8 @@ class AuthenticationController extends ControllerAbstract
|
|||||||
return $this->redirectWithError('Missing state parameter');
|
return $this->redirectWithError('Missing state parameter');
|
||||||
}
|
}
|
||||||
|
|
||||||
$authRequest = AuthenticationRequest::callback($sessionId, $provider, $params);
|
$request = AuthenticationRequest::callback($sessionId, $provider, $params);
|
||||||
$response = $this->authManager->handle($authRequest);
|
$response = $this->authManager->handle($request);
|
||||||
|
|
||||||
if ($response->isSuccess()) {
|
if ($response->isSuccess()) {
|
||||||
$returnUrl = $response->returnUrl ?? '/';
|
$returnUrl = $response->returnUrl ?? '/';
|
||||||
@@ -178,8 +178,8 @@ class AuthenticationController extends ControllerAbstract
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$authRequest = AuthenticationRequest::status($sessionId);
|
$request = AuthenticationRequest::status($sessionId);
|
||||||
$response = $this->authManager->handle($authRequest);
|
$response = $this->authManager->handle($request);
|
||||||
|
|
||||||
return $this->buildJsonResponse($response);
|
return $this->buildJsonResponse($response);
|
||||||
}
|
}
|
||||||
@@ -192,8 +192,8 @@ class AuthenticationController extends ControllerAbstract
|
|||||||
{
|
{
|
||||||
$sessionId = $request->query->get('session', '');
|
$sessionId = $request->query->get('session', '');
|
||||||
|
|
||||||
$authRequest = AuthenticationRequest::cancel($sessionId);
|
$request = AuthenticationRequest::cancel($sessionId);
|
||||||
$this->authManager->handle($authRequest);
|
$this->authManager->handle($request);
|
||||||
|
|
||||||
return new JsonResponse(['status' => 'cancelled', 'message' => 'Session cancelled']);
|
return new JsonResponse(['status' => 'cancelled', 'message' => 'Session cancelled']);
|
||||||
}
|
}
|
||||||
@@ -217,8 +217,8 @@ class AuthenticationController extends ControllerAbstract
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$authRequest = AuthenticationRequest::refresh($refreshToken);
|
$request = AuthenticationRequest::refresh($refreshToken);
|
||||||
$response = $this->authManager->handle($authRequest);
|
$response = $this->authManager->handle($request);
|
||||||
|
|
||||||
if ($response->isFailed()) {
|
if ($response->isFailed()) {
|
||||||
$httpResponse = new JsonResponse($response->toArray(), $response->httpStatus);
|
$httpResponse = new JsonResponse($response->toArray(), $response->httpStatus);
|
||||||
@@ -259,8 +259,8 @@ class AuthenticationController extends ControllerAbstract
|
|||||||
{
|
{
|
||||||
$token = $request->cookies->get('accessToken');
|
$token = $request->cookies->get('accessToken');
|
||||||
|
|
||||||
$authRequest = AuthenticationRequest::logout($token, false);
|
$request = AuthenticationRequest::logout($token, false);
|
||||||
$this->authManager->handle($authRequest);
|
$this->authManager->handle($request);
|
||||||
|
|
||||||
$response = new JsonResponse(['status' => 'success', 'message' => 'Logged out successfully']);
|
$response = new JsonResponse(['status' => 'success', 'message' => 'Logged out successfully']);
|
||||||
return $this->clearTokenCookies($response);
|
return $this->clearTokenCookies($response);
|
||||||
@@ -274,8 +274,8 @@ class AuthenticationController extends ControllerAbstract
|
|||||||
{
|
{
|
||||||
$token = $request->cookies->get('accessToken');
|
$token = $request->cookies->get('accessToken');
|
||||||
|
|
||||||
$authRequest = AuthenticationRequest::logout($token, true);
|
$request = AuthenticationRequest::logout($token, true);
|
||||||
$this->authManager->handle($authRequest);
|
$this->authManager->handle($request);
|
||||||
|
|
||||||
$response = new JsonResponse(['status' => 'success', 'message' => 'Logged out from all devices']);
|
$response = new JsonResponse(['status' => 'success', 'message' => 'Logged out from all devices']);
|
||||||
return $this->clearTokenCookies($response);
|
return $this->clearTokenCookies($response);
|
||||||
|
|||||||
Reference in New Issue
Block a user