devise-token_authenticatable 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f3ab41f44f9d2b947755138573fac61db295d5a
-  data.tar.gz: 2ea7960b707e719f26bf13fa53d18c92d964ae90
+  metadata.gz: bea08f81073cdde966185ff2d4f09eae50dfdb6d
+  data.tar.gz: 87a1f8e1208e4243d3822d51bba622fffc3bc78a
 SHA512:
-  metadata.gz: 1da828318ff32ff89522262dc366c5eb60d1308ae3da8c0dea18cb3afe0f4f0e8bd5acf1c4f0ab4cf96cc74cb8a0d42297de6d7ee39b8d0d191ee9ebf0bd5af0
-  data.tar.gz: ba3cd720cf3883632686a705072486ff21248d5453f520795ed32a46c513b74a7fea5b9ee6cb788d30e83c5b299f07b8758d724e90fdbb2d7421190f91728063
+  metadata.gz: c0a9a308790adc4acaa705e966621efe85cef97b52a7e3d1c051754b153d0b969c885f304262f07bf5427c048771c4a4b6e289b31fa06097eda7a0bfbb8e7da6
+  data.tar.gz: 1890a1ffb5065b8032ef542854203944a088e5699eeed1ee6fd0d3059dfec7888394c42b00fa51e8b88e549e5bb64d1b256e0d7e09fd6d636cb59f0e601f9858

data/lib/devise/token_authenticatable/model.rb

@@ -32,7 +32,12 @@ module Devise
       module ClassMethods
 
         def find_for_token_authentication(conditions)
-          find_for_authentication(authentication_token: conditions[Devise::TokenAuthenticatable.token_authentication_key])
+          auth_conditions = conditions.dup
+          authentication_token = auth_conditions.delete(Devise::TokenAuthenticatable.token_authentication_key)
+
+          find_for_authentication(
+            auth_conditions.merge(authentication_token: authentication_token)
+          )
         end
 
         # Generate a token checking if one does not already exist in the database.
@@ -89,7 +94,6 @@ module Devise
         def ensure_authentication_token_before_save
           ensure_authentication_token if Devise::TokenAuthenticatable.should_ensure_authentication_token
         end
-      
     end
   end
 end

data/lib/devise/token_authenticatable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module TokenAuthenticatable
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.2".freeze
   end
 end

data/spec/factories/user.rb

@@ -5,6 +5,7 @@ FactoryGirl.define do
     sequence(:email)      { |n| "user#{n}@domain.com" }
     password              'some_password'
     password_confirmation 'some_password'
+    facebook_token        { SecureRandom.hex }
 
     ignore do
       confirm_account true

data/spec/models/devise/token_authenticatable/model_spec.rb

@@ -51,6 +51,15 @@ shared_examples "token authenticatable" do
         expect(entity.authentication_token).to eq(authenticated_entity.authentication_token)
       end
 
+      it "should authenticate with all the options passed in, not just the auth_token" do
+        conditions = {facebook_token: entity.facebook_token, auth_token: entity.authentication_token}
+        expected_conditions = {facebook_token: entity.facebook_token, authentication_token: entity.authentication_token}
+
+        expect(described_class).to receive(:find_for_authentication).with(expected_conditions).and_call_original
+
+        described_class.find_for_token_authentication(conditions)
+      end
+
       it "should return nil when authenticating an invalid entity by authentication token" do
         authenticated_entity = described_class.find_for_token_authentication(auth_token: entity.authentication_token.reverse)
         expect(authenticated_entity).to be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-token_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sebastian Oelke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise