From f29b119d8db6e4479dc8ca662b744ec2a0e0ff6a Mon Sep 17 00:00:00 2001
From: Peter Skopek <pskopek@redhat.com>
Date: Wed, 9 Oct 2024 18:21:51 +0200
Subject: [PATCH] Downloads page has wrong Keycloak Javascript Adapter
 artifacts file names generated

Closes #512

Signed-off-by: Peter Skopek <pskopek@redhat.com>
---
 templates/downloads-211.ftl | 266 ++++++++++++++++++++++++++++++++++++
 templates/downloads-22.ftl  |  12 +-
 templates/downloads-23.ftl  |  12 +-
 templates/downloads-24.ftl  |  12 +-
 versions/21.1.0.json        |   2 +-
 versions/21.1.1.json        |   2 +-
 versions/21.1.2.json        |   2 +-
 7 files changed, 299 insertions(+), 9 deletions(-)
 create mode 100644 templates/downloads-211.ftl

diff --git a/templates/downloads-211.ftl b/templates/downloads-211.ftl
new file mode 100644
index 00000000..32770e42
--- /dev/null
+++ b/templates/downloads-211.ftl
@@ -0,0 +1,266 @@
+<#macro download category label file tar=true zip=true tgz=false>
+<#if zip>
+<span class="me-4">
+<a onclick="dl('${category}', '${label}');" href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.zip" target="_blank">
+    <i class="fa fa-download" aria-hidden="true"></i>
+    ZIP
+</a>
+(<a href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.zip.sha1" target="_blank">sha1</a>)
+</span>
+</#if>
+<#if tar>
+<span>
+<a onclick="dl('${category}', '${label}');" href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.tar.gz" target="_blank">
+    <i class="fa fa-download" aria-hidden="true"></i>
+    TAR.GZ
+</a>
+(<a href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.tar.gz.sha1" target="_blank">sha1</a>)
+</span>
+</#if>
+<#if tgz>
+        <span>
+<a onclick="dl('${category}', '${label}');" href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.tgz" target="_blank">
+    <i class="fa fa-download" aria-hidden="true"></i>
+    TGZ
+</a>
+</span>
+</#if>
+</#macro>
+
+<h2 class="mt-4">Server</h2>
+
+<table class="table table-bordered table-striped">
+    <tbody>
+    <tr>
+        <td>Keycloak</td>
+        <td>Distribution powered by Quarkus</td>
+        <td>
+            <@download category="server" label="standalone" file="keycloak-${version.version}" />
+        </td>
+    </tr>
+    <tr>
+        <td>Container image</td>
+        <td>For Docker, Podman, Kubernetes and OpenShift</td>
+        <td>
+            <a href="https://quay.io/repository/keycloak/keycloak" target="_blank">
+                <i class="fa fa-link"></i>
+                Quay
+            </a>
+        </td>
+    </tr>
+    <tr>
+        <td>Operator</td>
+        <td>For Kubernetes and OpenShift</td>
+        <td>
+            <a href="https://operatorhub.io/operator/keycloak-operator" target="_blank">
+                <i class="fa fa-link"></i>
+                OperatorHub
+            </a>
+        </td>
+    </tr>
+    <tr>
+        <td>Third-party licenses</td>
+        <td>License and source code information for third-party dependencies</td>
+        <td>
+            <a href="https://github.com/keycloak/keycloak/releases/download/${version.version}/third-party-notice-keycloak.html" target="_blank">
+                <i class="fa fa-file"></i>
+                HTML
+            </a>
+        </td>
+    </tr>
+    </tbody>
+</table>
+
+<h2 class="mt-4">Quickstarts</h2>
+<table class="table table-bordered table-striped">
+    <tbody>
+
+    <tr>
+        <td>Quickstarts distribution</td>
+        <td>
+            <span class="me-4">
+            <#if quickstartsTag??>
+                <#assign quickstartsLink="https://github.com/keycloak/keycloak-quickstarts/tree/${version.version}"/>
+            <#else>
+                <#assign quickstartsLink="https://github.com/keycloak/keycloak-quickstarts"/>
+            </#if>
+
+            <a onclick="dl('examples', 'quickstarts');" href="${quickstartsLink}" target="_blank">
+                <i class="fab fa-github" aria-hidden="true"></i>
+                GitHub
+            </a>
+            </span>
+            <span>
+            <a onclick="dl('examples', 'quickstarts');" href="https://github.com/keycloak/keycloak-quickstarts/archive/latest.zip" target="_blank">
+                <i class="fa fa-download" aria-hidden="true"></i>
+                ZIP
+            </a>
+            </span>
+        </td>
+    </tr>
+    </tbody>
+</table>
+
+
+<h2 class="mt-4">Client Adapters</h2>
+
+<div>
+    <ul class="nav nav-tabs my-3" role="tablist">
+        <li role="presentation" class="nav-item"><a class="nav-link active" href="#oidc" aria-controls="oidc" role="tab" data-bs-toggle="tab">OpenID Connect</a></li>
+        <li role="presentation" class="nav-item"><a class="nav-link" href="#saml" aria-controls="saml" role="tab" data-bs-toggle="tab">SAML 2.0</a></li>
+    </ul>
+
+    <div class="tab-content">
+        <div role="tabpanel" class="tab-pane active margin-top" id="oidc">
+            <table class="table table-bordered table-striped">
+                <tr>
+                    <td>WildFly <b>[DEPRECATED]</b></td>
+                    <td>
+                        <table class="kc-table-downloads-inner">
+                            <tr>
+                                <td>&lt;= 23</td>
+                                <td>
+                                    <@download category="adapter" label="wildfly" file="keycloak-oidc-wildfly-adapter-${version.version}" tar=true />
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td>JBoss EAP <b>[DEPRECATED]</b></td>
+                    <td>
+                        <table class="kc-table-downloads-inner">
+                            <tr>
+                                <td>7</td>
+                                <td>
+                                    <@download category="adapter" label="eap7" file="keycloak-oidc-wildfly-adapter-${version.version}" tar=true />
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td>JavaScript</td>
+                    <td>
+                        <table class="kc-table-downloads-inner">
+                            <tr>
+                                <td></td>
+                                <td>
+                                    <span class="me-4">
+                                    <a href="https://www.npmjs.com/package/keycloak-js/v/${version.version}" target="_blank">
+                                        <i class="fa fa-link"></i> NPM
+                                    </a>
+                                    </span>
+                                    <@download category="adapter" label="js" file="keycloak-js-${version.version}" zip=false tar=false tgz=true />
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Node.js <b>[DEPRECATED]</b></td>
+                    <td>
+                        <table class="kc-table-downloads-inner">
+                            <tr>
+                                <td></td>
+                                <td>
+                                    <a href="https://www.npmjs.com/package/keycloak-connect/v/${version.version}" target="_blank">
+                                        <i class="fa fa-link"></i> NPM
+                                    </a>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Jetty <b>[DEPRECATED]</b></td>
+                    <td>
+                        <table class="kc-table-downloads-inner">
+                            <tr>
+                                <td>9.4</td>
+                                <td>
+                                    <@download category="adapter" label="jetty9.4" file="keycloak-oidc-jetty94-adapter-${version.version}" tar=true />
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Tomcat <b>[DEPRECATED]</b></td>
+                    <td>
+                        <table class="kc-table-downloads-inner">
+                            <tr>
+                                <td>8, 9</td>
+                                <td>
+                                    <@download category="adapter" label="tomcat" file="keycloak-oidc-tomcat-adapter-${version.version}" tar=true />
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <div role="tabpanel" class="tab-pane margin-top" id="saml">
+            <table class="table table-bordered table-striped">
+                <tbody>
+                <tr>
+                    <td>WildFly</td>
+                    <td>
+                        <table class="kc-table-downloads-inner">
+                            <tr>
+                                <td>
+                                    &lt;= 23
+                                </td>
+                                <td>
+                                    <@download category="adapter-saml" label="wildfly" file="keycloak-saml-wildfly-adapter-${version.version}" tar=true />
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td>JBoss EAP</td>
+                    <td>
+                        <table class="kc-table-downloads-inner">
+                            <tr>
+                                <td>7</td>
+                                <td>
+                                    <@download category="adapter-saml" label="eap7" file="keycloak-saml-wildfly-adapter-${version.version}" tar=true />
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Jetty <b>[DEPRECATED]</b></td>
+                    <td>
+                        <table class="kc-table-downloads-inner">
+                            <tr>
+                                <td>9.4</td>
+                                <td>
+                                    <@download category="adapter-saml" label="jetty9.4" file="keycloak-saml-jetty94-adapter-${version.version}" tar=true />
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Tomcat <b>[DEPRECATED]</b></td>
+                    <td>
+                        <table class="kc-table-downloads-inner">
+                            <tr>
+                                <td>8, 9</td>
+                                <td>
+                                    <@download category="adapter-saml" label="tomcat" file="keycloak-saml-tomcat-adapter-${version.version}" tar=true />
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
diff --git a/templates/downloads-22.ftl b/templates/downloads-22.ftl
index 21336106..8380e7c5 100644
--- a/templates/downloads-22.ftl
+++ b/templates/downloads-22.ftl
@@ -1,4 +1,4 @@
-<#macro download category label file tar=true zip=true>
+<#macro download category label file tar=true zip=true tgz=false>
 <#if zip>
 <span class="me-4">
 <a onclick="dl('${category}', '${label}');" href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.zip" target="_blank">
@@ -17,6 +17,14 @@
 (<a href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.tar.gz.sha1" target="_blank">sha1</a>)
 </span>
 </#if>
+<#if tgz>
+<span>
+<a onclick="dl('${category}', '${label}');" href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.tgz" target="_blank">
+    <i class="fa fa-download" aria-hidden="true"></i>
+    TGZ
+</a>
+</span>
+</#if>
 </#macro>
 
 <h2 class="mt-4">Server</h2>
@@ -117,7 +125,7 @@
                                         <i class="fa fa-link"></i> NPM
                                     </a>
                                     </span>
-                                    <@download category="adapter" label="js" file="keycloak-oidc-js-adapter-${version.version}" tar=true />
+                                    <@download category="adapter" label="js" file="keycloak-js-${version.version}" zip=false tar=false tgz=true />
                                 </td>
                             </tr>
                         </table>
diff --git a/templates/downloads-23.ftl b/templates/downloads-23.ftl
index ed8601eb..fd9f25a3 100644
--- a/templates/downloads-23.ftl
+++ b/templates/downloads-23.ftl
@@ -1,4 +1,4 @@
-<#macro download category label file tar=true zip=true>
+<#macro download category label file tar=true zip=true tgz=false>
 <#if zip>
 <span class="me-4">
 <a onclick="dl('${category}', '${label}');" href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.zip" target="_blank">
@@ -17,6 +17,14 @@
 (<a href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.tar.gz.sha1" target="_blank">sha1</a>)
 </span>
 </#if>
+<#if tgz>
+<span>
+<a onclick="dl('${category}', '${label}');" href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.tgz" target="_blank">
+    <i class="fa fa-download" aria-hidden="true"></i>
+    TGZ
+</a>
+</span>
+</#if>
 </#macro>
 
 <h2 class="mt-4">Server</h2>
@@ -117,7 +125,7 @@
                                         <i class="fa fa-link"></i> NPM
                                     </a>
                                     </span>
-                                    <@download category="adapter" label="js" file="keycloak-oidc-js-adapter-${version.version}" tar=true />
+                                    <@download category="adapter" label="js" file="keycloak-js-${version.version}" zip=false tar=false tgz=true />
                                 </td>
                             </tr>
                         </table>
diff --git a/templates/downloads-24.ftl b/templates/downloads-24.ftl
index 87cd88bf..9dc71943 100644
--- a/templates/downloads-24.ftl
+++ b/templates/downloads-24.ftl
@@ -1,4 +1,4 @@
-<#macro download category label file tar=true zip=true>
+<#macro download category label file tar=true zip=true tgz=false>
 <#if zip>
 <span class="me-4">
 <a onclick="dl('${category}', '${label}');" href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.zip" target="_blank">
@@ -17,6 +17,14 @@
 (<a href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.tar.gz.sha1" target="_blank">sha1</a>)
 </span>
 </#if>
+<#if tgz>
+<span>
+<a onclick="dl('${category}', '${label}');" href="https://github.com/keycloak/keycloak/releases/download/${version.version}/${file}.tgz" target="_blank">
+    <i class="fa fa-download" aria-hidden="true"></i>
+    TGZ
+</a>
+</span>
+</#if>
 </#macro>
 
 <h2 class="mt-4">Server</h2>
@@ -113,7 +121,7 @@
                                         <i class="fa fa-link"></i> NPM
                                     </a>
                                     </span>
-                                    <@download category="adapter" label="js" file="keycloak-oidc-js-adapter-${version.version}" tar=true />
+                                    <@download category="adapter" label="js" file="keycloak-js-${version.version}" zip=false tar=false tgz=true />
                                 </td>
                             </tr>
                         </table>
diff --git a/versions/21.1.0.json b/versions/21.1.0.json
index cdfbf7f1..60b0dbec 100644
--- a/versions/21.1.0.json
+++ b/versions/21.1.0.json
@@ -3,5 +3,5 @@
   "version": "21.1.0",
   "blogTemplate": 2,  
   "documentationTemplate": 11,
-  "downloadTemplate": 21
+  "downloadTemplate": 211
 }
diff --git a/versions/21.1.1.json b/versions/21.1.1.json
index f8690214..479a4d5a 100644
--- a/versions/21.1.1.json
+++ b/versions/21.1.1.json
@@ -3,5 +3,5 @@
   "version": "21.1.1",
   "blogTemplate": 2,  
   "documentationTemplate": 11,
-  "downloadTemplate": 21
+  "downloadTemplate": 211
 }
diff --git a/versions/21.1.2.json b/versions/21.1.2.json
index 917b223f..53da4061 100644
--- a/versions/21.1.2.json
+++ b/versions/21.1.2.json
@@ -3,5 +3,5 @@
   "version": "21.1.2",
   "blogTemplate": 2,  
   "documentationTemplate": 11,
-  "downloadTemplate": 21
+  "downloadTemplate": 211
 }