devise_castle 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 324dfc68613286f41877c2f6d3f9af318fefa637acb15bd3b0067d000a33624f
-  data.tar.gz: 5e555ffaa34f030dff9804988d0667d300cd4016272032ddd495a5aa714decdf
+  metadata.gz: aa81dd6aeae73a0e57f33b846b3e7b776bbf65bd2e43ba83c2f45d330b3e42c1
+  data.tar.gz: 7d573076b55c64bd65145fe4326bafe5182e8efd6175d45f771805dc43349c68
 SHA512:
-  metadata.gz: dff55e8aacf6c36c5128ec482cfb40eea2d8857a7459a7fa65ce9d0c784892dad4429602474b479abbc504c274b16c5a7e946573c191b43ebe234da63ec4277d
-  data.tar.gz: 4174686cbe74e108af22f08b4d1a6fbcde9407df0a856e52eb41a17d63d053803db05c629950d19e791b8824e5e620121dca14582abd8b2638fcadd91b15ba8d
+  metadata.gz: e0ee13d07f74d6bea5d0ed5eedec68eba66ca5de33b0cb09bc038acdb71953a6b24780f4a7e67523475a7dc607ddd63de06864c714596592c86a1ec7ac4c0cfc
+  data.tar.gz: b7a171552e5b54324a67ef6db6e2008642c0b89c033bd878dac17c504a8805e9e8d16d0d753a82a9fe897cb00d68de3a069e5c68c52c9a07b866be4df25d76de

data/app/controllers/devise_castle/passwords_controller.rb

@@ -1,19 +1,15 @@
 class DeviseCastle::PasswordsController < Devise::PasswordsController
   def create
-    key = resource_params.keys.first
-
-    username = if Devise.reset_password_keys.include?(key.to_sym)
-      resource_params.values.first
+    user_traits = Devise.reset_password_keys.each_with_object({}) do |key, acc|
+      acc[key] = resource_params[key] if resource_params.has?(key)
     end
 
     super do |resource|
       unless resource.respond_to?(:castle_do_not_track?) && resource.castle_do_not_track?
         begin
           castle.track(
-            event: '$password_reset.requested',
-            user_traits: {
-              'email' => username
-            })
+            { event: '$password_reset.requested' }.merge({ user_traits: user_traits })
+          )
         rescue ::Castle::Error => e
           if Devise.castle_error_handler.is_a?(Proc)
             Devise.castle_error_handler.call(e)

data/app/controllers/devise_castle/registrations_controller.rb

@@ -5,7 +5,8 @@ class DeviseCastle::RegistrationsController < Devise::RegistrationsController
         if resource.persisted?
           castle.track(
             event: '$registration.succeeded',
-            user_id: resource._castle_id
+            user_id: resource._castle_id,
+            user_traits: resource.castle_user_traits
           )
         else
           castle.track(

data/app/controllers/devise_castle/sessions_controller.rb

@@ -3,14 +3,15 @@ class DeviseCastle::SessionsController < Devise::SessionsController
   protected
 
   def auth_options
-    # find the username
-    key = serialize_options(resource)[:methods].first
-    username = sign_in_params[key]
+    # find the auth params
+    user_traits = sign_in_params.slice(*resource_class.authentication_keys)
+    # there should be one key related to auth
+    key = user_traits.keys.first
 
     # find the user if any
-    user = resource_class.find_for_authentication(key => username)
+    user = resource_class.find_for_authentication(key => sign_in_params[key])
 
     # make it available to Warden hooks
-    super.merge(username: username, user: user)
+    super.merge(user_traits: user_traits, user: user)
   end
 end

data/lib/devise_castle.rb

@@ -3,7 +3,8 @@ require 'devise'
 require 'devise_castle/hooks'
 require 'devise_castle/mapping'
 require 'devise_castle/routes'
-require 'castle-rb'
+require 'castle'
+require 'castle/support/rails'
 
 module Devise
   mattr_accessor :castle_api_secret

data/lib/devise_castle/hooks.rb

@@ -1,7 +1,6 @@
 # Instantiate Castle client on every request
 Warden::Manager.on_request do |warden|
-  warden.request.env['castle'] =
-    Castle::Client.new(warden.request, warden.cookies)
+  warden.request.env['castle'] = Castle::Client.from_request(warden.request)
 end
 
 # Track logout.succeeded
@@ -22,7 +21,7 @@ end
 
 # Track login.failed
 Warden::Manager.before_failure do |env, opts|
-  if opts[:action] == 'unauthenticated' && opts[:username]
+  if opts[:action] == 'unauthenticated' && opts[:user_traits]
 
     user_id = if opts[:user].respond_to?(:castle_id)
       opts[:user]._castle_id
@@ -33,9 +32,8 @@ Warden::Manager.before_failure do |env, opts|
       castle.track(
         event: '$login.failed',
         user_id: user_id,
-        user_traits: {
-          'email' => opts[:username]
-        })
+        user_traits: opts[:user_traits]
+      )
     rescue ::Castle::Error => e
       if Devise.castle_error_handler.is_a?(Proc)
         Devise.castle_error_handler.call(e)
@@ -50,7 +48,11 @@ Warden::Manager.after_set_user :except => :fetch do |record, warden, opts|
     unless record.respond_to?(:castle_do_not_track?) && record.castle_do_not_track?
       castle = warden.request.env['castle']
       begin
-        castle.authenticate(user_id: record._castle_id, event: '$login.succeeded')
+        castle.authenticate(
+          user_id: record._castle_id,
+          event: '$login.succeeded',
+          user_traits: record.castle_user_traits
+        )
       rescue ::Castle::Error => e
         if Devise.castle_error_handler.is_a?(Proc)
           Devise.castle_error_handler.call(e)

data/lib/devise_castle/model.rb

@@ -42,6 +42,10 @@
         def castle_do_not_track?
           @castle_do_not_track || false
         end
+
+        def castle_user_traits
+          attributes.slice(*Devise.authentication_keys.map(&:to_s))
+        end
       end
     end
   end

data/lib/devise_castle/version.rb

@@ -1,3 +1,3 @@
 module DeviseCastle
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_castle
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Johan Brissmyr
@@ -37,20 +37,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement