Merge branch 'main' into index_job_tidying

samvera · Sep 21, 2023 · 802e895 · 802e895
2 parents 5ea9895 + a3be534
commit 802e895
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/middleware/account_elevator.rb b/app/middleware/account_elevator.rb
@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
+require 'apartment/elevators/generic'
 # Apartment middleware for switching tenants based on the
 # CNAME entry for an account.
 class AccountElevator < Apartment::Elevators::Generic
   include AccountSwitch
   # @return [String] The tenant to switch to
   def parse_tenant_name(request)
     account = Account.from_request(request)
-
+    account || Account.new.reset! # reset everything if no account is present
     account&.tenant
   end
 end