From 0784391a21b75ca52892e992a614b0f927ade00e Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 29 Aug 2016 11:59:54 +0200
Subject: refactor: split EmailHandler in 3

InvalidEmailHandler - handle emails with an invalid format
LocalEmailHandler   - handle emails on the local domain
EmailHandler        - handle all other emails by using hkp

This is a preparation to add leap provider email lookup and remove
hkp eventually. But for now we keep the behaviour the same and only
refactor.
---
 lib/nickserver/request_handlers/email_handler.rb | 40 +++---------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

(limited to 'lib/nickserver/request_handlers/email_handler.rb')

diff --git a/lib/nickserver/request_handlers/email_handler.rb b/lib/nickserver/request_handlers/email_handler.rb
index b163b27..96fcaf3 100644
--- a/lib/nickserver/request_handlers/email_handler.rb
+++ b/lib/nickserver/request_handlers/email_handler.rb
@@ -1,7 +1,5 @@
 require 'nickserver/email_address'
-require 'nickserver/error_response'
 require 'nickserver/hkp/source'
-require 'nickserver/couch_db/source'
 
 module Nickserver
   module RequestHandlers
@@ -9,46 +7,16 @@ module Nickserver
 
       def call(request)
         return unless request.email
-        handle_request(request)
-      end
-
-      protected
-
-      def handle_request(request)
         email = EmailAddress.new(request.email)
-        if email.invalid?
-          ErrorResponse.new("Not a valid address")
-        else
-          send_key(email, request)
-        end
-      end
-
-      def send_key(email, request)
-        if local_address?(email, request)
-          source = Nickserver::CouchDB::Source.new
-        else
-          source = Nickserver::Hkp::Source.new
-        end
         source.query(email)
-      rescue MissingHostHeader
-        ErrorResponse.new("HTTP request must include a Host header.")
       end
 
-      #
-      # Return true if the user address is for a user of this service provider.
-      # e.g. if the provider is example.org, then alice@example.org returns true.
-      #
-      # If 'domain' is not configured, we rely on the Host header of the HTTP request.
-      #
-      def local_address?(email, request)
-        domain = Config.domain || request.domain
-        raise MissingHostHeader if domain == ''
-        email.domain? domain
-      end
-    end
+      protected
 
+      def source
+        Nickserver::Hkp::Source.new
+      end
 
-    class MissingHostHeader < StandardError
     end
   end
 end
-- 
cgit v1.2.3