tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT Add the ability to redirect a user to a custom page

Browse Source
This commit is contained in:
Damian Mooyman 2017-11-27 15:04:49 +13:00 committed by GitHub
commit a7847b573b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Security/MemberAuthenticator/ChangePasswordHandler.php
View File

@ -3,12 +3,15 @@
namespace SilverStripe\Security\MemberAuthenticator; namespace SilverStripe\Security\MemberAuthenticator;
use Psr\Container\NotFoundExceptionInterface;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\HTTPResponse;
use SilverStripe\Control\RequestHandler; use SilverStripe\Control\RequestHandler;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\FieldType\DBField; use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\ORM\ValidationException;
use SilverStripe\Security\Authenticator; use SilverStripe\Security\Authenticator;
use SilverStripe\Security\IdentityStore; use SilverStripe\Security\IdentityStore;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
@ -195,6 +198,8 @@ class ChangePasswordHandler extends RequestHandler
* @param array $data The user submitted data * @param array $data The user submitted data
* @param ChangePasswordForm $form * @param ChangePasswordForm $form
* @return HTTPResponse * @return HTTPResponse
* @throws ValidationException
* @throws NotFoundExceptionInterface
*/ */
public function doChangePassword(array $data, $form) public function doChangePassword(array $data, $form)
{ {
@ -272,13 +277,12 @@ class ChangePasswordHandler extends RequestHandler
$member->AutoLoginExpired = DBDatetime::create()->now(); $member->AutoLoginExpired = DBDatetime::create()->now();
$member->write(); $member->write();
if ($member->canLogIn()) { if ($member->canLogin()) {
/** @var IdentityStore $identityStore */ /** @var IdentityStore $identityStore */
$identityStore = Injector::inst()->get(IdentityStore::class); $identityStore = Injector::inst()->get(IdentityStore::class);
$identityStore->logIn($member, false, $this->getRequest()); $identityStore->logIn($member, false, $this->getRequest());
} }
// TODO Add confirmation message to login redirect
$session->clear('AutoLoginHash'); $session->clear('AutoLoginHash');
// Redirect to backurl // Redirect to backurl
@ -290,6 +294,10 @@ class ChangePasswordHandler extends RequestHandler
return $this->redirect($backURL); return $this->redirect($backURL);
} }
$backURL = Security::config()->get('default_reset_password_dest');
if ($backURL) {
return $this->redirect($backURL);
}
// Redirect to default location - the login form saying "You are logged in as..." // Redirect to default location - the login form saying "You are logged in as..."
$url = Security::singleton()->Link('login'); $url = Security::singleton()->Link('login');

8
src/Security/Security.php
View File

@ -1266,6 +1266,14 @@ class Security extends Controller implements TemplateGlobalProvider
*/ */
private static $default_login_dest = ""; private static $default_login_dest = "";
/**
* @config
* @var string Set the default reset password destination
* This is the URL that users will be redirected to after they change their password,
* By default, it's redirecting to {@link $login}.
*/
private static $default_reset_password_dest;
protected static $ignore_disallowed_actions = false; protected static $ignore_disallowed_actions = false;
/** /**