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

Merge pull request #3 from CatalystIT-AU/issue#1

Browse source 
Fix #1 when redirecting to server root, not a moodle root
This commit is contained in:
Dmitrii Metelkin 2016-08-27 14:52:14 +10:00 committed by GitHub
commit 5c5b003f5c
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
auth.php
View file

@ -83,12 +83,12 @@ class auth_plugin_userkey extends auth_plugin_base {
/**
* Login user using userkey and return URL to redirect after.
*
* @return mixed|string URL to redirect.
* @return string URL to redirect.
*
* @throws \moodle_exception If something went wrong.
*/
public function user_login_userkey() {
global $DB, $SESSION;
global $DB, $SESSION, $CFG;
$keyvalue = required_param('key', PARAM_ALPHANUM);
$wantsurl = optional_param('wantsurl', '', PARAM_URL);
@ -133,7 +133,7 @@ class auth_plugin_userkey extends auth_plugin_base {
if (!empty($wantsurl)) {
return $wantsurl;
} else {
return '/';
return $CFG->wwwroot;
}
}

5
tests/auth_plugin_test.php
View file

@ -635,7 +635,7 @@ class auth_plugin_userkey_testcase extends advanced_testcase {
* Test that a user loggs in correctly.
*/
public function test_that_user_logged_in() {
global $DB, $USER, $SESSION;
global $DB, $USER, $SESSION, $CFG;
$key = new stdClass();
$key->value = 'UserLogin';
@ -651,8 +651,7 @@ class auth_plugin_userkey_testcase extends advanced_testcase {
// Using @ is the only way to test this. Thanks moodle!
$redirect = @$this->auth->user_login_userkey();
$this->assertEquals('/', $redirect);
$this->assertEquals($CFG->wwwroot, $redirect);
$this->assertEquals($this->user->id, $USER->id);
$this->assertSame(sesskey(), $USER->sesskey);
$this->assertObjectHasAttribute('userkey', $SESSION);