Gem updates, fixup controller before filter method call for auth

Author: Bill Heaton

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/cerebris/jsonapi-resources.git
-  revision: dee9666240ad8e9205a35987fff85ccab8153770
+  revision: e385293a7b5bbf5a483a4bef9bf7f78dc174c49f
   specs:
     jsonapi-resources (0.3.3)
       rails (>= 4.0)
@@ -46,7 +46,7 @@ GEM
     arel (6.0.0)
     bcrypt (3.1.10)
     builder (3.2.2)
-    byebug (4.0.5)
+    byebug (5.0.0)
       columnize (= 0.9.0)
     capistrano (3.4.0)
       i18n
@@ -74,15 +74,15 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.5)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.6.1)
+    minitest (5.7.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    pg (0.18.1)
+    pg (0.18.2)
     rack (1.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -134,7 +134,7 @@ GEM
     spring (1.3.6)
     sprockets (3.1.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.0)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

app/controllers/api/auth_controller.rb

@@ -1,5 +1,4 @@
 class Api::AuthController < ApplicationController
-
   skip_before_action :authenticate_request
 
   def authenticate
@@ -19,7 +18,6 @@ def authenticate_commenter
     end
     if commenter.present?
       @current_user = commenter
-      render json: { auth_token: commenter.generate_auth_token }
       render json: { auth_token: commenter.generate_auth_token, commenter_id: commenter.id }
     else
       render json: { error: 'Invalid name or email' }, status: :unauthorized

app/controllers/api/v1/authors_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::AuthorsController < ApiControllerController
-  skip_before_action :set_current_user, :authenticate_request, only: [:index, :show, :show_association, :get_related_resource]
+  skip_before_action :authenticate_request, only: [:index, :show, :show_association, :get_related_resource]
 
   private
     def author_params

app/controllers/api/v1/commenters_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::CommentersController < ApiControllerController
-  skip_before_action :set_current_user, :authenticate_request, only: [:index, :show, :show_association, :get_related_resource]
+  skip_before_action :authenticate_request, only: [:index, :show, :show_association, :get_related_resource]
 
   private
 

app/controllers/api/v1/comments_controller.rb

@@ -1,6 +1,5 @@
 class Api::V1::CommentsController < ApiControllerController
-  skip_before_action :set_current_user, :authenticate_request, only: [:index, :show, :show_association, :get_related_resources]
-  before_action :set_current_user
+  skip_before_action :authenticate_request, only: [:index, :show, :show_association, :get_related_resources]
 
   def current_user
     @current_user
@@ -19,7 +18,6 @@ def set_current_user
         elsif decoded_auth_token.has_key? :user_id
           @current_user = User.find(decoded_auth_token[:user_id])
         end
-        nil
       end
     end
 

app/controllers/api/v1/posts_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::PostsController < ApiControllerController
-  skip_before_action :set_current_user, :authenticate_request, only: [:index, :show, :show_association, :get_related_resources]
+  skip_before_action :authenticate_request, only: [:index, :show, :show_association, :get_related_resources]
 
   def index
     sort_criteria = @request.sort_criteria

app/controllers/api_controller_controller.rb

@@ -1,7 +1,7 @@
 require 'jsonapi/resource_controller'
 
 class ApiControllerController < JSONAPI::ResourceController
-  before_action :set_current_user, :authenticate_request
+  before_action :authenticate_request
 
   rescue_from NotAuthenticatedError do
     render json: { error: 'Not Authorized' }, status: :unauthorized
@@ -25,6 +25,7 @@ def set_current_user
 
   # Check to make sure the current user was set and the token is not expired
   def authenticate_request
+    set_current_user
     if auth_token_expired?
       fail AuthenticationTimeoutError
     elsif !@current_user
@@ -45,8 +46,8 @@ def auth_token_expired?
   def http_auth_header_content
     return @http_auth_header_content if defined? @http_auth_header_content
     @http_auth_header_content = begin
-      if request.headers['Authorization'].present?
-        request.headers['Authorization'].split(' ').last
+      if request.headers['HTTP_AUTHORIZATION'].present?
+        request.headers['HTTP_AUTHORIZATION'].split(' ').last
       else
         nil
       end