From 9851ff62c4233563db04811c1dfa139e55a5ffa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20B=C3=B6ker?= <patrick.boeker@posteo.de>
Date: Tue, 7 Nov 2023 22:53:27 +0100
Subject: [PATCH] Make logout go to the origin page

---
 lib/Routes.rakumod               | 12 ++++++++----
 resources/templates/login.crotmp |  5 +++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/Routes.rakumod b/lib/Routes.rakumod
index 61b539c..d407cc7 100644
--- a/lib/Routes.rakumod
+++ b/lib/Routes.rakumod
@@ -57,13 +57,17 @@ sub routes(CITestSetManager $tsm, SourceArchiveCreator $sac, GitHubInterface $gi
         }
 
         sub gen-login-data($origin) {
-            my $url-data = $github-interface.oauth-step-one-url(encode-percents($origin));
-            return $url-data;
+            return {
+                login-url => $github-interface.oauth-step-one-url(encode-percents($origin)),
+                :$origin,
+            }
         }
 
         post -> "logout" {
-            set-cookie $jwt-gh-cookie-name, "", Max-Age => 0;
-            redirect :see-other, "/";
+            request-body -> (:$origin!) {
+                set-cookie $jwt-gh-cookie-name, "", Max-Age => 0;
+                redirect :see-other, $origin;
+            }
         }
 
         get -> "gh-oauth-callback", :$code, :$state {
diff --git a/resources/templates/login.crotmp b/resources/templates/login.crotmp
index d22d661..a8e4bbc 100644
--- a/resources/templates/login.crotmp
+++ b/resources/templates/login.crotmp
@@ -3,12 +3,13 @@
 <?$logged-in>
   <span class="username"><$name></span>
   <form action="<$logout-url>" method="post">
+    <input type="hidden" name="origin" value="<$login-data.origin>">
     <input type="submit" value="Logout">
   </form>
 </?>
 <!>
-  <form action="<$login-data.url>" method="get">
-    <@$login-data.query-params>
+  <form action="<$login-data.login-url.url>" method="get">
+    <@$login-data.login-url.query-params>
     <input type="hidden" name="<.key>" value="<.value>">
     </@>
     <input type="submit" value="Login">