From 22a7f1e7f2f399c824a62fa47a45f3641c67ac51 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 20 Nov 2018 21:49:47 +0530 Subject: [PATCH] FIX: handle nil user value on password reset --- app/controllers/users_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5a25f7c4e52..2a5005bfde2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -546,10 +546,10 @@ class UsersController < ApplicationController end else render json: { - is_developer: UsernameCheckerService.is_developer?(@user.email), - admin: @user.admin?, + is_developer: UsernameCheckerService.is_developer?(@user&.email), + admin: @user&.admin?, second_factor_required: !valid_second_factor, - backup_enabled: @user.backup_codes_enabled? + backup_enabled: @user&.backup_codes_enabled? } end end