Browse Source

Add error message with invalid email confirmation (#9625)

pull/4/head
Takeshi Umeda 5 years ago
committed by Eugen Rochko
parent
commit
bf70e5cfda
1 changed files with 6 additions and 4 deletions
  1. +6
    -4
      app/controllers/api/base_controller.rb

+ 6
- 4
app/controllers/api/base_controller.rb View File

@ -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
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

Loading…
Cancel
Save