Merge pull request #28 from lfhawasli/August-bootcamp

Fix scores and results url to work in moodle

Author: MartinLenord

src/game_example/api/score.php

@@ -19,7 +19,8 @@
 $score_lineitem = LTI\LTI_Lineitem::new()
  ->set_tag('score')
  ->set_score_maximum(100)
- ->set_label('Score');
+ ->set_label('Score')
+ ->set_resource_id($launch->get_launch_data()['https://purl.imsglobal.org/spec/lti/claim/resource_link']['id']);
 $grades->put_grade($score, $score_lineitem);
 
 
@@ -33,7 +34,8 @@
 $time_lineitem = LTI\LTI_Lineitem::new()
  ->set_tag('time')
  ->set_score_maximum(999)
- ->set_label('Time Taken');
+ ->set_label('Time Taken')
+ ->set_resource_id('time'.$launch->get_launch_data()['https://purl.imsglobal.org/spec/lti/claim/resource_link']['id']);
 $grades->put_grade($time, $time_lineitem);
 echo '{"success" : true}';
 ?>

src/game_example/api/scoreboard.php

@@ -15,13 +15,15 @@
 $score_lineitem = LTI\LTI_Lineitem::new()
  ->set_tag('score')
  ->set_score_maximum(100)
- ->set_label('Score');
+ ->set_label('Score')
+ ->set_resource_id($launch->get_launch_data()['https://purl.imsglobal.org/spec/lti/claim/resource_link']['id']);;
 $scores = $ags->get_grades($score_lineitem);
 
 $time_lineitem = LTI\LTI_Lineitem::new()
  ->set_tag('time')
  ->set_score_maximum(999)
- ->set_label('Time Taken');
+ ->set_label('Time Taken')
+ ->set_resource_id('time'.$launch->get_launch_data()['https://purl.imsglobal.org/spec/lti/claim/resource_link']['id']);
 $times = $ags->get_grades($time_lineitem);
 
 $members = $launch->get_nrps()->get_members();

src/game_example/db/example_database.php

@@ -4,7 +4,7 @@
 use \IMSGlobal\LTI;
 
 $_SESSION['iss'] = [];
-$reg_configs = array_diff(scandir(__DIR__ . '/configs'), array('..', '.'));
+$reg_configs = array_diff(scandir(__DIR__ . '/configs'), array('..', '.', '.DS_Store'));
 foreach ($reg_configs as $key => $reg_config) {
  $_SESSION['iss'] = array_merge($_SESSION['iss'], json_decode(file_get_contents(__DIR__ . "/configs/$reg_config"), true));
 }

src/lti/lti_assignments_grades_service.php

@@ -30,7 +30,9 @@ public function put_grade(LTI_Grade $grade, LTI_Lineitem $lineitem = null) {
  $lineitem = $this->find_or_create_lineitem($lineitem);
  $score_url = $lineitem->get_id();
  }
- $score_url .= '/scores';
+ // Place '/scores' before url params
+ $pos = strpos($score_url, '?');
+ $score_url = substr_replace( $score_url, '/scores', $pos, 0 );
  return $this->service_connector->make_service_request(
  $this->service_data['scope'],
  'POST',
@@ -70,10 +72,13 @@ public function find_or_create_lineitem(LTI_Lineitem $new_line_item) {
 
  public function get_grades(LTI_Lineitem $lineitem) {
  $lineitem = $this->find_or_create_lineitem($lineitem);
+ // Place '/results' before url params
+ $pos = strpos($lineitem->get_id(), '?');
+ $results_url = substr_replace( $lineitem->get_id(), '/results', $pos, 0 );
  $scores = $this->service_connector->make_service_request(
  $this->service_data['scope'],
  'GET',
- $lineitem->get_id() . '/results',
+ $results_url,
  null,
  null,
  'application/vnd.ims.lis.v2.resultcontainer+json'

src/lti/lti_service_connector.php

@@ -31,7 +31,7 @@ public function get_access_token($scopes) {
  $client_id = $this->registration->get_client_id();
  $auth_url = $this->registration->get_auth_token_url();
  $jwt_claim = [
- "iss" => "TODO_CHANGE_ME",
+ "iss" => $client_id,
  "sub" => $client_id,
  "aud" => $auth_url,
  "iat" => time() - 5,