From 0b72caebac8765e2120bb95d9a92086a01abbdd5 Mon Sep 17 00:00:00 2001
From: John Okely <john@moodle.com>
Date: Thu, 15 Sep 2016 16:40:09 +0800
Subject: [PATCH] MDL-53832 enrol_lti: Allow multiple LTI1 consumers with the
 same key

---
 enrol/lti/tool.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/enrol/lti/tool.php b/enrol/lti/tool.php
index cd1f9c743eb..54b1f053348 100644
--- a/enrol/lti/tool.php
+++ b/enrol/lti/tool.php
@@ -68,18 +68,16 @@ if ($ltiversion === \IMSGlobal\LTI\ToolProvider\ToolProvider::LTI_VERSION1) {
     $dataconnector = new \enrol_lti\data_connector();
     $consumer = new \IMSGlobal\LTI\ToolProvider\ToolConsumer($consumerkey, $dataconnector);
     // Check if the consumer has already been registered to the enrol_lti_lti2_consumer table. Register if necessary.
-    if ($consumer->getRecordId() === null) {
-        $consumer->ltiVersion = \IMSGlobal\LTI\ToolProvider\ToolProvider::LTI_VERSION1;
-        // For LTIv1, set the tool secret as the consumer secret.
-        $consumer->secret = $tool->secret;
-        $consumer->name = optional_param('tool_consumer_instance_description', null, PARAM_TEXT);
-        $consumer->consumerName = optional_param('tool_consumer_instance_name', null, PARAM_TEXT);
-        $consumer->consumerGuid = optional_param('tool_consumer_instance_guid', null, PARAM_TEXT);
-        $consumer->consumerVersion = optional_param('tool_consumer_info_version', null, PARAM_TEXT);
-        $consumer->enabled = true;
-        $consumer->protected = true;
-        $consumer->save();
-    }
+    $consumer->ltiVersion = \IMSGlobal\LTI\ToolProvider\ToolProvider::LTI_VERSION1;
+    // For LTIv1, set the tool secret as the consumer secret.
+    $consumer->secret = $tool->secret;
+    $consumer->name = optional_param('tool_consumer_instance_name', null, PARAM_TEXT);
+    $consumer->consumerName = $consumer->name;
+    $consumer->consumerGuid = optional_param('tool_consumer_instance_guid', null, PARAM_TEXT);
+    $consumer->consumerVersion = optional_param('tool_consumer_info_version', null, PARAM_TEXT);
+    $consumer->enabled = true;
+    $consumer->protected = true;
+    $consumer->save();
 }
 
 $toolprovider = new \enrol_lti\tool_provider($toolid);