authie 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a46a9aad44c28c4ad761dd1b8057da3cd5580811
-  data.tar.gz: 25d64343871df67c2eb2c8e2085d488107812d87
+  metadata.gz: 65b0f0b0c1a8a8de1b9bd7759cd06cbcae80eddd
+  data.tar.gz: 7069b86b31ce68a03bb2070e45c4e290fa862230
 SHA512:
-  metadata.gz: 2bfaa07c70d14caae2a237816b5b6af52899d6553b8d075faff1112afe864956c128e0d52a97b9fdab7687f9b474353ef9470e0335c137fa91b6021a0cfcd72c
-  data.tar.gz: 60a0f88cac0f89a404b993afe05a23d865c68fef48e4f2e188b91a789a29b47804d64d0b51996ef3da5dbb670e034153788f7619b5c9ca5d1fef5d51e8ef2d59
+  metadata.gz: eba5598c28d8179aa79bc1ebcfe2e0f3c6f924ffe687f3910ec336edb53cfd8577f753dffba2c98f3e012da93adf3fcd9b4de8c8dbaca9a07ffd53face9ded0c
+  data.tar.gz: 432cade42ac473df975d36c835ae8b22fca02213a62fa1febafafdf60d245f4826af4d116092d0df4b49f899a64cf1099110e359a388899f5c350ee43ed427d6

checksums.yaml.gz.sig

@@ -1 +1 @@
-/R"u�'J8�Ŵ�+^��dd��T�g�,�=
+{�#���R��SC��0�(]�P��\=�vO<�#�����LR�; b{�*������{�o|�~QO��@�X�I��04U6CY}���G뻆�8���R�?�N}��lL�ݲ��v��t�4����5}�h�G����,7�P��#}�b�)�,�C³3Uq�מ:�0��9I��ͫ�o�A���7<��в�)�4|��Mx+�=q�]���"],C�z�"^���>�-8

data/lib/authie/controller_delegate.rb

@@ -1,3 +1,6 @@
+require 'securerandom'
+require 'authie/session'
+
 module Authie
   class ControllerDelegate
 
@@ -9,7 +12,7 @@ module Authie
     def set_browser_id
       until cookies[Authie.config.browser_id_cookie_name]
         proposed_browser_id = SecureRandom.uuid
-        unless Session.where(:browser_id => proposed_browser_id).exists?
+        unless Authie::Session.where(:browser_id => proposed_browser_id).exists?
           cookies[Authie.config.browser_id_cookie_name] = {
             :value => proposed_browser_id,
             :expires => 5.years.from_now,
@@ -36,11 +39,28 @@ module Authie
 
     # Set the currently logged in user
     def current_user=(user)
+      create_auth_session(user)
+      user
+    end
+
+    # Create a new session for the given user
+    def create_auth_session(user)
       if user
-        @auth_session = Session.start(@controller, :user => user)
+        @auth_session = Authie::Session.start(@controller, :user => user)
       else
         auth_session.invalidate! if logged_in?
-        @auth_session = nil
+        @auth_session = :none
+      end
+    end
+
+    # Invalidate an existing auth session
+    def invalidate_auth_session
+      if logged_in?
+        auth_session.invalidate!
+        @auth_session = :none
+        true
+      else
+        false
       end
     end
 
@@ -51,7 +71,8 @@ module Authie
 
     # Return the currently logged in user session
     def auth_session
-      @auth_session ||= Session.get_session(@controller)
+      @auth_session ||= Authie::Session.get_session(@controller)
+      @auth_session == :none ? nil : @auth_session
     end
 
     private

data/lib/authie/controller_extension.rb

@@ -31,6 +31,14 @@ module Authie
       auth_session_delegate.current_user = user
     end
 
+    def create_auth_session(user)
+      auth_session_delegate.create_auth_session(user)
+    end
+
+    def invalidate_auth_session
+      auth_session_delegate.invalidate_auth_session
+    end
+
     def logged_in?
       auth_session_delegate.logged_in?
     end

data/lib/authie/engine.rb

@@ -3,9 +3,11 @@ module Authie
 
     engine_name 'authie'
 
-    config.autoload_paths += Dir["#{config.root}/lib/**/"]
-
     initializer 'authie.initialize' do |app|
+      ActiveSupport.on_load :active_record do
+        require 'authie/session'
+      end
+
       ActiveSupport.on_load :action_controller do
         require 'authie/controller_extension'
         include Authie::ControllerExtension

data/lib/authie/session.rb

@@ -15,10 +15,6 @@ module Authie
     self.table_name = "authie_sessions"
 
     # Relationships
-    user_options = {:polymorphic => true}.merge(Authie.config.user_relationship_options)
-    user_options[:optional] = true if ActiveRecord::VERSION::MAJOR >= 5
-    belongs_to :user, user_options
-
     parent_options = {:class_name => "Authie::Session"}
     parent_options[:optional] = true if ActiveRecord::VERSION::MAJOR >= 5
     belongs_to :parent, parent_options
@@ -36,6 +32,10 @@ module Authie
       if self.user_agent.is_a?(String)
         self.user_agent = self.user_agent[0,255]
       end
+
+      if self.last_activity_path.is_a?(String)
+        self.last_activity_path = self.last_activity_path[0,255]
+      end
     end
 
     before_create do
@@ -51,6 +51,14 @@ module Authie
       cookies.delete(:user_session) if controller
     end
 
+    # Return the user that
+    def user
+      if self.user_id && self.user_type
+        @user ||= self.user_type.constantize.find_by(:id => self.user_id) || :none
+        @user == :none ? nil : @user
+      end
+    end
+
     # This method should be called each time a user performs an
     # action while authenticated with this session.
     def touch!
@@ -252,7 +260,15 @@ module Authie
     def self.start(controller, params = {})
       cookies = controller.send(:cookies)
       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.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.2.0'
+  VERSION = '3.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authie
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Adam Cooke
@@ -10,32 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEZDCCAsygAwIBAgIBATANBgkqhkiG9w0BAQsFADA8MQswCQYDVQQDDAJtZTEZ
+  MIIDZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQDDAJtZTEZ
   MBcGCgmSJomT8ixkARkWCWFkYW1jb29rZTESMBAGCgmSJomT8ixkARkWAmlvMB4X
-  DTE4MDMwNTE3MzAwNVoXDTE5MDMwNTE3MzAwNVowPDELMAkGA1UEAwwCbWUxGTAX
-  BgoJkiaJk/IsZAEZFglhZGFtY29va2UxEjAQBgoJkiaJk/IsZAEZFgJpbzCCAaIw
-  DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAOH6HpXwjmVYrUQxUHm25mLm9qYK
-  WS66Me1IfMUX3ZREZ/GzqiJZdV6itPuaaaKpbcm2A/KjgGSPOi9FZBneZ5KvbIeK
-  /GsixL98kxB06q9DZwJbFz7Inklxkd/S0anm+PxtWkQP1TLkMsviRcBPEAqSLON9
-  dCKC7+3kibhatdlsbqIQaeEhSoCUipYMi7ZyFHu5Qz+zMwc8JwHvQ4yi8cMa/QZ+
-  s1tN4mkp/6vWWj4G4lF3YjFYyt2txJcK5ELDtyBy7a3vbMImPy9pplFx1/M6SNpn
-  7Pck0LqDprRzJXsGjq3CbC0nUaudFjUPr31KwxMYq1u13aQL9YuO3GeQCQ3gvdlJ
-  TSd7zoGgLwrMGmXqgd392Psr29yp+WBLcvhFUJnNPDV8nlph/cqmRzoIewP1kdPq
-  pEIUIJQdyKJU7gmFlJ1FurarkuT0a2Rgs99WokCoXLxuPmRWQRN1sH2nHL70jgAR
-  UuvyXEtyALHoCn3VqBR7ZvpfDblUzfANQDhBgwIDAQABo3EwbzAJBgNVHRMEAjAA
-  MAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUa7gxxSE4SO2Ors4B+y3qANdMpo4wGgYD
-  VR0RBBMwEYEPbWVAYWRhbWNvb2tlLmlvMBoGA1UdEgQTMBGBD21lQGFkYW1jb29r
-  ZS5pbzANBgkqhkiG9w0BAQsFAAOCAYEAkbz/AJwBsRKwgt2BhWqgr/egf/37IS3s
-  utVox7feYutKyFDHXYvCjm64XUJNioG7ipbRwOOGs5bEYfwgkabcAQnxSlkdNjc4
-  JIgL/cF4YRg8uJG7DH+LwpydXHqr7RneDiONuiHlEN/1EZZ8tjwXypdwzhQ2/6ot
-  YOxdSi/mXdoDoFlIebsLyInUZjqnm7dQ9nTTUNSB+1LoOD8ARNhTIPnKCnxwZd56
-  giOxoHuJIOhgi6U2zicZJHv8lUj2Lc3bcirQk5eeOFRPVGQSpLLoqA7dtS7Jy4cv
-  3c5m+HyxSxzlrcVHMAgJYemK0uhVQD9Y6JwHKDroWDH+MPALjlScw8ui1jmNuH31
-  n5JOH/07C4gYcwTjJmtoRSov46Z6Gn5cc6NFkQpA185pbRLqEDKzusXvBOQlAOLh
-  iyQrH6PJ0xgVJNYx+DLq3eFmo2hYJkw/lVhYAK+MdajtYJbD5VvCIEHO0d5RRgV+
-  qnCNZoPPy0UtRmGKZTMZvVJEZiw4g0fY
+  DTE5MDUxNDEzNTIxM1oXDTIwMDUxMzEzNTIxM1owPDELMAkGA1UEAwwCbWUxGTAX
+  BgoJkiaJk/IsZAEZFglhZGFtY29va2UxEjAQBgoJkiaJk/IsZAEZFgJpbzCCASIw
+  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMUohRlPw3iIOhWZq+qf5N1ATm1H
+  7gBO4TpsUrw/FL/+urFExzt1+4MPfiKjILge48vKpjoTfuZusRsOQebaFidOfmhk
+  sEqa941CvN3OeUYARA53ORlmoLDLmdcrxq430+woFp4uuSYwim/2YQgIMdgiOTqs
+  cHaM9yh/xUGMnH4lB9bBDNfggMmkSFb6P8Ax4rvdX3EVv5P58RHwHszd+UI4fyy9
+  0W143m6ntNmqena4ZOc7HtWtRyDHHXXzlGgmghKEZgOA+/LO53VHp+cM0JqB7lq5
+  ZxN43fQrIT5yY9Dy7dRBeiDo53WNJPspa5soEivCBVYstMqfd+LGk/BnsyMCAwEA
+  AaNxMG8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGlRGerNfr6J
+  Dprgl6DQ3kLvgVvPMBoGA1UdEQQTMBGBD21lQGFkYW1jb29rZS5pbzAaBgNVHRIE
+  EzARgQ9tZUBhZGFtY29va2UuaW8wDQYJKoZIhvcNAQEFBQADggEBAK2TQPMeW9qh
+  NDNoVbbplfSc8/uscSP2DfssCbhXQqeDfF2z+kQpxv8iAc++KTlotqOaX5A6RvLb
+  NvuwMHPJRQJ2e8rbuN8Sh3tUjbkAEv3SFw4hqbKmtp0j2oKBU0dxHWNfp+5ulh2l
+  UXnQAt4zg3v1hTD1VrwLqG/hyk9xAaWB38lEDBuPhLrDIdDJklg9bD1E2TUvoMrg
+  L6TIbdP1TRrxINO1D9GzboR+OuWos7qMLBEEbjat/fQchYrW1KLcHIUCyrGkZTLm
+  3wUJNGnT5XYq+qvTqmjkTSTfdGvZCM63C6bGdN5CAyMokGOOatGqyCMAONolWnfC
+  gm3t2GWWrxY=
   -----END CERTIFICATE-----
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies: []
 description: A Rails library for storing user sessions in a backend database
 email: