Devdocs 9667 (#98)

* Bump twig/twig from 3.3.8 to 3.4.3 in /Quick_ACG

Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.3.8 to 3.4.3.
- [Release notes](https://github.com/twigphp/Twig/releases)
- [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG)
- [Commits](twigphp/Twig@v3.3.8...v3.4.3)

---
updated-dependencies:
- dependency-name: twig/twig
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump twig/twig from 3.3.8 to 3.4.3

Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.3.8 to 3.4.3.
- [Release notes](https://github.com/twigphp/Twig/releases)
- [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG)
- [Commits](twigphp/Twig@v3.3.8...v3.4.3)

---
updated-dependencies:
- dependency-name: twig/twig
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* README.md updates

* check in

* more changes to test

* updated redirect method, now WAD

* variable renaming and changing the string shown

* add in a line break

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Inbar Gazit <[email protected]>

Author: 3 people

composer.json

@@ -23,7 +23,7 @@
         "docusign/admin-client": "^1.1.0",
         "docusign/click-client": "^1.2.2",
         "docusign/esign-client": "^6.13.0-rc",
-        "docusign/rooms-client": "^2.0.0",
+        "docusign/rooms-client": "^2.1.0-rc",
         "docusign/monitor-client": "^1.1.0",
         "twig/twig": "^3.4.3",
         "league/oauth2-client": "^2.6.1",

composer.lock

@@ -40,7 +40,8 @@ function createController(): void
         $this->checkDsToken();
         $room_id = $this->args['room_id'];
         $form_id = $this->args['form_id'];
-
+        $this->args['x_frame_allowed_url'] = "http://localhost:8080";
+        
         if ($room_id && !$form_id) {
             $room = CreateExternalFormFillSessionService::getRoom(
                 $room_id,
@@ -88,10 +89,14 @@ function ($f) {
             );
 
             if ($createExternalFormResponse) {
-                $createExternalFormResponse = json_decode((string)$createExternalFormResponse, true);
+                $createExternalFormJSON = json_decode((string)$createExternalFormResponse, true);
+
                 $this->clientService->showDoneTemplateFromManifest(
                     $this->codeExampleText,
-                    json_encode(json_encode($createExternalFormResponse))
+                    "",
+                    "Results from the Forms::CreateExternalFormFillSession: <br/><code>".stripslashes($createExternalFormResponse)."</code>",
+                    $createExternalFormJSON['url'],
+                    
                 );
             }
         }

src/Controllers/Examples/Rooms/EG006CreateExternalFormFillSession.php

@@ -86,8 +86,10 @@ public function needToReAuth($eg): void
      * @param $message string
      * @return void
      */
-    public function showDoneTemplateFromManifest(array $codeExampleText, $results = null, string $message = null): void
+    public function showDoneTemplateFromManifest(array $codeExampleText, $results = null, string $message = null, $url = null): void
     {
+
+
         if ($message == null) {
             $message = $codeExampleText["ResultsPageText"];
         }
@@ -96,6 +98,7 @@ public function showDoneTemplateFromManifest(array $codeExampleText, $results =
             'title' => $codeExampleText["ExampleName"],
             'h1' => $codeExampleText["ExampleName"],
             'message' => $message,
+            'url' => $url,
             'json' => $results,
             'common_texts' => ManifestService::getCommonTexts()
         ]);

src/Services/RoomsApiClientService.php

@@ -182,6 +182,11 @@ class RouterService implements IRouterService
      */
     public function __construct()
     {
+        if(!isset($_SESSION['api_type'])){
+            // first time loading server and session is null causes problems for manifestService 
+            $_SESSION['api_type'] = "eSign";
+        }
+        
         // To ignore the Notice instead of Isset on missing POST vars
         error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING & ~E_DEPRECATED);
 

src/Services/RouterService.php

@@ -1,5 +1,6 @@
 {% extends "base.html" %} {% block content %}
 
+
 <h2>{{ h1 }}</h2>
 <p>{{ message | raw }}</p>
 
@@ -9,10 +10,16 @@ <h2>{{ h1 }}</h2>
 <p>
 <pre class="json-display"><code id="json-display"></code></pre>
 </p>
+
 {% endif %}
 
 
 
+{% if url %}
+<iframe width="1000" height="800" src="{{ url }}"></iframe> 
+
+{% endif %}
+
 
 {% if import_id == "refreshPage" %}
 

templates/example_done.html

@@ -43,10 +43,6 @@ <h4>{{ code_example_text['ExampleName'] | raw }}</h4>
 
     {% if rooms %}
         <form class="eg" action="" method="post" data-busy="form">
-                <p> 
-                    {{ code_example_text['Forms'][form2Number]['FormName'] | raw }}
-                </p>
-
                 <div class="form-group">
                     <label for="room_id">
                         {{ code_example_text['Forms'][form2Number]['Inputs'][documentsInputNumber]['InputName'] | raw }}
@@ -63,13 +59,10 @@ <h4>{{ code_example_text['ExampleName'] | raw }}</h4>
          </form>
     {% elseif room_name and forms %}
         <form class="eg" action="" method="post" data-busy="form">
-            <p> 
-                {{ code_example_text['Forms'][formNumber]['FormName'] | raw }}
-            </p>
+        
+            <label for="room_name">{{ code_example_text['Forms'][formNumber]['FormName'] | raw }}</label>
 
-            <label for="room_name">
-                Room name
-            </label>
+      
             <input type="text" 
                 class="form-control" 
                 id="room_name"