Merge pull request #147 from oat-sa/develop

Develop
oat-sa · Mar 12, 2022 · 107033b · 107033b
2 parents 73473f6 + 42b06bd
commit 107033b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.7.1
+-----
+
+* `LtiMessage` auto submit script wrapped by `window.onload` callback
+
 6.7.0
 -----
 

diff --git a/src/Message/LtiMessage.php b/src/Message/LtiMessage.php
@@ -105,7 +105,10 @@ public function toHtmlRedirectForm(bool $autoSubmit = true): string
             $formInputs[] = sprintf('<input type="hidden" name="%s" value="%s"/>', $name, $value);
         }
 
-        $autoSubmitScript = sprintf('<script>document.getElementById("%s").submit();</script>', $formId);
+        $autoSubmitScript = sprintf(
+            '<script>window.onload=function(){document.getElementById("%s").submit()}</script>',
+            $formId
+        );
 
         return sprintf(
             '<form id="%s" action="%s" method="POST">%s</form>%s',

diff --git a/tests/Unit/Message/LtiMessageTest.php b/tests/Unit/Message/LtiMessageTest.php
@@ -143,7 +143,7 @@ public function testToHtmlLink(): void
     public function testToHtmlRedirectForm(): void
     {
         $this->assertEquals(
-            '<form id="launch_0e7d4b4c23fd7b077aba0602246820ff" action="http://example.com" method="POST"><input type="hidden" name="parameter" value="value"/></form><script>document.getElementById("launch_0e7d4b4c23fd7b077aba0602246820ff").submit();</script>',
+            '<form id="launch_0e7d4b4c23fd7b077aba0602246820ff" action="http://example.com" method="POST"><input type="hidden" name="parameter" value="value"/></form><script>window.onload=function(){document.getElementById("launch_0e7d4b4c23fd7b077aba0602246820ff").submit()}</script>',
             $this->subject->toHtmlRedirectForm()
         );
     }

diff --git a/tests/Unit/Security/Oidc/Server/OidcAuthenticationRequestHandlerTest.php b/tests/Unit/Security/Oidc/Server/OidcAuthenticationRequestHandlerTest.php
@@ -65,7 +65,7 @@ public function testAuthenticationSuccessResponse(): void
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEquals(
-            '<form id="launch_0e7d4b4c23fd7b077aba0602246820ff" action="http://example.com" method="POST"><input type="hidden" name="parameter" value="value"/></form><script>document.getElementById("launch_0e7d4b4c23fd7b077aba0602246820ff").submit();</script>',
+            '<form id="launch_0e7d4b4c23fd7b077aba0602246820ff" action="http://example.com" method="POST"><input type="hidden" name="parameter" value="value"/></form><script>window.onload=function(){document.getElementById("launch_0e7d4b4c23fd7b077aba0602246820ff").submit()}</script>',
             (string)$response->getBody()
         );
     }