mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-76821 enrol_lti: fix bug in repo causing return of legacy lti users

Browse Source 
If the enrolment method is updated from an LTI 1.1/2.0 tool to an LTI
1.3 tool, it may have associated enrol_lti_users records not having
ltideploymentid values. These are legacy users and must not be returned
by the repository, which deals only with LTI 1.3 LTI users.
This commit is contained in:
Jake Dallimore 2023-05-05 14:13:37 +08:00
parent 5d320dd7d1
commit faa3878abb
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
enrol/lti/classes/local/ltiadvantage/repository/user_repository.php
View File

@ -218,7 +218,8 @@ class user_repository {
FROM {{$this->ltiuserstable}} lu
JOIN {user} u
ON (u.id = lu.userid)
WHERE lu.id = :id";
WHERE lu.id = :id
AND lu.ltideploymentid IS NOT NULL";
$record = $DB->get_record_sql($sql, ['id' => $id], MUST_EXIST);
return $this->user_from_record($record);
@ -245,7 +246,8 @@ class user_repository {
JOIN {user} u
ON (u.id = lu.userid)
WHERE lu.userid = :userid
AND lu.toolid = :resourceid";
AND lu.toolid = :resourceid
AND lu.ltideploymentid IS NOT NULL";
$params = ['userid' => $userid, 'resourceid' => $resourceid];
$record = $DB->get_record_sql($sql, $params, MUST_EXIST);
@ -270,6 +272,7 @@ class user_repository {
JOIN {user} u
ON (u.id = lu.userid)
WHERE lu.toolid = :resourceid
AND lu.ltideploymentid IS NOT NULL
ORDER BY lu.lastaccess DESC";
$records = $DB->get_records_sql($sql, ['resourceid' => $resourceid]);

39
enrol/lti/tests/local/ltiadvantage/repository/user_repository_test.php
View File

@ -455,4 +455,43 @@ class user_repository_test extends \advanced_testcase {
$this->assertEquals($saveduser->get_localid(), $saveduser2->get_localid());
$this->assertNotEquals($saveduser->get_id(), $saveduser2->get_id());
}
/**
* Test confirming that any associated legacy lti user records are not returned by the repository.
*
* This test ensures that any enrolment methods (resources) updated in-place from legacy LTI to 1.3 only return LTI 1.3 users.
*
* @covers ::find
* @covers ::find_single_user_by_resource
* @covers ::find_by_resource
*/
public function test_find_filters_legacy_lti_users(): void {
$this->resetAfterTest();
global $DB;
$user = $this->getDataGenerator()->create_user();
$course = $this->getDataGenerator()->create_course();
$resource = $this->getDataGenerator()->create_lti_tool((object)['courseid' => $course->id]);
$ltiuserdata = [
'userid' => $user->id,
'toolid' => $resource->id,
'sourceid' => '1001',
];
$ltiuserid = $DB->insert_record('enrol_lti_users', $ltiuserdata);
$userrepo = new user_repository();
$this->assertNull($userrepo->find($ltiuserid));
$this->assertNull($userrepo->find_single_user_by_resource($user->id, $resource->id));
$this->assertEmpty($userrepo->find_by_resource($resource->id));
// Set deploymentid, indicating the user originated from an LTI 1.3 launch and should now be returned.
$ltiuserdata['id'] = $ltiuserid;
$ltiuserdata['ltideploymentid'] = '234';
$DB->update_record('enrol_lti_users', $ltiuserdata);
$this->assertInstanceOf(user::class, $userrepo->find($ltiuserid));
$this->assertInstanceOf(user::class, $userrepo->find_single_user_by_resource($user->id, $resource->id));
$ltiusers = $userrepo->find_by_resource($resource->id);
$this->assertCount(1, $ltiusers);
$this->assertInstanceOf(user::class, reset($ltiusers));
}
}