Add error message with invalid email confirmation (mastodon#9625)

Origin-Creative · Dec 25, 2018 · 9d77712 · 9d77712
1 parent 976b0d3
commit 9d77712
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
@@ -68,12 +68,14 @@ def current_user
   end
 
   def require_user!
-    if current_user && !current_user.disabled? && current_user.confirmed?
-      set_user_activity
-    elsif current_user
+    if !current_user
+      render json: { error: 'This method requires an authenticated user' }, status: 422
+    elsif current_user.disabled?
       render json: { error: 'Your login is currently disabled' }, status: 403
+    elsif !current_user.confirmed?
+      render json: { error: 'Email confirmation is not completed' }, status: 403
     else
-      render json: { error: 'This method requires an authenticated user' }, status: 422
+      set_user_activity
     end
   end