From 35f8c3f392887002a7cf88933be709d5c616f49f Mon Sep 17 00:00:00 2001
From: ricola <ricola@poivron.org>
Date: Fri, 9 Jan 2026 17:19:18 -0600
Subject: [PATCH] Redirect to previous page after login

Closes #24
---
 vedia.rb                             | 9 +++++++--
 views/login.erb                      | 1 +
 views/votes_show_unauthenticated.erb | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/vedia.rb b/vedia.rb
index e641ded..4b6e308 100644
--- a/vedia.rb
+++ b/vedia.rb
@@ -134,7 +134,11 @@ post '/login' do
     session.clear
     session[:user_id] = user.id
     session[:timezone] = params[:timezone]
-    redirect '/'
+    if params[:r]
+      redirect params[:r]
+    else
+      redirect '/'
+    end
   else
     @error = _("Incorrect email or password.")
     erb :login
@@ -598,10 +602,11 @@ helpers do
   end
 
   def require_login
-    redirect '/login' unless current_user
+    redirect "/login?r=#{request.path}" unless current_user
   end
 
   def require_admin
+    require_login
     redirect '/' unless is_admin
   end
 
diff --git a/views/login.erb b/views/login.erb
index 5af0607..9edb123 100644
--- a/views/login.erb
+++ b/views/login.erb
@@ -14,6 +14,7 @@
     <input type="password" name="password" class="form-control">
   </div>
   <button type="submit" class="btn btn-primary"><%= _("Login") %></button>
+  <input type="hidden" name="r" value="<%= @params[:r] %>">
   <input type="hidden" name="timezone" value="UTC">
 </form>
 <p><a href="/signup"><%= _("Create account") %></a></p>
diff --git a/views/votes_show_unauthenticated.erb b/views/votes_show_unauthenticated.erb
index 2d43efe..e6dab00 100644
--- a/views/votes_show_unauthenticated.erb
+++ b/views/votes_show_unauthenticated.erb
@@ -14,6 +14,7 @@
     <input type="password" name="password" class="form-control">
   </div>
   <button type="submit" class="btn btn-primary"><%= _("Login") %></button>
+  <input type="hidden" name="r" value="votes/<%= @vote.secure_id %>">
   <input type="hidden" name="timezone" value="UTC">
 </form>