Merge pull request stringer-rss#454 from jbrayton/fever_not_auth_compatibility

Make Handling of Missing or Incorrect Api Key Consistent With Fever Api

Author: matt swanson

app/fever_api/response.rb

@@ -15,6 +15,8 @@
 require_relative "write_mark_group"
 
 module FeverAPI
+  API_VERSION = 3
+
   class Response
     ACTIONS = [
       Authentication,
@@ -39,7 +41,7 @@ def initialize(params)
     end
 
     def to_json
-      base_response = { api_version: 3 }
+      base_response = { api_version: API_VERSION }
       ACTIONS
         .inject(base_response) { |a, e| a.merge!(e.new.call(@params)) }
         .to_json

fever_api.rb

@@ -13,7 +13,9 @@ class Endpoint < Sinatra::Base
     end
 
     before do
-      halt 403 unless authenticated?(params[:api_key])
+      headers = { "Content-Type" => "application/json" }
+      body = { api_version: FeverAPI::API_VERSION, auth: 0 }.to_json
+      halt 200, headers, body unless authenticated?(params[:api_key])
     end
 
     def authenticated?(api_key)

spec/fever_api_spec.rb

@@ -17,6 +17,9 @@ def app
   let(:standard_answer) do
     { api_version: 3, auth: 1, last_refreshed_on_time: 123456789 }
   end
+  let(:cannot_auth) do
+    { api_version: 3, auth: 0 }
+  end
   let(:headers) { { api_key: api_key } }
 
   before do
@@ -34,16 +37,19 @@ def last_response_as_object
     it "authenticates request with correct api_key" do
       get "/", headers
       expect(last_response).to be_ok
+      expect(last_response_as_object).to include(standard_answer)
     end
 
     it "does not authenticate request with incorrect api_key" do
       get "/", api_key: "foo"
-      expect(last_response).not_to be_ok
+      expect(last_response).to be_ok
+      expect(last_response_as_object).to include(cannot_auth)
     end
 
     it "does not authenticate request when api_key is not provided" do
       get "/"
-      expect(last_response).not_to be_ok
+      expect(last_response).to be_ok
+      expect(last_response_as_object).to include(cannot_auth)
     end
   end