Refactor CredentialAuthenticator to work like the TokenAuthenticator

Work with the CredentialAuthenticator object directly and not the json
body of the response. This lets us handle things like caching and other
detailed behavior involving headers and response codes.

Author: csexton

lib/kracken/authenticator.rb

@@ -7,8 +7,8 @@ class Authenticator
     # Login the user with their credentails. Used for proxying the
     # authentication to the auth server, normally from a mobile app
     def self.user_with_credentials(email, password)
-      response = Kracken::CredentialAuthenticator.new.fetch(email, password)
-      response ? self.new(response).to_app_user : nil
+      auth = Kracken::CredentialAuthenticator.new.fetch(email, password)
+      self.new(auth.body).to_app_user
     end
 
     # Login the user with an auth token. Used for API authentication for the

lib/kracken/credential_authenticator.rb

@@ -1,27 +1,34 @@
 module Kracken
   class CredentialAuthenticator
+    attr_reader :response
+
     def fetch(email, password)
-      response = connection.post do |req|
+      @response = connection.post do |req|
         req.url '/auth/radius/login.json'
         req.headers['Content-Type'] = 'application/json'
-        req.body = body(email, password).to_json
+        req.body = post_body(email, password).to_json
       end
 
-      # An attempt to raise error when approprate:
-      if response.status == 404
-        nil
-      elsif response.status == 401
+      if response.status == 401
+        raise TokenUnauthorized, "Invalid credentials"
+      elsif response.status == 404
         raise TokenUnauthorized, "Invalid credentials"
-      elsif response.success?
+      elsif !response.success?
+        raise RequestError
+      end
+
+      self
+    end
+
+    def body
+      if response
         JSON.parse(response.body)
-      else
-        raise Kracken::RequestError
       end
     end
 
     private
 
-    def body(email, password)
+    def post_body(email, password)
       {
         user: {
           email: email,

spec/kracken/authenticator_spec.rb

@@ -5,18 +5,17 @@ module Kracken
 
 
     describe ".with_credentials" do
-      it "returns nil when nothing is found" do
-        expect_any_instance_of(CredentialAuthenticator)
-          .to receive(:fetch)
-          .and_return(nil)
-
-        expect(Authenticator.user_with_credentials("[email protected]", "secret")).to be_nil
-      end
+      let(:cred_auth) {
+        object_double(
+          CredentialAuthenticator.new,
+          body: { 'uid' => 1 }
+        )
+      }
 
       it "creates a user using the user_class" do
         expect_any_instance_of(CredentialAuthenticator)
           .to receive(:fetch)
-          .and_return({'uid' => 1})
+          .and_return(cred_auth)
 
         expect(Authenticator.user_with_credentials("[email protected]", "secret").class).to eq User
       end
@@ -25,7 +24,7 @@ module Kracken
       it "sets the user's uid" do
         expect_any_instance_of(CredentialAuthenticator)
           .to receive(:fetch)
-          .and_return({'uid' => 1})
+          .and_return(cred_auth)
 
         expect(Authenticator.user_with_credentials("[email protected]", "secret").uid).to eq 1
       end

spec/kracken/credential_authenticator_spec.rb

@@ -15,23 +15,25 @@ def set_request(status, body=nil)
       set_request 200, json
 
       response = login.fetch "[email protected]", "secret"
-      expect(response['uid']).to eq "1"
+      expect(response.body['uid']).to eq "1"
     end
 
     it "raises an error on 500" do
       login = CredentialAuthenticator.new
 
       set_request 500
 
-      expect{login.fetch "[email protected]", "secret"}.to raise_error(RequestError)
+      expect{login.fetch "[email protected]", "secret"}
+        .to raise_error(RequestError)
     end
 
-    it "returns nil for a 404" do
+    it "raises an error on 404" do
       login = CredentialAuthenticator.new
 
       set_request 404
 
-      expect(login.fetch "[email protected]", "secret").to be_nil
+      expect{login.fetch("[email protected]", "secret")}
+        .to raise_error(TokenUnauthorized)
     end
 
   end

spec/kracken/token_authenticator_spec.rb

@@ -25,7 +25,7 @@ def set_request(status, body=nil)
       expect{login.fetch "secret"}.to raise_error(RequestError)
     end
 
-    it "returns nil for a 404" do
+    it "raises an error on 404" do
       login = TokenAuthenticator.new
 
       set_request 404