Cicalese has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356418 )
Change subject: Added session variables to hold return to page and query.
......................................................................
Added session variables to hold return to page and query.
Change-Id: Id8f35ba67287f15805c430d0ee39b16eff0089f2
---
M PluggableAuthLogin.php
M PluggableAuthPrimaryAuthenticationProvider.php
M extension.json
3 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PluggableAuth
refs/changes/18/356418/1
diff --git a/PluggableAuthLogin.php b/PluggableAuthLogin.php
index a338275..1ab86bb 100644
--- a/PluggableAuthLogin.php
+++ b/PluggableAuthLogin.php
@@ -26,7 +26,9 @@
class PluggableAuthLogin extends UnlistedSpecialPage {
- const RETURNURL_SESSION_KEY = 'PluggableAuthLoginReturnToUrl';
+ const RETURNTOURL_SESSION_KEY = 'PluggableAuthLoginReturnToUrl';
+ const RETURNTOPAGE_SESSION_KEY = 'PluggableAuthLoginReturnToPage';
+ const RETURNTOQUERY_SESSION_KEY = 'PluggableAuthLoginReturnToQuery';
const USERNAME_SESSION_KEY = 'PluggableAuthLoginUsername';
const REALNAME_SESSION_KEY = 'PluggableAuthLoginRealname';
const EMAIL_SESSION_KEY = 'PluggableAuthLoginEmail';
@@ -88,7 +90,7 @@
$error );
}
$returnToUrl = $authManager->getAuthenticationSessionData(
- self::RETURNURL_SESSION_KEY );
+ self::RETURNTOURL_SESSION_KEY );
$this->getOutput()->redirect( $returnToUrl );
}
}
diff --git a/PluggableAuthPrimaryAuthenticationProvider.php
b/PluggableAuthPrimaryAuthenticationProvider.php
index 3cad816..e676204 100644
--- a/PluggableAuthPrimaryAuthenticationProvider.php
+++ b/PluggableAuthPrimaryAuthenticationProvider.php
@@ -39,7 +39,11 @@
}
$url = Title::newFromText( 'Special:PluggableAuthLogin'
)->getFullURL();
$this->manager->setAuthenticationSessionData(
- PluggableAuthLogin::RETURNURL_SESSION_KEY,
$request->returnToUrl );
+ PluggableAuthLogin::RETURNTOURL_SESSION_KEY,
$request->returnToUrl );
+ $this->manager->setAuthenticationSessionData(
+ PluggableAuthLogin::RETURNTOPAGE_SESSION_KEY,
$_GET['returnto']);
+ $this->manager->setAuthenticationSessionData(
+ PluggableAuthLogin::RETURNTOQUERY_SESSION_KEY,
$_GET['returntoquery'] );
return AuthenticationResponse::newRedirect( [
new PluggableAuthContinueAuthenticationRequest()
diff --git a/extension.json b/extension.json
index 851262d..1f4f9e3 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "PluggableAuth",
- "version": "4.0",
+ "version": "4.1",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy
Cicalese]"
],
--
To view, visit https://gerrit.wikimedia.org/r/356418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8f35ba67287f15805c430d0ee39b16eff0089f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: Cicalese <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
