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

Fix issue with keylifetime being string

Browse source
This commit is contained in:
Dmitrii Metelkin 2016-08-18 14:44:21 +10:00
parent 29d61cad41
commit 3e8c4138f0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
classes/core_userkey_manager.php
View file

@ -93,7 +93,7 @@ class core_userkey_manager implements userkey_manager_interface {
$this->iprestriction = getremoteaddr(null); $this->iprestriction = getremoteaddr(null);
} }
if (isset($config->keylifetime) && is_int($config->keylifetime)) { if (isset($config->keylifetime) && (int)$config->keylifetime > 0) {
$this->validuntil = time() + $config->keylifetime; $this->validuntil = time() + $config->keylifetime;
} else { } else {
$this->validuntil = time() + self::DEFAULT_KEY_LIFE_TIME_IN_SECONDS; $this->validuntil = time() + self::DEFAULT_KEY_LIFE_TIME_IN_SECONDS;

2
tests/core_userkey_manager_test.php
View file

@ -258,7 +258,7 @@ class core_userkey_manager_testcase extends advanced_testcase {
$expectedscript = 'auth/userkey'; $expectedscript = 'auth/userkey';
$expectedinstance = $this->user->id; $expectedinstance = $this->user->id;
$expectediprestriction = null; $expectediprestriction = null;
$expectedvaliduntil = time() + 60; $expectedvaliduntil = time() + 3000;
$this->assertEquals($expectedvalue, $actualkey->value); $this->assertEquals($expectedvalue, $actualkey->value);
$this->assertEquals($expecteduserid, $actualkey->userid); $this->assertEquals($expecteduserid, $actualkey->userid);