From 78f9e4ffbda7855d3bd47c28ef458d004d5d775b Mon Sep 17 00:00:00 2001
From: Nagata Koichi <15206203+nagata-koichi@users.noreply.github.com>
Date: Fri, 6 Dec 2019 11:48:47 +0900
Subject: [PATCH] Fixed the part where the operation does not succeed in
 Redmine 3.4.6.

---
 app/controllers/redmine_oauth_controller.rb | 4 ++--
 lib/helpers/checker.rb                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/redmine_oauth_controller.rb b/app/controllers/redmine_oauth_controller.rb
index df8509c..711a243 100644
--- a/app/controllers/redmine_oauth_controller.rb
+++ b/app/controllers/redmine_oauth_controller.rb
@@ -38,7 +38,7 @@ def checked_try_to_login(email, user)
     if allowed_domain_for?(email)
       try_to_login email, user
     else
-      flash['error'] = l(:notice_domain_not_allowed, :domain => parse_email(email)['domain'])
+      flash['error'] = l(:notice_domain_not_allowed, :domain => parse_email(email)[:domain])
       redirect_to signin_path
     end
   end
@@ -82,7 +82,7 @@ def try_to_login email, info
       if user.active?
         successful_authentication(user)
       else
-        account_pending
+        account_pending(user)
       end
     end
   end
diff --git a/lib/helpers/checker.rb b/lib/helpers/checker.rb
index f0d3fa9..64626b5 100644
--- a/lib/helpers/checker.rb
+++ b/lib/helpers/checker.rb
@@ -5,7 +5,7 @@ def allowed_domain_for? email
       return unless allowed_domains
       allowed_domains = allowed_domains.split
       return true if allowed_domains.empty?
-      allowed_domains.index(parse_email(email)['domain'])
+      allowed_domains.index(parse_email(email)[:domain])
     end
   end
 end