authie 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a723ac0bdb1ef36ed3084611c603fc5e17d3b65a
-  data.tar.gz: ca93a21ef49d797fd9aa69eb97b596a8f3e5bbd6
+  metadata.gz: 0a79a25563e536247558b4b4e0110c54cb0131e6
+  data.tar.gz: 8e56f9b73ed4104169852d2bb1f87a3b41853e98
 SHA512:
-  metadata.gz: fe7a982ff92db20e736ae166eaefe30398bbd0e5cf2ac863bc1ceef0a4f0d092a1a176cb21b6c06b76aa42d9918eb654f6904bceaa65a1172587d13ac7a6b829
-  data.tar.gz: 728eb60de7c26c260c55144d4bed89a8794f57b642daefcd5412c79173f2d93a695364281e4a724cacca3e44355706ece8a919799e08f6ed6d660f8c82f3ecee
+  metadata.gz: 12d450b4dae3f88855b68f6f0b30c8e445489681e632772c09c33ec98fa2c1326d36ba545bb02f6aa51d8998505ebb10407c57150586e2033c87abd96f0ec8c4
+  data.tar.gz: 9873f56ce1b14561c033cfdbf1a3d3282147b2176b1167468ba6638e29db0b64b2f2df238375935c48648df8548dec9f03b1381ebeff5890e52950241eb027d4

data/db/migrate/20150109144120_add_parent_id_to_authie_sessions.rb

@@ -0,0 +1,5 @@
+class AddParentIdToAuthieSessions < ActiveRecord::Migration
+  def change
+    add_column :authie_sessions, :parent_id, :integer
+  end
+end

data/lib/authie/rack_controller.rb

@@ -0,0 +1,40 @@
+# If you're dealing with your authentication in a middleware and you only have
+# access to your rack environment, this will wrap around rack and make it look
+# close enough to an ActionController to work with Authie
+# 
+# Usage:
+# 
+# controller = Authie::RackController.new(@env)
+# controller.current_user = user
+
+module Authie
+  class RackController
+
+    attr_reader :request
+
+    def initialize(env)
+      @env = env
+      @request = ActionDispatch::Request.new(@env)
+      set_browser_id
+    end
+
+    def cookies
+      @request.cookie_jar
+    end
+
+    # Set a random browser ID for this browser. 
+    def set_browser_id
+      until cookies[:browser_id]
+        proposed_browser_id = SecureRandom.uuid
+        unless Session.where(:browser_id => proposed_browser_id).exists?
+          cookies[:browser_id] = {:value => proposed_browser_id, :expires => 20.years.from_now}
+        end
+      end
+    end
+
+    def current_user=(user)
+      Session.start(self, :user => user)
+    end
+
+  end
+end

data/lib/authie/session.rb

@@ -1,25 +1,26 @@
 module Authie
   class Session < ActiveRecord::Base
-    
+
     # Define some errors which may be used
     class InactiveSession < Error; end
     class ExpiredSession < Error; end
     class BrowserMismatch < Error; end
-    
+
     # Set table name
     self.table_name = "authie_sessions"
-    
+
     # Relationships
     belongs_to :user, :polymorphic => true
-    
+    belongs_to :parent, :class_name => "Authie::Session"
+
     # Scopes
     scope :active, -> { where(:active => true) }
     scope :asc, -> { order(:last_activity_at => :desc) }
-    
+
     # Attributes
     serialize :data, Hash
     attr_accessor :controller
-    
+
     before_create do
       self.token = SecureRandom.base64(32)
       if controller
@@ -31,7 +32,7 @@ module Authie
     before_destroy do
       cookies.delete(:user_session) if controller
     end
-    
+
     # This method should be called each time a user performs an
     # action while authenticated with this session.
     def touch!
@@ -40,8 +41,8 @@ module Authie
       self.last_activity_path = controller.request.path
       self.save!
     end
-    
-    # Sets the cookie on the associated controller. 
+
+    # Sets the cookie on the associated controller.
     def set_cookie!
       cookies[:user_session] = {
         :value => token,
@@ -50,7 +51,7 @@ module Authie
         :expires => self.expires_at
       }
     end
-    
+
     # Check the security of the session to ensure it can be used.
     def check_security!
       if controller
@@ -58,12 +59,12 @@ module Authie
           invalidate!
           raise BrowserMismatch, "Browser ID mismatch"
         end
-        
+
         unless self.active?
           invalidate!
           raise InactiveSession, "Session is no longer active"
         end
-        
+
         if self.expires_at && self.expires_at < Time.now
           invalidate!
           raise ExpiredSession, "Persistent session has expired"
@@ -75,7 +76,7 @@ module Authie
         end
       end
     end
-    
+
     # Allow this session to persist rather than expiring at the end of the
     # current browser session
     def persist!
@@ -83,12 +84,18 @@ module Authie
       self.save!
       set_cookie!
     end
-    
+
     # Is this a persistent session?
     def persistent?
       !!expires_at
     end
 
+    # Activate an old session
+    def activate!
+      self.active = true
+      self.save!
+    end
+
     # Mark this session as invalid
     def invalidate!
       self.active = false
@@ -97,7 +104,7 @@ module Authie
         cookies.delete(:user_session)
       end
     end
-    
+
     # Set some additional data in this session
     def set(key, value)
       self.data ||= {}
@@ -109,7 +116,7 @@ module Authie
     def get(key)
       (self.data ||= {})[key.to_s]
     end
-    
+
     # Find a session from the database for the given controller instance.
     # Returns a session object or :none if no session is found.
     def self.get_session(controller)
@@ -122,7 +129,7 @@ module Authie
         :none
       end
     end
-    
+
     # Create a new session and return the newly created session object.
     # Any other sessions for the browser will be invalidated.
     def self.start(controller, params = {})
@@ -136,18 +143,18 @@ module Authie
       session.save
       session
     end
-    
+
     # Cleanup any old sessions.
     def self.cleanup
       self.active.where("expires_at IS NULL AND last_activity_at < ?", Authie.config.session_inactivity_timeout.ago).each(&:invalidate!)
     end
-    
+
     private
-    
+
     # Return all cookies on the associated controller
     def cookies
       controller.send(:cookies)
     end
-    
+
   end
 end

data/lib/authie/version.rb

@@ -1,3 +1,3 @@
 module Authie
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authie
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies: []
 description: A Rails library for storing user sessions in a backend database
 email:
@@ -19,11 +19,13 @@ extra_rdoc_files: []
 files:
 - db/migrate/20141012174250_create_authie_sessions.rb
 - db/migrate/20141013115205_add_indexes_to_authie_sessions.rb
+- db/migrate/20150109144120_add_parent_id_to_authie_sessions.rb
 - lib/authie.rb
 - lib/authie/config.rb
 - lib/authie/controller_extension.rb
 - lib/authie/engine.rb
 - lib/authie/error.rb
+- lib/authie/rack_controller.rb
 - lib/authie/session.rb
 - lib/authie/version.rb
 homepage: https://github.com/adamcooke/authie