Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-08 09:26:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [ADD] Improved tracking handling.

Browse Source 
* [MOD] Improved login process workflow.
This commit is contained in:
nuxsmin
2018-02-26 14:07:14 +01:00
committed by Rubén Domínguez
parent 94f9929be0
commit ed0d95b774
13 changed files with 581 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/modules/web/Controllers/LoginController.php
View File

@@ -29,10 +29,11 @@ use SP\Core\Events\EventMessage;
use SP\Core\SessionFactory;
use SP\Core\SessionUtil;
use SP\Html\Html;
use SP\Http\Request;
use SP\Http\Response;
use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
use SP\Modules\Web\Controllers\Traits\JsonTrait;
use SP\Services\Auth\LoginService;
use SP\Util\Json;
/**
* Class LoginController
@@ -41,17 +42,37 @@ use SP\Util\Json;
*/
class LoginController extends ControllerBase
{
use JsonTrait;
/**
* Login action
*
* @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
*/
public function loginAction()
{
$loginService = $this->dic->get(LoginService::class);
Json::returnJson($loginService->doLogin());
try {
$loginService = $this->dic->get(LoginService::class);
$loginResponmse = $loginService->doLogin();
$forward = Request::getRequestHeaders('X-Forwarded-For');
if ($forward) {
$this->eventDispatcher->notifyEvent('login.info',
new Event($this, EventMessage::factory()
->addDetail('X-Forwarded-For', $this->configData->isDemoEnabled() ? '***' : $forward))
);
}
$this->returnJsonResponseData(['url' => $loginResponmse->getRedirect()]);
} catch (\Exception $e) {
processException($e);
$this->eventDispatcher->notifyEvent('exception', new Event($e));
$this->returnJsonResponse($e->getCode(), $e->getMessage());
}
}
/**

16
app/modules/web/Controllers/Traits/JsonTrait.php
View File

@@ -38,9 +38,9 @@ trait JsonTrait
/**
* Returns JSON response
*
* @param int $status Status code
* @param string $description Untranslated description string
* @param array|null $messages Untranslated massages array of strings
* @param int $status Status code
* @param string $description Untranslated description string
* @param array|null $messages Untranslated massages array of strings
*/
protected function returnJsonResponse($status, $description, array $messages = null)
{
@@ -59,10 +59,10 @@ trait JsonTrait
* Returns JSON response
*
* @param mixed $data
* @param int $status Status code
* @param null $description Untranslated description string
* @param int $status Status code
* @param null $description Untranslated description string
*/
protected function returnJsonResponseData($data, $status = 0, $description = null)
protected function returnJsonResponseData($data, $status = JsonResponse::JSON_SUCCESS, $description = null)
{
$jsonResponse = new JsonResponse();
$jsonResponse->setStatus($status);
@@ -80,7 +80,7 @@ trait JsonTrait
* Returns JSON response
*
* @param \Exception $exception
* @param int $status Status code
* @param int $status Status code
*/
protected function returnJsonResponseException(\Exception $exception, $status = JsonResponse::JSON_ERROR)
{
@@ -88,7 +88,7 @@ trait JsonTrait
$jsonResponse->setStatus($status);
$jsonResponse->setDescription($exception->getMessage());
if ($exception instanceof SPException && $exception->getHint() !== null ) {
if ($exception instanceof SPException && $exception->getHint() !== null) {
$jsonResponse->setMessages([$exception->getHint()]);
}