Merge pull request #3002 from andrewbaldwin44/task/auth-info

locustio · Nov 29, 2024 · 9ff6e9e · 9ff6e9e
2 parents de9af6a + 42ba4b0
commit 9ff6e9e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/locust/web.py b/locust/web.py
@@ -550,8 +550,7 @@ def login():
             self.auth_args["info"] = session.get("auth_info", None)
 
             return render_template_from(
-                "auth.html",
-                auth_args=self.auth_args,
+                "auth.html", auth_args=self.auth_args, auth_title=self.auth_args.get("title", "Locust")
             )
 
         @app_blueprint.route("/user", methods=["POST"])

diff --git a/locust/webui/auth.html b/locust/webui/auth.html
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
 
-    <title>Locust</title>
+    <title>{{ auth_title | default("Locust") }}</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/locust/webui/src/pages/Auth.tsx b/locust/webui/src/pages/Auth.tsx
@@ -73,6 +73,9 @@ export default function Auth({
             </Box>
           </form>
         )}
+        {info && !customForm && !usernamePasswordCallback && (
+          <Alert severity='info'>{<Markdown content={info} />}</Alert>
+        )}
         {authProviders && (
           <Box sx={{ display: 'flex', flexDirection: 'column', rowGap: 1 }}>
             {authProviders.map(({ label, callbackUrl, iconUrl }, index) => (