Refactor encryption algorithm lists in collector templates.

Consolidated key and content encryption algorithm lists into a single "Encryption Algorithms" column across multiple templates. Simplifies the structure and improves maintainability by combining duplicate logic.
web-token · Feb 9, 2025 · c7ca3e9 · c7ca3e9
1 parent cfd4ca9
commit c7ca3e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 36 deletions.
diff --git a/src/Bundle/Resources/views/data_collector/tab/jwe/builders.html.twig b/src/Bundle/Resources/views/data_collector/tab/jwe/builders.html.twig
@@ -8,8 +8,7 @@
     <thead>
     <tr>
         <th>Service ID</th>
-        <th>Key Encryption Algorithms</th>
-        <th>Content Encryption Algorithms</th>
+        <th>Encryption Algorithms</th>
     </tr>
     </thead>
     <tbody>
@@ -19,16 +18,7 @@
                 <td>{{ id }}</td>
                 <td>
                     <ul>
-                        {% for algorithm in data.key_encryption_algorithms %}
-                            <li class="{% if algorithm in collector.getData().algorithm.messages|keys %}{{ collector.getData().algorithm.messages[algorithm]['severity'] }}{% else %}no-severity{% endif %}">
-                                {{ algorithm }}
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </td>
-                <td>
-                    <ul>
-                        {% for algorithm in data.content_encryption_algorithms %}
+                        {% for algorithm in data.encryption_algorithms %}
                             <li class="{% if algorithm in collector.getData().algorithm.messages|keys %}{{ collector.getData().algorithm.messages[algorithm]['severity'] }}{% else %}no-severity{% endif %}">
                                 {{ algorithm }}
                             </li>

diff --git a/src/Bundle/Resources/views/data_collector/tab/jwe/decrypters.html.twig b/src/Bundle/Resources/views/data_collector/tab/jwe/decrypters.html.twig
@@ -8,8 +8,7 @@
     <thead>
     <tr>
         <th>Service ID</th>
-        <th>Key Encryption Algorithms</th>
-        <th>Content Encryption Algorithms</th>
+        <th>Encryption Algorithms</th>
     </tr>
     </thead>
     <tbody>
@@ -19,16 +18,7 @@
                 <td>{{ id }}</td>
                 <td>
                     <ul>
-                        {% for algorithm in data.key_encryption_algorithms %}
-                            <li class="{% if algorithm in collector.getData().algorithm.messages|keys %}{{ collector.getData().algorithm.messages[algorithm]['severity'] }}{% else %}no-severity{% endif %}">
-                                {{ algorithm }}
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </td>
-                <td>
-                    <ul>
-                        {% for algorithm in data.content_encryption_algorithms %}
+                        {% for algorithm in data.encryption_algorithms %}
                             <li class="{% if algorithm in collector.getData().algorithm.messages|keys %}{{ collector.getData().algorithm.messages[algorithm]['severity'] }}{% else %}no-severity{% endif %}">
                                 {{ algorithm }}
                             </li>

diff --git a/src/Bundle/Resources/views/data_collector/tab/jwe/loaders.html.twig b/src/Bundle/Resources/views/data_collector/tab/jwe/loaders.html.twig
@@ -9,8 +9,7 @@
     <tr>
         <th>Service ID</th>
         <th>Serializers</th>
-        <th>Key Encryption Algorithms</th>
-        <th>Content Encryption Algorithms</th>
+        <th>Encryption Algorithms</th>
         <th>Header Checkers</th>
     </tr>
     </thead>
@@ -28,16 +27,7 @@
                 </td>
                 <td>
                     <ul>
-                        {% for algorithm in data.key_encryption_algorithms %}
-                            <li class="{% if algorithm in collector.getData().algorithm.messages|keys %}{{ collector.getData().algorithm.messages[algorithm]['severity'] }}{% else %}no-severity{% endif %}">
-                                {{ algorithm }}
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </td>
-                <td>
-                    <ul>
-                        {% for algorithm in data.content_encryption_algorithms %}
+                        {% for algorithm in data.encryption_algorithms %}
                             <li class="{% if algorithm in collector.getData().algorithm.messages|keys %}{{ collector.getData().algorithm.messages[algorithm]['severity'] }}{% else %}no-severity{% endif %}">
                                 {{ algorithm }}
                             </li>