Merge pull request #25 from sorah/fancy-oauth-response

oauth_code: fancy callback page
sorah · Feb 5, 2025 · 96c4f8b · 96c4f8b
2 parents 6b26e99 + 5070c48
commit 96c4f8b
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 0.7.0
 
+- redirect_uri endpoint returns fancier HTML page during OAuth 2.0 Authorization Code flow.
 - New subcomand `mairu list-roles` lists possible `role` parameter for a server. Corresponding HTTP API is added to the spec.
 - `mairu` command now suggets user to restart agent when a connected agent reports different version.
 

diff --git a/src/oauth_code.rs b/src/oauth_code.rs
@@ -186,6 +186,8 @@ struct CallbackQuery {
 /// HTML <head> to supress favicon.ico request
 const HTML_PREAMBLE: &str = r#"<!DOCTYPE html><html><head><link rel="icon" href="data:;base64,iVBORw0KGgo="><style>body { font-family: monospace; }</style></head><body>"#;
 
+const HTML_OK: &str = include_str!("oauth_code_ok.html");
+
 #[allow(clippy::type_complexity)]
 #[tracing::instrument(skip_all)]
 async fn callback(
@@ -233,6 +235,6 @@ async fn callback(
     Ok((
         axum::http::StatusCode::OK,
         [("content-type", "text/html; charset=utf-8")],
-        format!("{}ok", HTML_PREAMBLE),
+        HTML_OK.to_string(),
     ))
 }
diff --git a/src/oauth_code_ok.html b/src/oauth_code_ok.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <!--  HTML <head> to supress favicon.ico request -->
+    <link rel="icon" href="data:;base64,iVBORw0KGgo=">
+    <style>
+      body, p {
+        font-family: sans-serif;
+      }
+      body {
+        text-align: center;
+      }
+      main {
+        width: 450px;
+        text-align: center;
+        margin-left: auto;
+        margin-right: auto;
+      }
+      main header {
+        font-size: 90px;
+      }
+      main section p {
+        font-size: 16px;
+      }
+      main footer p {
+        color: #767676;
+        font-size: 12px;
+      }
+    </style>
+  </head>
+  <body>
+    <main>
+      <header>
+        ✅
+      </header>
+      <section>
+        <p>Logged in. You can now close this page.</p>
+      </section>
+      <footer>
+        <p>Powered by <a href="https://github.com/sorah/mairu">Mairu</a></p>
+      </footer>
+    </main>
+  </body>
+</html>