Merge pull request #45 from RadiusNetworks/eric/activated-dash-error-1818

Updates authentication check

Author: lankyfrenchman

lib/kracken/controllers/authenticatable.rb

@@ -32,12 +32,13 @@ def sign_in_path(return_to=nil)
       end
 
       def authenticate_user
+        check_token_expiry!
         user_signed_in?
       end
 
       def authenticate_user!
-        check_token_expiry!
-        return if user_signed_in?
+        return if authenticate_user
+
         if request.format == :json
           render json: {error: '401 Unauthorized'}, status: :unauthorized
         elsif request.format == :js

spec/kracken/controllers/authenticatable_spec.rb

@@ -95,6 +95,7 @@ class ControllerDouble < BaseControllerDouble
         end
 
         it "#authenticate_user is true" do
+          controller.session[:token_expires_at] = Time.zone.now + 5.minutes
           expect(controller.authenticate_user).to be_truthy
         end