From bf70e5cfdaef9b7a3a927548a05203a864d5bea9 Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Wed, 26 Dec 2018 03:35:26 +0900
Subject: [PATCH] Add error message with invalid email confirmation (#9625)
---
app/controllers/api/base_controller.rb | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 2bf8e82db8..a1dd30918f 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -68,12 +68,14 @@ class Api::BaseController < ApplicationController
end
def require_user!
- if current_user && !current_user.disabled? && current_user.confirmed?
- set_user_activity
- elsif current_user
- render json: { error: 'Your login is currently disabled' }, status: 403
- else
+ 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
+ set_user_activity
end
end