Skip to content

To be able to login even if the auth method is different #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

To be able to login even if the auth method is different #230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@ public function loginpage_hook() {
create_user_record($username, '', 'googleoauth2');
} else {
$username = $user->username;
// To be able to login even if the auth method is different.
$old_authmethod = $user->auth;
$old_password = $user->password;
$DB->set_field('user', 'auth', 'googleoauth2', array('id'=>$user->id));
}

// Authenticate the user.
Expand All @@ -277,6 +281,11 @@ public function loginpage_hook() {
$userid = empty($user) ? 'new user' : $user->id;
oauth_add_to_log(SITEID, 'auth_googleoauth2', '', '', $username . '/' . $useremail . '/' . $userid);
$user = authenticate_user_login($username, null);
// To be able to login even if the auth method is different.
if (isset($old_authmethod)) {
$DB->set_field('user', 'auth', $old_authmethod, array('id'=>$userid));
$DB->set_field('user', 'password', $old_password, array('id'=>$userid));
}
if ($user) {

// Set a cookie to remember what auth provider was selected.
Expand Down