KumiSystems/moodle-auth_jwt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #22 from andrewhancox/master

Browse source 
Prevent error where user is already logged in
This commit is contained in:
Dmitrii Metelkin 2018-01-29 10:11:18 +11:00 committed by GitHub
commit c7e17febb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
auth.php
View file

@ -142,6 +142,16 @@ class auth_plugin_userkey extends auth_plugin_base {
$keyvalue = required_param('key', PARAM_ALPHANUM); $keyvalue = required_param('key', PARAM_ALPHANUM);
$wantsurl = optional_param('wantsurl', '', PARAM_URL); $wantsurl = optional_param('wantsurl', '', PARAM_URL);
if (!empty($wantsurl)) {
$redirecturl = $wantsurl;
} else {
$redirecturl = $CFG->wwwroot;
}
if (isloggedin()) {
$this->redirect($redirecturl);
}
$key = $this->userkeymanager->validate_key($keyvalue); $key = $this->userkeymanager->validate_key($keyvalue);
$this->userkeymanager->delete_keys($key->userid); $this->userkeymanager->delete_keys($key->userid);
@ -151,12 +161,6 @@ class auth_plugin_userkey extends auth_plugin_base {
// Identify this session as using user key auth method. // Identify this session as using user key auth method.
$SESSION->userkey = true; $SESSION->userkey = true;
if (!empty($wantsurl)) {
$redirecturl = $wantsurl;
} else {
$redirecturl = $CFG->wwwroot;
}
$this->redirect($redirecturl); $this->redirect($redirecturl);
} }