Merge branch 'MDL-57742_master' of git://github.com/markn86/moodle

moodle · May 28, 2018 · 1d6dd43 · 1d6dd43
2 parents 17ed12e + 6d32804
commit 1d6dd43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/lib/ltiprovider/readme_moodle.txt b/lib/ltiprovider/readme_moodle.txt
@@ -5,9 +5,11 @@ Some changes from the upstream version have been made:
 * Define consumer profile member variable for ToolConsumer class
 * Added context type property for Context class
 * Set context type if 'context_type' parameter was submitted through POST
-These changes can be reverted once the following pull requests have been integrated upstream:
+* Do not require tool_consumer_instance_guid
+These changes can be reverted once the following pull requests/issues have been integrated upstream:
 * https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/10/commits/a9a1641f1a593eba4638133245c21d9ad47d8680
 * https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/11/commits/0bae60389bd020a02be5554516b86336e651e237
+* https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/issues/19
 
 It is recommended by upstream to install depdencies via composer - but the composer installation is bundled
 with an autoloader so it's better to do it manually.

diff --git a/lib/ltiprovider/src/ToolProvider/ToolProvider.php b/lib/ltiprovider/src/ToolProvider/ToolProvider.php
@@ -808,11 +808,6 @@ private function authenticate()
                         if (!$this->ok) {
                             $this->reason = 'Request is from an invalid tool consumer.';
                         }
-                    } else {
-                        $this->ok = isset($_POST['tool_consumer_instance_guid']);
-                        if (!$this->ok) {
-                            $this->reason = 'A tool consumer GUID must be included in the launch request.';
-                        }
                     }
                 }
                 if ($this->ok) {