refactor(Cluster): refactor auth page not to use templates

fubuloubu · fubuloubu · commit 0563f083032b · 2025-06-16T17:41:48.000-04:00
diff --git a/silverback/cluster/auth.py b/silverback/cluster/auth.py
@@ -13,7 +13,6 @@
 import webbrowser
 from collections.abc import Mapping
 from enum import Enum
-from string import Template
 from typing import Any, Optional, TypedDict, Union
 from urllib.parse import urlencode, urlsplit, urlunsplit
 
@@ -587,14 +586,7 @@ class CallbackHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
 </svg>"""
     """SVG to display error icon"""
 
-    PAGE_TEMPLATE = Template(
-        """
-<html lang="$lang">
-<head>
-  <title>$title</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="charset" content="utf-8">
-  <style>
+    CSS_STYLE = """
     * {
       margin: 0;
       padding: 0;
@@ -678,19 +670,40 @@ class CallbackHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
       -webkit-animation: colored-circle 0.6s ease-in-out 0.7s backwards;
       animation: colored-circle 0.6s ease-in-out 0.7s backwards;
     }
-  </style>
+    """
+
+    # NOTE: Rest of this code borrowed from `fief-python[cli]`
+    # https://github.com/fief-dev/fief-python/blob/main/fief_client/integrations/cli.py
+    def __init__(
+        self,
+        *args,
+        queue: "queue.Queue[str]",
+        **kwargs,
+    ) -> None:
+        self.queue = queue
+        super().__init__(*args, **kwargs)
+
+    def log_message(self, format: str, *args: typing.Any) -> None:
+        pass
+
+    def render_success_page(self, lang="en") -> str:
+        return f"""
+<html lang="{lang}">
+<head>
+  <title>Authentication Success</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta name="charset" content="utf-8">
+  <style>{self.CSS_STYLE}</style>
   </head>
 
   <body>
     <div class="message">
       <div class="animation-ctn">
-        <div class="icon">
-          $svg
-        </div>
+        <div class="icon">{self.SUCCESS_SVG}</div>
       </div>
 
-      <h1>$title</h1>
-      <p>$message</p>
+      <h1>Authentication Successful</h1>
+      <p>Done! You can go back to your terminal! This page will auto-close in 5 secs.</p>
     </div>
   </body>
   <script>
@@ -702,39 +715,32 @@ class CallbackHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
   </script>
 </html>
     """
-    )
-    """Template for callback HTML page"""
 
-    # NOTE: Rest of this code borrowed from `fief-python[cli]`
-    # https://github.com/fief-dev/fief-python/blob/main/fief_client/integrations/cli.py
-    def __init__(
-        self,
-        *args,
-        queue: "queue.Queue[str]",
-        **kwargs,
-    ) -> None:
-        self.queue = queue
-        super().__init__(*args, **kwargs)
-
-    def log_message(self, format: str, *args: typing.Any) -> None:
-        pass
+    def render_error_page(self, query_params: dict[str, typing.Any], lang="en") -> str:
+        return f"""
+<html lang="{lang}">
+<head>
+  <title>Authentication Failed</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta name="charset" content="utf-8">
+  <style>{self.CSS_STYLE}</style>
+  </head>
 
-    def render_success_page(self, lang="en") -> str:
-        return self.PAGE_TEMPLATE.substitute(
-            lang=lang,
-            title="Authentication Successful",
-            message="Done! You can go back to your terminal! This page will auto-close in 5 secs.",
-            svg=self.SUCCESS_SVG,
-        )
+  <body>
+    <div class="message">
+      <div class="animation-ctn">
+        <div class="icon">{self.ERROR_SVG}</div>
+      </div>
 
-    def render_error_page(self, query_params: dict[str, typing.Any], lang="en") -> str:
-        return self.PAGE_TEMPLATE.substitute(
-            lang=lang,
-            title="Authentication Failed",
-            message=f"""Something went wrong trying to authenticate your. Please try again.
-    Error detail: {json.dumps(query_params)}""",
-            svg=self.ERROR_SVG,
-        )
+      <h1>Authentication Failed</h1>
+      <p>
+        Something went wrong trying to authenticate you.
+        Please try again. Error detail: {json.dumps(query_params)}
+      </p>
+    </div>
+  </body>
+</html>
+    """
 
     def do_GET(self):
         parsed_url = urllib.parse.urlparse(self.path)
