mirror of
https://github.com/rickbarrette/simple-aircraft-manager-rails.git
synced 2026-11-17 23:50:36 -05:00
Owners can invite mechanics again; who adds aircraft is an admin setting
- Admin → Settings → Who can add aircraft: administrators only (the default) or everyone. Adding an aircraft or importing a .sam.zip makes you its Owner, so this decides who can become one. - A signing invitation from an Owner of the aircraft (or an administrator) lets the outside mechanic create an account for the invited address again, with a password or by signing in with SSO; checked when it's used. Others' signing invitations still need an existing account, and say so. - Docs: who makes accounts, the new setting. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
19bc3efa19
commit
9a20c91f5e
30 files changed
+219
-40
No files matched your search
@@ -2,18 +2,18 @@ class Admin::SettingsController < ApplicationController
|
||||
before_action :require_admin!
|
||||
|
||||
def edit
|
||||
@values = %w[max_upload_mb backups_kept offsite_backups_kept documents_claude_text].index_with { Setting.integer(_1) }
|
||||
@values = %w[max_upload_mb backups_kept offsite_backups_kept documents_claude_text anyone_adds_aircraft].index_with { Setting.integer(_1) }
|
||||
end
|
||||
|
||||
def update
|
||||
submitted = params.fetch(:settings, {}).permit(:max_upload_mb, :backups_kept, :offsite_backups_kept, :documents_claude_text).to_h
|
||||
submitted = params.fetch(:settings, {}).permit(:max_upload_mb, :backups_kept, :offsite_backups_kept, :documents_claude_text, :anyone_adds_aircraft).to_h
|
||||
records = Setting.update_integers(submitted)
|
||||
@errors = records.flat_map { _1.errors.full_messages }
|
||||
if @errors.empty?
|
||||
Rails.logger.info("[settings] #{current_user.email_address} changed #{submitted.inspect}")
|
||||
redirect_to edit_admin_settings_path, notice: t("flash.admin_settings.settings_saved")
|
||||
else
|
||||
@values = %w[max_upload_mb backups_kept offsite_backups_kept documents_claude_text].index_with { Setting.integer(_1) }.merge(submitted)
|
||||
@values = %w[max_upload_mb backups_kept offsite_backups_kept documents_claude_text anyone_adds_aircraft].index_with { Setting.integer(_1) }.merge(submitted)
|
||||
render :edit, status: :unprocessable_entity
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
class AircraftController < ApplicationController
|
||||
include AircraftScoped
|
||||
skip_before_action :set_aircraft, :authorize_permission!, only: %i[index new create]
|
||||
before_action :require_aircraft_adder!, only: %i[new create]
|
||||
requires_permission :edit_aircraft, only: %i[edit update]
|
||||
requires_permission :delete_aircraft, only: :destroy
|
||||
requires_permission :update_hours, only: :update_hours
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
# create an aircraft with all its records. The archive is checked right away;
|
||||
# the import itself runs in the background (AircraftImportJob).
|
||||
class AircraftImportsController < ApplicationController
|
||||
before_action :require_aircraft_adder!, only: %i[new create]
|
||||
before_action :set_import, only: :show
|
||||
|
||||
def new; end
|
||||
|
||||
@@ -44,6 +44,11 @@ class ApplicationController < ActionController::Base
|
||||
redirect_to new_setup_path if !User.exists? && !is_a?(SetupController)
|
||||
end
|
||||
|
||||
# Adding or importing an aircraft (User#can_add_aircraft?).
|
||||
def require_aircraft_adder!
|
||||
redirect_to root_path, alert: t("flash.aircraft.ask_an_administrator") unless current_user.can_add_aircraft?
|
||||
end
|
||||
|
||||
def require_admin!
|
||||
redirect_to root_path, alert: t("flash.application.admins_only") unless current_user&.admin?
|
||||
end
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
# The invited signer's side: sign in with their account for the invited
|
||||
# address, add a certificate if needed, review the entry and sign it. The
|
||||
# invitation gives access to that one entry only. It doesn't make accounts:
|
||||
# only an administrator (or an administrator's invitation) does.
|
||||
# The invited signer's side: sign in (or, from an Owner's invitation, create an
|
||||
# account for the invited address: SigningInvitation#creates_account?), add a
|
||||
# certificate if needed, review the entry and sign it. The invitation gives
|
||||
# access to that one entry only.
|
||||
class InvitedSigningsController < ApplicationController
|
||||
include EntrySigning
|
||||
allow_unauthenticated_access only: :show
|
||||
allow_unauthenticated_access only: %i[show account]
|
||||
before_action :set_invitation
|
||||
rate_limit to: 10, within: 15.minutes, only: :account, with: -> { redirect_to new_session_path, alert: t("flash.invited_signings.try_again_later") }
|
||||
|
||||
def show
|
||||
@entry = @invitation.logbook_entry
|
||||
@aircraft = @entry.aircraft
|
||||
unless authenticated?
|
||||
session[:return_to_after_authenticating] = request.url
|
||||
session[:signing_token] = params[:token] # for an account made by signing in with SSO
|
||||
return render(:welcome)
|
||||
end
|
||||
return render(:wrong_account) unless current_user.email_address == @invitation.email
|
||||
@@ -20,6 +22,24 @@ class InvitedSigningsController < ApplicationController
|
||||
render :new
|
||||
end
|
||||
|
||||
# Creating an account for the invited email address (an Owner's invitation).
|
||||
def account
|
||||
return redirect_to(invited_signing_path(params[:token])) if authenticated?
|
||||
if User.exists?(email_address: @invitation.email) || !Sso.password_login? || !@invitation.creates_account?
|
||||
return redirect_to invited_signing_path(params[:token]), alert: t("flash.invited_signings.sign_in_to_continue")
|
||||
end
|
||||
user = User.new(params.permit(:name, :password, :password_confirmation).merge(email_address: @invitation.email))
|
||||
if user.save
|
||||
reset_session
|
||||
start_new_session_for user
|
||||
redirect_to invited_signing_path(params[:token]), notice: t("flash.invited_signings.account_created_add_your")
|
||||
else
|
||||
@entry = @invitation.logbook_entry
|
||||
@account_errors = user.errors.full_messages
|
||||
render :welcome, status: :unprocessable_entity
|
||||
end
|
||||
end
|
||||
|
||||
def create
|
||||
@entry = @invitation.logbook_entry
|
||||
@aircraft = @entry.aircraft
|
||||
|
||||
@@ -23,7 +23,7 @@ class SigningInvitationsController < ApplicationController
|
||||
end
|
||||
log_event("logbook", t("flash.signing_invitations.signature_requested_from_entry", email: @invitation.email, date: l(@entry.date, format: :app)))
|
||||
notice = t("flash.signing_invitations.invitation_sent_to_the", email: @invitation.email, days: SigningInvitation::VALID_FOR.in_days.to_i)
|
||||
notice = "#{notice} #{t('flash.signing_invitations.no_account_yet')}" unless invitee
|
||||
notice = "#{notice} #{t('flash.signing_invitations.no_account_yet')}" unless invitee || @invitation.creates_account?
|
||||
redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: notice
|
||||
else
|
||||
render :new, status: :unprocessable_entity
|
||||
|
||||
@@ -7,9 +7,10 @@
|
||||
# users edit their email. Otherwise, sign in with a password once and link
|
||||
# from the profile page.
|
||||
#
|
||||
# Someone without an account gets one only from an administrator's
|
||||
# invitation they opened first (AccessInvitation, accepted at once), or for
|
||||
# anyone the provider lets in when OIDC_AUTO_CREATE_USERS is on.
|
||||
# Someone without an account gets one only from an invitation they opened
|
||||
# first that can make one (an administrator's AccessInvitation, accepted at
|
||||
# once; an Owner's SigningInvitation, for its address), or for anyone the
|
||||
# provider lets in when OIDC_AUTO_CREATE_USERS is on.
|
||||
class SsoController < ApplicationController
|
||||
allow_unauthenticated_access only: %i[callback failure]
|
||||
before_action :require_sso
|
||||
@@ -89,7 +90,7 @@ class SsoController < ApplicationController
|
||||
email = auth.info&.email.to_s.strip.downcase
|
||||
return if email.blank? || User.exists?(email_address: email)
|
||||
invitation = invitation_making_account(email)
|
||||
return unless invitation || Sso.auto_create_users?
|
||||
return unless invitation || signing_invitation_making_account?(email) || Sso.auto_create_users?
|
||||
User.transaction do
|
||||
# The random password is never shown; a password reset can set a real one.
|
||||
user = User.create!(email_address: email, name: auth.info&.name.presence, sso_uid: auth.uid, password: SecureRandom.base58(40))
|
||||
@@ -100,6 +101,13 @@ class SsoController < ApplicationController
|
||||
nil
|
||||
end
|
||||
|
||||
# A signing invitation opened in this browser before signing in, from an
|
||||
# Owner, for this email address.
|
||||
def signing_invitation_making_account?(email)
|
||||
invitation = SigningInvitation.find_usable(session[:signing_token])
|
||||
invitation.present? && invitation.creates_account? && invitation.email == email
|
||||
end
|
||||
|
||||
# The invitation opened in this browser before signing in, when it can
|
||||
# make an account (an administrator's) for this email address.
|
||||
def invitation_making_account(email)
|
||||
|
||||
@@ -10,6 +10,9 @@ class Setting < ApplicationRecord
|
||||
"backups_kept" => { default: 14, in: 1..365 },
|
||||
"offsite_backups_kept" => { default: 30, in: 1..365 },
|
||||
"documents_claude_text" => { default: 0, in: 0..1 },
|
||||
# Who can add aircraft (and so become an Owner, who invites people): 0
|
||||
# administrators only, 1 everyone.
|
||||
"anyone_adds_aircraft" => { default: 0, in: 0..1 },
|
||||
"logbook_templates_seeded" => { default: 0, in: 0..1 } # internal flag
|
||||
}.freeze
|
||||
LABELS = LabelSet.new("setting.keys", INTEGERS.keys)
|
||||
@@ -20,6 +23,7 @@ class Setting < ApplicationRecord
|
||||
class << self
|
||||
def max_upload_mb = integer("max_upload_mb")
|
||||
def max_upload_bytes = max_upload_mb.megabytes
|
||||
def anyone_adds_aircraft? = integer("anyone_adds_aircraft") == 1
|
||||
|
||||
def integer(key)
|
||||
definition = INTEGERS.fetch(key)
|
||||
|
||||
@@ -22,4 +22,12 @@ class SigningInvitation < ApplicationRecord
|
||||
def self.find_usable(token) = where(token_digest: digest(token), used_at: nil).where("expires_at > ?", Time.current).first
|
||||
|
||||
def aircraft = logbook_entry.aircraft
|
||||
|
||||
# Whether the mechanic can make an account for the invited address with it:
|
||||
# when it's from an Owner of the aircraft or an administrator (still, when
|
||||
# it's used). Who can become an Owner is up to the administrator (Admin →
|
||||
# Settings, who can add aircraft); others' invitations need an account.
|
||||
def creates_account?
|
||||
invited_by.present? && !invited_by.disabled? && (invited_by.admin? || invited_by.role_for(aircraft)&.owner?) || false
|
||||
end
|
||||
end
|
||||
@@ -121,6 +121,10 @@ class User < ApplicationRecord
|
||||
aircraft_roles.includes(:role).find_by(aircraft: aircraft)&.role
|
||||
end
|
||||
|
||||
# Adding an aircraft (or importing one) makes you its Owner: administrators,
|
||||
# or everyone when Admin → Settings allows it.
|
||||
def can_add_aircraft? = admin? || Setting.anyone_adds_aircraft?
|
||||
|
||||
# Administrators can do everything on every aircraft.
|
||||
def can?(permission, aircraft)
|
||||
admin? || role_for(aircraft)&.can?(permission) || false
|
||||
|
||||
@@ -38,6 +38,14 @@
|
||||
<p class="hint"><%= t(".with_off_site_backup_to") %></p>
|
||||
</div>
|
||||
|
||||
<h2 class="card-title pt-2"><%= t(".aircraft") %></h2>
|
||||
<div>
|
||||
<%= label_tag "settings[anyone_adds_aircraft]", t(".who_can_add_aircraft"), class: "label" %>
|
||||
<%= select_tag "settings[anyone_adds_aircraft]", options_for_select([ [ t(".administrators_only"), 0 ], [ t(".everyone"), 1 ] ], @values["anyone_adds_aircraft"].to_i),
|
||||
id: "settings_anyone_adds_aircraft", class: "input" %>
|
||||
<p class="hint"><%= t(".who_can_add_aircraft_hint") %></p>
|
||||
</div>
|
||||
|
||||
<h2 class="card-title pt-2"><%= t(".document_search") %></h2>
|
||||
<div>
|
||||
<%= label_tag "settings[documents_claude_text]", t(".read_scanned_documents_with"), class: "label" %>
|
||||
|
||||
@@ -1,16 +1,22 @@
|
||||
<% content_for :title, t(".fleet") %>
|
||||
<div class="mb-5 flex items-center justify-between">
|
||||
<h1 class="text-2xl font-bold tracking-tight"><%= t(".fleet") %></h1>
|
||||
<% if current_user.can_add_aircraft? %>
|
||||
<div class="flex gap-2">
|
||||
<%= more_menu do %><%= link_to t(".import_from_a_sam_zip"), new_aircraft_import_path, class: "menu-item" %><% end %>
|
||||
<%= link_to t(".add_aircraft"), new_aircraft_path, class: "btn-primary" %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<% if @aircraft_list.empty? %>
|
||||
<div class="card card-body text-center">
|
||||
<p class="text-slate-600"><%= t(".no_aircraft_yet") %></p>
|
||||
<p class="mt-3"><%= link_to t(".add_your_first_aircraft"), new_aircraft_path, class: "btn-primary" %></p>
|
||||
<% if current_user.can_add_aircraft? %>
|
||||
<p class="mt-3"><%= link_to t(".add_your_first_aircraft"), new_aircraft_path, class: "btn-primary" %></p>
|
||||
<% else %>
|
||||
<p class="mt-2 text-sm text-slate-500"><%= t(".ask_an_administrator") %></p>
|
||||
<% end %>
|
||||
</div>
|
||||
<% else %>
|
||||
<div class="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
|
||||
|
||||
@@ -5,7 +5,23 @@
|
||||
<div class="card card-body space-y-3">
|
||||
<%= link_to t(".i_have_an_account_sign"), new_session_path, class: "btn-primary w-full justify-center" %>
|
||||
</div>
|
||||
<% unless User.exists?(email_address: @invitation.email) %>
|
||||
<% if User.exists?(email_address: @invitation.email) %>
|
||||
<% elsif !@invitation.creates_account? %>
|
||||
<p class="text-sm text-slate-600"><%= t(".no_account_yet", email: @invitation.email) %></p>
|
||||
<% else %>
|
||||
<% if Sso.enabled? %>
|
||||
<%= button_to t(".continue_with", provider: Sso.label), "/auth/#{Sso::PROVIDER}", class: "btn-secondary w-full justify-center", data: { turbo: false } %>
|
||||
<% end %>
|
||||
<% if Sso.password_login? %>
|
||||
<%= form_with url: account_invited_signing_path(params[:token]), class: "card card-body space-y-3" do %>
|
||||
<h2 class="card-title"><%= t(".or_create_an_account") %></h2>
|
||||
<% if @account_errors.present? %><div class="rounded-md bg-red-50 p-2 text-sm text-red-700" role="alert"><%= @account_errors.to_sentence %></div><% end %>
|
||||
<div><label class="label" for="invited_email"><%= t(".email") %></label><input id="invited_email" class="input" value="<%= @invitation.email %>" disabled></div>
|
||||
<div><%= label_tag :name, t(".your_name"), class: "label" %><%= text_field_tag :name, params[:name], class: "input", required: true, autocomplete: "name" %></div>
|
||||
<div><%= label_tag :password, t(".password"), class: "label" %><%= password_field_tag :password, nil, class: "input", required: true, autocomplete: "new-password", minlength: User::PASSWORD_MIN, maxlength: 72 %><p class="hint"><%= t(".at_least_characters_not_one_html", min: User::PASSWORD_MIN) %></p></div>
|
||||
<div><%= label_tag :password_confirmation, t(".confirm_password"), class: "label" %><%= password_field_tag :password_confirmation, nil, class: "input", required: true, autocomplete: "new-password" %></div>
|
||||
<%= submit_tag t(".create_account"), class: "btn-secondary" %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
@@ -1,4 +1,4 @@
|
||||
<p><%= t(".asks_you_to_sign_a_html", owner: (@invitation.invited_by&.display_name || t(".the_owner")), tail_number: @entry.aircraft.tail_number, date: (fmt_date(@entry.date)), log_type: (LogbookEntry::LOG_TYPES[@entry.log_type])) %></p>
|
||||
<% if @invitation.message.present? %><p><em>“<%= @invitation.message %>”</em></p><% end %>
|
||||
<p><%= t(".the_link_works_once_until_html", link: (link_to t(".review_and_sign_the_entry"), @url), to_date: (fmt_date(@invitation.expires_at.to_date))) %></p>
|
||||
<p style="color:#64748b;font-size:12px"><%= t(".you_ll_sign_in_or_html", email: @invitation.email) %></p>
|
||||
<p style="color:#64748b;font-size:12px"><%= t(@invitation.creates_account? ? ".sign_in_or_create_html" : ".you_ll_sign_in_or_html", email: @invitation.email) %></p>
|
||||
@@ -7,4 +7,4 @@
|
||||
<%= raw t(".review_and_sign_it_here_text", to_date: (fmt_date(@invitation.expires_at.to_date))) %>
|
||||
<%= @url %>
|
||||
|
||||
<%= raw t(".you_ll_sign_in_or_text", email: @invitation.email) %>
|
||||
<%= raw t(@invitation.creates_account? ? ".sign_in_or_create_text" : ".you_ll_sign_in_or_text", email: @invitation.email) %>
|
||||
Reference in new issue
Block a user