warden-token 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d21561c777fbac063c878a280460abd4d3d623e7
-  data.tar.gz: ed642e12393aba24eb38a04515e221e9278ad0dd
+  metadata.gz: 448c7f84e932e3474a30c8299658326fce8137e1
+  data.tar.gz: 872b5a219db7ebea577f3d6dfe8413ed4d7ad5a8
 SHA512:
-  metadata.gz: 9fbcec9bc2a42145a4040ec7e9a1dcdff97fecd78f0677d1c6727f594a6116c63c1a9b9b9d6358954dc78e187ee103e4723881971dd3e6a6f0fa3f6ce9ebd799
-  data.tar.gz: 0a8bcb3586db8a4b74bc67b2e3029d7c5997b90db7bc3b80882972d80064ad072da4d9d57abb925f8eb901c1bfa0757a2bee0ff4cc9047e3a500b97ee366c104
+  metadata.gz: 349d4c232fe0f67e0605622f022dbcebeabce5ef6dcc26bacb9422867bc7cc07aa901f1692ab74088323a4dc4cc77206be9166cff191d64060d63ebe1f123f4a
+  data.tar.gz: f0029f5a18efb17340b64cfc7d0338612f43e8451d209a9e17f3d4bef9899cae21ec4591bcd6ceaea9522dccad72c3fb76e27d08a2c3ecdd297fa70629528a14

data/lib/warden/strategies/token.rb

@@ -1,7 +1,7 @@
 require "warden"
 
 class Warden::Strategies::Token < ::Warden::Strategies::Base
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 
   attr_reader :id, :token
 
@@ -11,7 +11,9 @@ class Warden::Strategies::Token < ::Warden::Strategies::Base
     if request.authorization && request.authorization =~ /^Basic (.*)$/m
       @id, @token = Base64.decode64($1).split(/:/, 2)
     else
-      @id, @token = params[:user_id], params[:token]
+      uid = config[:user_id_param] || :user_id
+      token = config[:user_token_param] || :token
+      @id, @token = params[uid], params[token]
     end
   end
 
@@ -21,13 +23,19 @@ class Warden::Strategies::Token < ::Warden::Strategies::Base
 
   def authenticate!
     user = User.where(id: id).first
-    if user && secure_compare(user.auth_token)
+    token = user.send(config[:token_name])
+    if user && secure_compare(token)
       success!(user)
     else
       fail!("Invalid user id or token")
     end
   end
 
+  # Returns the configuration data for the default user scope.
+  def config
+    env["warden"].config[:scope_defaults][:user][:config]
+  end
+
   private
 
   # Taken from [Devise](https://github.com/plataformatec/devise).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warden-token
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tyler Margison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Simple token authentication strategy for Warden.