jenkins-bot has submitted this change and it was merged.
Change subject: Fix GoogleLogin Login mechanism
......................................................................
Fix GoogleLogin Login mechanism
While changing from GoogleLoginDB to GoogleUser, there was an issue
with the parameters, GoogleLogin::loginGoogleUser() takes and how
to get these. This results in the problem, that no user was recognized
as "connected with a wiki account" and any user got the CreateOrMerge view.
Follow up: I43f3df473a12
Change-Id: I0166f8673b5bd0bbbf515f7427e8caa97cff67c1
---
M includes/specials/SpecialGoogleLogin.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialGoogleLogin.php
b/includes/specials/SpecialGoogleLogin.php
index cf1d99a..c6cddef 100644
--- a/includes/specials/SpecialGoogleLogin.php
+++ b/includes/specials/SpecialGoogleLogin.php
@@ -193,9 +193,9 @@
$user = $this->getUser();
if ( $gluser === null ) {
- $gluser = User::newFromGoogleId( 0 );
+ $gluser = User::newFromGoogleId( $userInfo['id'] );
}
- $googleId = $gluser->getGoogleId();
+ $userId = $gluser->getId();
if (
$this->mGoogleLogin->isValidDomain(
@@ -229,7 +229,7 @@
}
} else {
$loginUser =
$this->mGoogleLogin->loginGoogleUser(
- $googleId,
+ $userId,
$userInfo['id']
);
if ( $loginUser->isOk() ) {
--
To view, visit https://gerrit.wikimedia.org/r/245508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0166f8673b5bd0bbbf515f7427e8caa97cff67c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleLogin
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
