Prioritize tenant host lookup in middleware

Author: thibaudgg

lib/tenant/middleware.rb

@@ -11,10 +11,10 @@ def call(env)
       request = ActionDispatch::Request.new(env)
       if request.path == "/up"
         @app.call(env)
-      elsif PublicSuffix.parse(request.host).domain == ENV["APP_DOMAIN"]
-        @app.call(env)
       elsif tenant = Tenant.find_by(host: request.host)
         Tenant.switch(tenant) { @app.call(env) }
+      elsif PublicSuffix.parse(request.host).domain == ENV["APP_DOMAIN"]
+        @app.call(env)
       else
         [ 404, {}, [ "Not Found" ] ]
       end