<% if (j = info.jobs) %>
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index 60c8842..700b394 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -1,11 +1,12 @@
<% content_for :title, "Users" %>
Users
<%= link_to "+ New User", new_admin_user_path, class: "btn-primary" %>
- | Name | Email | Aircraft | |
+ | Name | Email | Aircraft | Last sign-in | |
<% @users.each do |u| %>
| <%= u.name %> <% if u.admin? %>Admin<% end %><% if u.sso_uid? %> <%= Sso.label %><% end %> |
<%= u.email_address %> |
<%= u.aircraft_roles.map { "#{_1.aircraft.tail_number} (#{_1.role})" }.join(", ").presence || "—" %> |
+ <%= u.last_signed_in_at ? "#{time_ago_in_words(u.last_signed_in_at)} ago" : "never" %> |
<%= link_to "Edit", edit_admin_user_path(u), class: "btn-secondary btn-sm" %> |
<% end %>
diff --git a/app/views/admin_mailer/test_email.html.erb b/app/views/admin_mailer/test_email.html.erb
new file mode 100644
index 0000000..7730fbd
--- /dev/null
+++ b/app/views/admin_mailer/test_email.html.erb
@@ -0,0 +1,2 @@
+This is a test email from Simple Aircraft Manager, sent by <%= @user.email_address %> from Admin → About.
+Email is working: password resets and sign-in links will arrive.
diff --git a/app/views/admin_mailer/test_email.text.erb b/app/views/admin_mailer/test_email.text.erb
new file mode 100644
index 0000000..989945b
--- /dev/null
+++ b/app/views/admin_mailer/test_email.text.erb
@@ -0,0 +1,3 @@
+This is a test email from Simple Aircraft Manager, sent by <%= @user.email_address %> from Admin → About.
+
+Email is working: password resets and sign-in links will arrive.
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 49c84ae..57d9909 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -15,7 +15,10 @@
<%= form.label :password, class: "label" %>
<%= form.password_field :password, required: true, autocomplete: "current-password", maxlength: 72, class: "input" %>
<%= form.submit "Sign in", class: (Sso.enabled? ? "btn-secondary" : "btn-primary") + " w-full justify-center" %>
- <%= link_to "Forgot password?", new_password_path, class: "link" %>
+
+ <% if MailSettings.configured? %><%= link_to "Email me a sign-in link", new_sign_in_link_path, class: "link" %><% end %>
+ <%= link_to "Forgot password?", new_password_path, class: "link" %>
+
<% end %>
<% end %>
diff --git a/app/views/sessions_mailer/sign_in_link.html.erb b/app/views/sessions_mailer/sign_in_link.html.erb
new file mode 100644
index 0000000..2773638
--- /dev/null
+++ b/app/views/sessions_mailer/sign_in_link.html.erb
@@ -0,0 +1,3 @@
+Here's your link to sign in to Simple Aircraft Manager:
+<%= link_to "Sign in as #{@user.email_address}", sign_in_link_url(@token) %>
+It works once, for the next 15 minutes. If you didn't ask for it, you can ignore this email.
diff --git a/app/views/sessions_mailer/sign_in_link.text.erb b/app/views/sessions_mailer/sign_in_link.text.erb
new file mode 100644
index 0000000..d47284d
--- /dev/null
+++ b/app/views/sessions_mailer/sign_in_link.text.erb
@@ -0,0 +1,5 @@
+Here's your link to sign in to Simple Aircraft Manager as <%= @user.email_address %>:
+
+<%= sign_in_link_url(@token) %>
+
+It works once, for the next 15 minutes. If you didn't ask for it, you can ignore this email.
diff --git a/app/views/sign_in_links/new.html.erb b/app/views/sign_in_links/new.html.erb
new file mode 100644
index 0000000..cf59c95
--- /dev/null
+++ b/app/views/sign_in_links/new.html.erb
@@ -0,0 +1,11 @@
+<% content_for :title, "Email me a sign-in link" %>
+
+
Sign in by email
+ <%= form_with url: sign_in_links_path, class: "card card-body space-y-4" do |form| %>
+
We'll email you a link that signs you in. It works once, for 15 minutes.
+
<%= form.label :email_address, "Email", class: "label" %>
+ <%= form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", value: params[:email_address], class: "input" %>
+ <%= form.submit "Email me a link", class: "btn-primary w-full justify-center" %>
+
<%= link_to "Back to sign in", new_session_path, class: "link" %>
+ <% end %>
+
diff --git a/app/views/sign_in_links/show.html.erb b/app/views/sign_in_links/show.html.erb
new file mode 100644
index 0000000..5e6b81b
--- /dev/null
+++ b/app/views/sign_in_links/show.html.erb
@@ -0,0 +1,9 @@
+<% content_for :title, "Sign in" %>
+
+
Sign in
+
+
Continue as <%= @user.email_address %>?
+ <%= button_to "Sign in", consume_sign_in_link_path(params[:token]), class: "btn-primary w-full justify-center" %>
+
<%= link_to "Not you? Back to sign in", new_session_path, class: "link" %>
+
+
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 500b382..5a1d415 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -63,16 +63,22 @@ Rails.application.configure do
host: ENV.fetch("APP_HOST", "localhost"),
protocol: ENV.fetch("FORCE_SSL", "true") == "true" ? "https" : "http"
}
- # Password-reset emails. Configure SMTP_ADDRESS (and friends) to enable.
+ # Email (password resets, sign-in links). Configure SMTP_ADDRESS (and friends)
+ # to enable; Admin → About has a test button.
if ENV["SMTP_ADDRESS"].present?
+ smtp_port = ENV.fetch("SMTP_PORT", 587).to_i
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = {
address: ENV["SMTP_ADDRESS"],
- port: ENV.fetch("SMTP_PORT", 587).to_i,
- user_name: ENV["SMTP_USERNAME"],
- password: ENV["SMTP_PASSWORD"],
- authentication: :plain,
- enable_starttls_auto: true
+ port: smtp_port,
+ user_name: ENV["SMTP_USERNAME"].presence,
+ password: ENV["SMTP_PASSWORD"].presence,
+ authentication: (:plain if ENV["SMTP_USERNAME"].present?),
+ # Port 465 is TLS from the start; others upgrade with STARTTLS.
+ tls: ENV.fetch("SMTP_TLS") { smtp_port == 465 ? "true" : "false" } == "true",
+ enable_starttls_auto: true,
+ open_timeout: 10,
+ read_timeout: 15
}.compact
end
diff --git a/config/routes.rb b/config/routes.rb
index 9a618d3..34ea28c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,6 +4,9 @@ Rails.application.routes.draw do
post "rails/active_storage/direct_uploads", to: "direct_uploads#create"
resource :session
+ resources :sign_in_links, path: "session/link", param: :token, only: %i[new create show] do
+ post :consume, on: :member
+ end
# Single sign-on: POST /auth/oidc (handled by OmniAuth) comes back here.
match "auth/:provider/callback", to: "sso#callback", via: %i[get post], as: :sso_callback
get "auth/failure", to: "sso#failure"
@@ -85,6 +88,7 @@ Rails.application.routes.draw do
namespace :admin do
get "about", to: "about#show"
+ post "about/test_email", to: "about#test_email", as: :test_email
resources :users, except: :show
resources :component_types, except: :show
resources :airports, except: :show do
diff --git a/db/migrate/20261107170000_add_last_signed_in_at_to_users.rb b/db/migrate/20261107170000_add_last_signed_in_at_to_users.rb
new file mode 100644
index 0000000..249f6ae
--- /dev/null
+++ b/db/migrate/20261107170000_add_last_signed_in_at_to_users.rb
@@ -0,0 +1,5 @@
+class AddLastSignedInAtToUsers < ActiveRecord::Migration[8.1]
+ def change
+ add_column :users, :last_signed_in_at, :datetime
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bfc28a3..c286843 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.1].define(version: 2026_11_07_150000) do
+ActiveRecord::Schema[8.1].define(version: 2026_11_07_170000) do
create_table "active_storage_attachments", force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
@@ -536,6 +536,7 @@ ActiveRecord::Schema[8.1].define(version: 2026_11_07_150000) do
t.string "name"
t.boolean "admin", default: false, null: false
t.string "sso_uid"
+ t.datetime "last_signed_in_at"
t.index ["email_address"], name: "index_users_on_email_address", unique: true
t.index ["sso_uid"], name: "index_users_on_sso_uid", unique: true
end
diff --git a/test/integration/email_sign_in_test.rb b/test/integration/email_sign_in_test.rb
new file mode 100644
index 0000000..32b9757
--- /dev/null
+++ b/test/integration/email_sign_in_test.rb
@@ -0,0 +1,100 @@
+require "test_helper"
+
+class EmailSignInTest < ActionDispatch::IntegrationTest
+ include ActionMailer::TestHelper
+
+ setup { @user = create_user("jane@example.com") }
+
+ def link_from_email
+ perform_enqueued_jobs
+ mail = ActionMailer::Base.deliveries.last
+ assert_equal [ "jane@example.com" ], mail.to
+ mail.text_part.body.to_s[%r{http://example\.com(/session/link/[^\s]+)}, 1]
+ end
+
+ test "request a link, confirm, signed in; the link works once" do
+ get new_session_path
+ assert_select "a[href='#{new_sign_in_link_path}']", text: "Email me a sign-in link"
+
+ post sign_in_links_path, params: { email_address: "Jane@Example.com " }
+ assert_redirected_to new_session_path
+ assert_match "If there's an account for that address", flash[:notice]
+ path = link_from_email
+
+ get path # opening the link (or a mail scanner) doesn't sign in
+ assert_response :success
+ assert_select "button", text: "Sign in"
+ assert_equal 0, @user.sessions.count
+
+ post "#{path}/consume"
+ assert_redirected_to root_path
+ assert_equal 1, @user.sessions.count
+ follow_redirect!
+ assert_response :success
+
+ delete session_path
+ get path
+ assert_redirected_to new_sign_in_link_path
+ assert_match "expired or was already used", flash[:alert]
+ post "#{path}/consume"
+ assert_redirected_to new_sign_in_link_path
+ assert_equal 0, @user.reload.sessions.count
+ end
+
+ test "links expire, unknown addresses look the same, and it's off when password sign-in is" do
+ post sign_in_links_path, params: { email_address: "jane@example.com" }
+ path = link_from_email
+ travel 16.minutes do
+ post "#{path}/consume"
+ assert_redirected_to new_sign_in_link_path
+ end
+
+ ActionMailer::Base.deliveries.clear
+ post sign_in_links_path, params: { email_address: "nobody@example.com" }
+ assert_match "If there's an account for that address", flash[:notice]
+ perform_enqueued_jobs
+ assert_empty ActionMailer::Base.deliveries
+
+ get sign_in_link_path("forged-token")
+ assert_redirected_to new_sign_in_link_path
+
+ saved = %w[OIDC_ISSUER OIDC_CLIENT_ID PASSWORD_LOGIN].to_h { [ _1, ENV[_1] ] }
+ ENV.update("OIDC_ISSUER" => "https://auth.example.com/", "OIDC_CLIENT_ID" => "sam", "PASSWORD_LOGIN" => "false")
+ post sign_in_links_path, params: { email_address: "jane@example.com" }
+ assert_redirected_to new_session_path
+ assert_enqueued_emails 0
+ ensure
+ saved&.each { ENV[_1] = _2 }
+ end
+
+ test "admins can send a test email and see failures" do
+ admin = create_user("admin@example.com", admin: true)
+ sign_in admin
+ get admin_about_path
+ assert_select "form[action='#{admin_test_email_path}'] button", text: "Send test email"
+
+ assert_emails 1 do
+ post admin_test_email_path
+ end
+ assert_redirected_to admin_about_path
+ assert_equal "Test email sent to admin@example.com. If it doesn't arrive, check the spam folder.", flash[:notice]
+ assert_equal "Test email from Simple Aircraft Manager", ActionMailer::Base.deliveries.last.subject
+
+ failing = Class.new do
+ def initialize(*) = nil
+ def deliver!(*) = raise(Net::SMTPAuthenticationError.new(nil, message: "535 bad credentials"))
+ end
+ ActionMailer::Base.add_delivery_method :failing, failing
+ AdminMailer.delivery_method = :failing
+ begin
+ post admin_test_email_path
+ ensure
+ AdminMailer.delivery_method = :test
+ end
+ assert_match "Sending failed: SMTPAuthenticationError", flash[:alert]
+
+ sign_in @user
+ post admin_test_email_path
+ assert_redirected_to root_path
+ end
+end