uber_login 1.0.3 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGE2Y2E2MzNjYTA2ODMxZDYwNmU0MGFlNjM2MmVkNTkxOTJkMWU3Mw==
+    MmY5ZDRiZGZiNmViZTAyNzQwNDRjYWFlMjQyNjA4MzkxZjYyYjc0YQ==
   data.tar.gz: !binary |-
-    NDAzMDg0NGU2MmMyNDBkZDY4YmNhY2ZjYWEwODUwNjBjMjY2NjhmOA==
+    Y2Y0ZWEyMzhmZWQwMzQ2ZGIxY2MzZWFlMWY5YTgzZTIyMDc2YzNkMA==
 SHA512:
   metadata.gz: !binary |-
-    YTZjYTBkMzRhZTIyOGFlM2M2NjA0YjE3NmFjOGU1MzdkNzcxM2Q2OTMxYmU2
-    NmI3NjcwMGI5ZGE0NWMxN2U0ZDA5MGY5OWQxYzQ1Y2UxMWViNDE3MGNmNWEw
-    ZjE5ZDM3ZTZlZTliZTUzMjc3YTljMzdhMDk2NTc4Zjk4NTVmMDQ=
+    YzQ3ZWFlMmNhNGIzZmY0N2M4ZmI2NzY2Yzk3NDg5ZmUyNGI0MzY1YjUyZjI4
+    NThhMjM3ZDI0ZTkyY2Q0ZDEzZmZhYjA0MzY3NTg4OGU2YzM3NDc4ZjMxNTJi
+    YjgwZTI3YWQ0Y2UzMDc4ZTNiMDYwM2Y2ZjBmNDYzNjA5NDYxNzQ=
   data.tar.gz: !binary |-
-    ZDNmNjI3NWUyYWJiYWJiYTNjYThiZmM1YmFjNDMwYjljMDVhMGNmMmY1MGU1
-    YzdjZTYyYTlmNTZjY2NjY2Q3MGU1ZmVlMTQ0MDY4MDI5YmY4OWRmZGU2NzE1
-    OWI5ZjZiNGRhZGY0ZWFhZTE5MzI2ZWQwZDk5MGYzYzcxYzAyZGU=
+    MzBlM2Y3ZTMzYjcwYmQ5YjgwZjExOGVjODA4NjFlYjU3MWE4MDcyNDNiOTU3
+    ZTNmYTI2YWY4MjIyNTdhYWNlYThiZTk4MjI1MjYwNTU1YmIzNDZlMWVkYzli
+    OWJjODFjMDUxZWFmM2EyYjIxMDJiZDA1ZDkwNmJiNjNhMzc3ZTM=

data/lib/uber_login/version.rb

@@ -1,3 +1,3 @@
 module UberLogin
-  VERSION = '1.0.3'
+  VERSION = '2.1.0'
 end

data/lib/uber_login.rb

@@ -5,8 +5,16 @@ require 'uber_login/session_manager'
 require 'securerandom'
 require 'bcrypt'
 require 'user_agent'
+require 'active_support'
 
 module UberLogin
+  include ActiveSupport::Callbacks
+  extend ActiveSupport::Concern
+
+  included do
+    define_callbacks :login, :logout
+  end
+
   ##
   # Returns the logged in user.
   # If session[+:uid+] is set:
@@ -34,14 +42,17 @@ module UberLogin
   def login(user, remember = false)
     logout_all unless UberLogin.configuration.allow_multiple_login
 
-    if strong_sessions or remember
-      composite = generate_and_save_token(user.id)
-      cookie_manager.persistent_login(user.id, composite) if remember
-    else
-      composite = nil
-    end
+    run_callbacks :login do
+      if strong_sessions or remember
+        composite = generate_and_save_token(user.id)
+        cookie_manager.persistent_login(user.id, composite) if remember
+      else
+        composite = nil
+      end
 
-    session_manager.login(user.id, composite)
+      reset_session
+      session_manager.login(user.id, composite)
+    end
   end
 
   ##
@@ -49,12 +60,14 @@ module UberLogin
   # and corresponding token removed from the database.
   # If sequence is not nil it only removes the sequence and token from the database.
   def logout(sequence = nil)
-    if sequence.nil? or sequence == current_sequence
-      delete_from_database if cookies[:uid] or strong_sessions
-      session_manager.clear
-      cookie_manager.clear
-    else
-      delete_from_database(sequence)
+    run_callbacks :logout do
+      if sequence.nil? or sequence == current_sequence
+        delete_from_database if cookies[:uid] or strong_sessions
+        session_manager.clear
+        cookie_manager.clear
+      else
+        delete_from_database(sequence)
+      end
     end
   end
 
@@ -67,6 +80,10 @@ module UberLogin
     cookie_manager.clear
   end
 
+  def persistent_login?
+    cookie_manager.valid?
+  end
+
   private
   def cookie_manager
     @cookie_manager ||= CookieManager.new(cookies, request)
@@ -78,8 +95,8 @@ module UberLogin
 
   # See +current_user+
   def current_user_uncached
-    if session[:uid]
-      logout if strong_sessions and !session_manager.valid?
+    if session[:uid] and strong_sessions
+      logout unless session_manager.valid?
     else
       login_from_cookies if cookie_manager.login_cookies?
     end
@@ -90,11 +107,14 @@ module UberLogin
   ##
   # Attempts a login from the +:uid+ and +:ulogin+ cookies.
   def login_from_cookies
-    if cookie_manager.valid?
-      session[:uid] = cookies[:uid]
-      generate_new_token
-      session[:ulogin] = cookies[:ulogin]
-      session[:uid]
+    if persistent_login?
+      run_callbacks :login do
+        reset_session
+        session[:uid] = cookies[:uid]
+        generate_new_token
+        session[:ulogin] = cookies[:ulogin]
+        session[:uid]
+      end
     else
       cookie_manager.clear
       nil

data/spec/spec_helper.rb

@@ -42,6 +42,9 @@ class ApplicationController
     @cookies = FakeCookieJar.new
     @request = FakeRequest.new
   end
+
+  def reset_session
+  end
 end
 
 # This is required to be an ActiveRecord like class

data/spec/uber_login_spec.rb

@@ -40,6 +40,16 @@ describe UberLogin do
           expect(session[:ulogin]).to be_nil
         end
       end
+
+      it 'resets the session' do
+        expect(controller).to receive :reset_session
+        controller.login(user)
+      end
+
+      it 'runs the :login callbacks' do
+        expect(controller).to receive(:run_callbacks).with(:login)
+        controller.login(user)
+      end
     end
 
     context 'remember is true' do
@@ -62,6 +72,11 @@ describe UberLogin do
         expect(cookies).to receive(:permanent).twice.and_return cookies
         controller.login(user, true)
       end
+
+      it 'resets the session' do
+        expect(controller).to receive :reset_session
+        controller.login(user, true)
+      end
     end
 
     context 'only one session is allowed per user' do
@@ -105,6 +120,11 @@ describe UberLogin do
           }.to change{ LoginToken.count }.by -1
         end
       end
+
+      it 'runs the :logout callbacks' do
+        expect(controller).to receive(:run_callbacks).with(:logout)
+        controller.logout
+      end
     end
 
     context 'sequence is equal to current user sequence' do
@@ -213,6 +233,16 @@ describe UberLogin do
         context 'the cookies are valid' do
           before { UberLogin::CookieManager.any_instance.stub(:valid?).and_return true }
 
+          it 'resets the session' do
+            expect(controller).to receive :reset_session
+            controller.login(user, true)
+          end
+
+          it 'runs the :login callbacks' do
+            expect(controller).to receive(:run_callbacks)
+            controller.login(user, true)
+          end
+
           it 'returns an user object with that uid' do
             expect(controller.current_user.id).to eq "100"
           end
@@ -256,4 +286,35 @@ describe UberLogin do
       end
     end
   end
+
+  describe '#persistent_login?' do
+    context 'cookies[:uid] and cookies[:ulogin] are set' do
+      before {
+        cookies[:uid] = "100"
+        cookies[:ulogin] = "whatever:beef"
+      }
+
+      context 'the cookies are valid' do
+        before { UberLogin::CookieManager.any_instance.stub(:valid?).and_return true }
+
+        it 'is true' do
+          expect(controller.persistent_login?).to be_true
+        end
+      end
+
+      context 'the cookies are not valid' do
+        before { UberLogin::CookieManager.any_instance.stub(:valid?).and_return false }
+
+        it 'is false' do
+          expect(controller.persistent_login?).to be_false
+        end
+      end
+    end
+
+    context 'cookies are not set' do
+      it 'is false' do
+        expect(controller.persistent_login?).to be_false
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uber_login
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Francesco Boffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: useragent
@@ -24,6 +24,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Login and logout management with secure "remember me" capabilities and
   complete session control. You can even force a user to logout!
 email: fra.boffa@gmail.com