From ff18fd25f1a3949c9a9863e015fa1f861238d095 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Mon, 18 Sep 2017 12:01:28 +0100 Subject: [PATCH] Adjust Discourse login for user confirmations --- app/controllers/discourse_sso_controller.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/discourse_sso_controller.rb b/app/controllers/discourse_sso_controller.rb index a0da1299a9..b313711554 100644 --- a/app/controllers/discourse_sso_controller.rb +++ b/app/controllers/discourse_sso_controller.rb @@ -45,10 +45,6 @@ class DiscourseSsoController < ApplicationController end def require_activation? - !admin_user? && !email_validated? - end - - def email_validated? - spree_current_user.enterprises.confirmed.map(&:email).include?(spree_current_user.email) + !admin_user? && !spree_current_user.confirmed? end end