authie 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 65b0f0b0c1a8a8de1b9bd7759cd06cbcae80eddd
-  data.tar.gz: 7069b86b31ce68a03bb2070e45c4e290fa862230
+SHA256:
+  metadata.gz: 4351fb61c9e32ab9e4719b811ce293391275a3af0dc7d76972fecc4b10e755d8
+  data.tar.gz: e7522427a422d28cb6a41e9cd4f932384f3408a4bc13b83e47909377d1cc783e
 SHA512:
-  metadata.gz: eba5598c28d8179aa79bc1ebcfe2e0f3c6f924ffe687f3910ec336edb53cfd8577f753dffba2c98f3e012da93adf3fcd9b4de8c8dbaca9a07ffd53face9ded0c
-  data.tar.gz: 432cade42ac473df975d36c835ae8b22fca02213a62fa1febafafdf60d245f4826af4d116092d0df4b49f899a64cf1099110e359a388899f5c350ee43ed427d6
+  metadata.gz: b1f52adcafa68d13fc43c4cd00a374f3f8d0ac83e234973dc862e77a4aab51505c847c528e3bf81576ae473481ecf8b7659acb7944dfc6d4caa8ff972cabe865
+  data.tar.gz: ca2f130a5d8b671fce1026e8d7b2e327d2c9e9226768dcb466f69cdddac6dae64d7255eabfa636b97e13af4485062b16a2b0a338b202187c7c38181503b1a526

data/lib/authie/session.rb

@@ -1,3 +1,5 @@
+require 'secure_random_string'
+
 module Authie
   class Session < ActiveRecord::Base
 
@@ -22,6 +24,7 @@ module Authie
     # Scopes
     scope :active, -> { where(:active => true) }
     scope :asc, -> { order(:last_activity_at => :desc) }
+    scope :for_user, -> (user) { where(:user_type => user.class.name, :user_id => user.id) }
 
     # Attributes
     serialize :data, Hash
@@ -39,7 +42,7 @@ module Authie
     end
 
     before_create do
-      self.temporary_token = SecureRandom.base64(32)
+      self.temporary_token = SecureRandomString.new(44)
       self.token_hash = self.class.hash_token(self.temporary_token)
       if controller
         self.user_agent = controller.request.user_agent
@@ -59,6 +62,17 @@ module Authie
       end
     end
 
+    # Set the user
+    def user=(user)
+      if user
+        self.user_type = user.class.name
+        self.user_id = user.id
+      else
+        self.user_type = nil
+        self.user_id = nil
+      end
+    end
+
     # This method should be called each time a user performs an
     # action while authenticated with this session.
     def touch!
@@ -176,7 +190,7 @@ module Authie
 
     # Invalidate all sessions but this one for this user
     def invalidate_others!
-      self.class.where("id != ?", self.id).where(:user => self.user).each do |s|
+      self.class.where("id != ?", self.id).for_user(self.user).each do |s|
         s.invalidate!
       end
     end
@@ -228,12 +242,12 @@ module Authie
 
     # Is this the first session for this session's browser?
     def first_session_for_browser?
-      self.class.where("id < ?", self.id).where(:user => self.user, :browser_id => self.browser_id).empty?
+      self.class.where("id < ?", self.id).for_user(self.user).where(:browser_id => self.browser_id).empty?
     end
 
     # Is this the first session for the IP?
     def first_session_for_ip?
-      self.class.where("id < ?", self.id).where(:user => self.user, :login_ip => self.login_ip).empty?
+      self.class.where("id < ?", self.id).for_user(self.user).where(:login_ip => self.login_ip).empty?
     end
 
     # Find a session from the database for the given controller instance.
@@ -262,13 +276,8 @@ module Authie
       self.active.where(:browser_id => cookies[:browser_id]).each(&:invalidate!)
       user_object = params.delete(:user)
 
-      if user_object.nil?
-        raise ActiveRecord::RecordInvalid, ':user must be provided when creating a session'
-      end
-
       session = self.new(params)
-      session.user_type = user_object.class.to_s
-      session.user_id = user_object.id
+      session.user = user_object
       session.controller = controller
       session.browser_id = cookies[:browser_id]
       session.login_at = Time.now

data/lib/authie/version.rb

@@ -1,3 +1,3 @@
 module Authie
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authie
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Adam Cooke
@@ -30,8 +30,22 @@ cert_chain:
   3wUJNGnT5XYq+qvTqmjkTSTfdGvZCM63C6bGdN5CAyMokGOOatGqyCMAONolWnfC
   gm3t2GWWrxY=
   -----END CERTIFICATE-----
-date: 2019-08-27 00:00:00.000000000 Z
-dependencies: []
+date: 2019-10-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: secure_random_string
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Rails library for storing user sessions in a backend database
 email:
 - me@adamcooke.io
@@ -76,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Rails library for storing user sessions in a backend database