token_authenticate_me 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b0b4986c15318e2b049d77c161bb49ddb54cd40
-  data.tar.gz: 753233dd4e2f98c51f5add6d3543a7c72e1744cb
+  metadata.gz: 16f5dbf666867739882ead51e1ba2237a2d48e8a
+  data.tar.gz: 19609d70964f5278db5886529f641ecb6f7498a0
 SHA512:
-  metadata.gz: 13c59c0d210c88e9b4de37b69c0bcd899670421202233f608228f09ce10412620ab12239937a8793ea5b690df811a3fb17c428cb594d227a9c9fa31ec23a8674
-  data.tar.gz: 2f0ba37bfd6c7d8f2065543e0ecde7e8f46cddfa87fb1ed0b4e77ae141b8bd015d143dc62ca458c8373187bc9dd978a8ed1dfece7a2007d68542bdc197d184f1
+  metadata.gz: f8e0ac5633ac3f12ebd1e158f5144eaea0501c1c4df1da7a0db980918b869393efd44c4594cbde2e8b0e2c38bb2ba72bc9ccfc3519c8edbf587dac909687b7fd
+  data.tar.gz: a124c6982af8cd8285b3402edb81685a89cdf3ac76c04ef88725244a7921a1deaa6ba7d80fe7de429be1daeedef234bef332986e60e8af619879c7024acbd0eb

data/.editorconfig

@@ -0,0 +1,41 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.rb]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

data/lib/token_authenticate_me/controllers/token_authenticateable.rb

@@ -24,20 +24,29 @@ module TokenAuthenticateMe
       end
 
       def authenticate_token
-        @session ||= authenticate_with_http_token do |token, _options|
-          session = Session.find_by_key(token)
-          if session && session.expiration > DateTime.now
-            session
-          else
-            false
-          end
-        end
+        @session ||= (
+          authenticate_with_http_token(&method(:token_handler)) || authenticate_with_params
+        )
+      end
+
+      def authenticate_with_params
+        token = params[:authentication_token]
+        token_handler(token, {})
       end
 
       def render_unauthorized
         headers['WWW-Authenticate'] = 'Token realm="Application"'
         render json: 'Bad credentials', status: 401
       end
+
+      def token_handler(token, _options)
+        session = Session.find_by_key(token)
+        if session && session.expiration > DateTime.now
+          session
+        else
+          false
+        end
+      end
     end
   end
 end

data/lib/token_authenticate_me/version.rb

@@ -1,3 +1,3 @@
 module TokenAuthenticateMe
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: token_authenticate_me
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Sam Clopton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -172,6 +172,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -240,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: This gem adds simple token authentication to users.