Use the authentication_token for finding the user

1 files changed, 1 insertions, 10 deletions

diff --git a/lib/gitlab/email/handler/create_issue.rb b/lib/gitlab/email/handler/create_issue.rb
index 8829fbb0e49..72d49ec6c96 100644
--- a/lib/gitlab/email/handler/create_issue.rb
+++ b/lib/gitlab/email/handler/create_issue.rb
@@ -11,7 +11,6 @@ module Gitlab
 
         def execute
           validate_permission!(:create_issue)
-          validate_authentication_token!
 
           verify_record(
             create_issue,
@@ -21,10 +20,7 @@ module Gitlab
         end
 
         def author
-          @author ||= mail.from.find do |email|
-            user = User.find_by_any_email(email)
-            break user if user
-          end
+          @author ||= User.find_by(authentication_token: authentication_token)
         end
 
         def project
@@ -48,11 +44,6 @@ module Gitlab
             description: message
           ).execute
         end
-
-        def validate_authentication_token!
-          raise UserNotAuthorizedError unless author.authentication_token ==
-                                                authentication_token
-        end
       end
     end
   end