token_authenticate_me 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 014ea05ef85b51fefd546c3810d22ceb01c1949a
-  data.tar.gz: 32299428b5e1198b06350a8b3cc5c6e9ca56e291
+  metadata.gz: 311f92f7a78f01a264d0b936eaa9f84401bf01a5
+  data.tar.gz: 101238b569d8a8589d5ac9e3cd39d8000d961a46
 SHA512:
-  metadata.gz: 77265c9a971f4cd560dc6cf6ce3272d86c42ebba02d29714147e34f59f047ede1227ef88bb52a38beabc3a8541fcf6867fec752a415848afc160ba45e3593c5b
-  data.tar.gz: fe1899c608ce5be093d59417eb03beaf2431e7c3807637bb8a43897aa693ee95e1a18310fb5564655496795ee0339e95145892162ca18ea6ae5efff7f09ec248
+  metadata.gz: f9bfe4a07d52b2b6ab96c8324f41523b6f64161294a58be96d1e67530955feafa8e2675a88e179f3c4b3ba91a5288337bdaa18b7518d2b97858e9e203ebb0b49
+  data.tar.gz: 7290e71439f2e27d462d5b2df6b21e9d11dfe591f76da1a1596ef77025b9e9a2c83f8f24f1721a0e9a0a9c0a01d0586ce663caff25c6ebc5a2687bdf5b2867a8

data/lib/token_authenticate_me/concerns/controllers/token_authenticateable.rb

@@ -1,6 +1,7 @@
 require 'active_support/concern'
 require 'token_authenticate_me/concerns/controllers/authenticateable'
 require 'token_authenticate_me/header_authentication'
+require 'token_authenticate_me/param_authentication'
 
 module TokenAuthenticateMe
   module Concerns
@@ -18,7 +19,7 @@ module TokenAuthenticateMe
         protected
 
         def authenticated_session
-          @session ||= authenticate_with_header
+          @session ||= (authenticate_with_header || authenticate_with_params)
         end
 
         def authenticate_with_header
@@ -27,8 +28,8 @@ module TokenAuthenticateMe
         end
 
         def authenticate_with_params
-          token = params[:authentication_token]
-          token_handler(token, {})
+          header_authentication = TokenAuthenticateMe::ParamAuthentication.new(controller: self)
+          header_authentication.authenticate
         end
 
         def render_unauthorized

data/lib/token_authenticate_me/param_authentication.rb

@@ -0,0 +1,24 @@
+module TokenAuthenticateMe
+  class ParamAuthentication
+    attr :controller
+
+    def initialize(controller:)
+      @controller = controller
+    end
+
+    def authenticate(options = {})
+      token_handler(token, options)
+    end
+
+    private
+
+    def token
+      controller.params[:authentication_token]
+    end
+
+    def token_handler(token, options)
+      controller.token_handler(token, options)
+    end
+  end
+end
+

data/lib/token_authenticate_me/version.rb

@@ -1,3 +1,3 @@
 module TokenAuthenticateMe
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.5.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: token_authenticate_me
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Sam Clopton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +123,7 @@ files:
 - lib/token_authenticate_me/engine.rb
 - lib/token_authenticate_me/header_authentication.rb
 - lib/token_authenticate_me/models.rb
+- lib/token_authenticate_me/param_authentication.rb
 - lib/token_authenticate_me/session_authentication.rb
 - lib/token_authenticate_me/version.rb
 - test/dummy/README.rdoc
@@ -174,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This gem adds simple token authentication to users.