devise_ott 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b9846aaa11889a03b3c8391987c55611070e4dd
-  data.tar.gz: 38d7c221a3a63e6ef0bfb7e310d092929d67db0b
+  metadata.gz: e8a617406c205831c5ddc559c0fd82c259272887
+  data.tar.gz: c22ebfecba37621d3dbcc84549387e247eb16746
 SHA512:
-  metadata.gz: 3f68ab6b8ef184bb98368525b540c1bcb22427775de2fbf5ed0a11cf7de3afc8377d74996c96abe281ab6501b7d2c5ff24869563f7193464f83037600ca5f9dd
-  data.tar.gz: 97b54045d2bb8dcf311e4d8d95e0ff3473773e777e30bfba0546f7d32be889b140c73b96ad8ba11fbc95772cc724fbdcab89a8252beeabefe24206a5919deb87
+  metadata.gz: a202e73b2a03c3a1636a487f02479f5a937ed9236f7043123fa192fb67205bf76436daf6b82a18ddb1313709d58987eb1e04355cd3eb6e8cc9443ae4ba85bb91
+  data.tar.gz: 16f9c9b1ae8eb8d5e5c0f18bb0c45a30160b7c83bfe1e7fc299812268db3d18e5ea10ffb71a555003e375a1db0695e184e916d36e5aa11ddf5a51590fd236312

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devise_ott (0.0.7)
+    devise_ott (0.0.8)
       devise
       redis
 

data/README.rdoc

@@ -25,7 +25,7 @@ Add :ott_authentication to your model
 ## Usage
 
 Programatically register token for a given user:
-    DeviseOtt::Tokens.instance.register('random_token', 'user@email.com', COUNT, EXPIRES_SECONDS)   # COUNT and EXPIRES_SECONDS are integers
+    DeviseOtt::Tokens.instance.register('random_token', 'user@email.com', 'requester@email.com', COUNT, EXPIRES_SECONDS)   # COUNT and EXPIRES_SECONDS are integers
 
 Login using One-Time Token:
     include ott_token following parameter in the URL. Example: localhost:3000/?ott_token=random_token

data/lib/devise_ott.rb

@@ -17,8 +17,9 @@ end
 
 Warden::Strategies.add(:ott_authentication, DeviseOtt::Strategies::OttAuthentication)
 Devise.add_module :ott_authentication, :strategy => true, :model => 'devise_ott/models/ott_authentication'
-Warden::Manager.after_authentication do |user,auth,opts|
-	if auth.winning_strategy.is_a?(DeviseOtt::Strategies::OttAuthentication)
-		auth.session[:ott_authenticated] = true
+Warden::Manager.after_authentication do |user,warden,opts|
+	if warden.winning_strategy.is_a?(DeviseOtt::Strategies::OttAuthentication)
+		warden.session[:ott_authenticated] = true
+		warden.session[:ott_granted_to_email] = warden.winning_strategy.granted_to_email
 	end
 end

data/lib/devise_ott/strategies/ott_authetication.rb

@@ -1,6 +1,8 @@
 module DeviseOtt
   module Strategies
     class OttAuthentication < Devise::Strategies::Authenticatable
+			attr_reader :granted_to_email
+
       def valid?
         super || valid_for_ott_auth?
       end
@@ -10,7 +12,8 @@ module DeviseOtt
 
         return unless valid_for_ott_auth?
 
-        resource = mapping.to.find_for_ott_authentication(ott_token)
+				@granted_to_email = DeviseOtt::Tokens.instance.granted_to_email(ott_token)
+				resource = mapping.to.find_for_ott_authentication(ott_token)
 
         return unless resource
 

data/lib/devise_ott/tokens.rb

@@ -15,8 +15,8 @@ module DeviseOtt
 
     # register one time token for given user in redis
     # the generated token will have a field "email" in order to identify the associated user later
-    def register(token, email, access_count, expire)
-      save_config(token, {email: email, access_count: access_count})
+    def register(token, email, granted_to_email, access_count, expire)
+      save_config(token, {email: email, granted_to_email: granted_to_email, access_count: access_count})
       @redis.expire(token, expire)
 
       token
@@ -46,6 +46,12 @@ module DeviseOtt
       config && config[:email]
     end
 
+    # returns config hash for a given token
+    def granted_to_email(token)
+			config = load_config(token)
+			config && config[:granted_to_email]
+    end
+
     private
     def save_config(token, hash)
       time_left = ttl(token)
@@ -63,4 +69,4 @@ module DeviseOtt
       @redis.ttl(token)
     end
   end
-end
+end

data/lib/devise_ott/version.rb

@@ -1,3 +1,3 @@
 module DeviseOtt
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/test/devise_ott_tokens_test.rb

@@ -17,7 +17,7 @@ class DeviseOttTest < ActiveSupport::TestCase
 
   test 'redis revokes' do
     assert_equal(1, DeviseOtt::Tokens.instance.revoke('random_token'))
-    DeviseOtt::Tokens.instance.register('random_token', 'test1@example.com', 1040, 100100)
+    DeviseOtt::Tokens.instance.register('random_token', 'test1@example.com', 'requester@example.com', 1040, 100100)
   end
 
   test 'accesses token for a given email if allowed' do
@@ -33,6 +33,11 @@ class DeviseOttTest < ActiveSupport::TestCase
     assert_equal('test1@example.com', DeviseOtt::Tokens.instance.email('random_token'))
   end
 
+  test 'returns correct requester email if allowed' do
+    DeviseOtt::Tokens.instance.access('random_token', 'test1@example.com')
+    assert_equal('requester@example.com', DeviseOtt::Tokens.instance.granted_to_email('random_token'))
+  end
+
   test 'denies email access unless allowed' do
     DeviseOtt::Tokens.instance.access('random_token', 'test1@example.com')
     assert_equal(nil, DeviseOtt::Tokens.instance.email('random_token_'))

data/test/support/seed.rb

@@ -1,4 +1,4 @@
 User.create(email:'test1@example.com')
 User.create(email:'test2@example.com')
 
-DeviseOtt::Tokens.instance.register('random_token', 'test1@example.com', 1040, 100100)
+DeviseOtt::Tokens.instance.register('random_token', 'test1@example.com', 'requester@example.com', 1040, 100100)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_ott
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Iuri Gagnidze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise