Fix incorrect redirect in response to unauthenticated API requests in limited federation mode (#34549)

app/controllers/api/base_controller.rb

@@ -72,6 +72,13 @@ class Api::BaseController < ApplicationController
     end
   end
 
+  # Redefine `require_functional!` to properly output JSON instead of HTML redirects
+  def require_functional!
+    return if current_user.functional?
+
+    require_user!
+  end
+
   def render_empty
     render json: {}, status: 200
   end

app/controllers/application_controller.rb

@@ -72,6 +72,8 @@ class ApplicationController < ActionController::Base
   def require_functional!
     return if current_user.functional?
 
+    respond_to do |format|
+      format.any do
         if current_user.confirmed?
           redirect_to edit_user_registration_path
         else
@@ -79,6 +81,18 @@ class ApplicationController < ActionController::Base
         end
       end
 
+      format.json do
+        if !current_user.confirmed?
+          render json: { error: 'Your login is missing a confirmed e-mail address' }, status: 403
+        elsif !current_user.approved?
+          render json: { error: 'Your login is currently pending approval' }, status: 403
+        elsif !current_user.functional?
+          render json: { error: 'Your login is currently disabled' }, status: 403
+        end
+      end
+    end
+  end
+
   def skip_csrf_meta_tags?
     false
   end