update to cr 6

castle · Jan 19, 2021 · fb397c5 · fb397c5
1 parent 8edb440
commit fb397c5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     byebug (11.1.3)
-    castle-rb (5.0.0)
+    castle-rb (6.0.0)
     coveralls_reborn (0.20.0)
       simplecov (>= 0.18.1, < 0.22.0)
       term-ansicolor (~> 1.6)

diff --git a/lib/castle/middleware/authenticating.rb b/lib/castle/middleware/authenticating.rb
@@ -71,14 +71,16 @@ def authentication_verdict(verdict, req, resource)
 
       def process_authenticate(req, resource, mapping, user_traits_from_params, event_properties)
         authenticate(
-          Castle::Client.to_context(req),
-          Castle::Client.to_options(
-            user_id: Identification.id(resource, configuration.identify),
-            user_traits: Identification.traits(
-              resource, configuration.user_traits
-            ).merge(user_traits_from_params),
-            event: mapping.event,
-            properties: event_properties
+          ::Castle::Payload::Prepare.call(
+            {
+              user_id: Identification.id(resource, configuration.identify),
+              user_traits: Identification.traits(
+                resource, configuration.user_traits
+              ).merge(user_traits_from_params),
+              event: mapping.event,
+              properties: event_properties
+            },
+            req
           )
         )
       end

diff --git a/lib/castle/middleware/tracking.rb b/lib/castle/middleware/tracking.rb
@@ -61,14 +61,16 @@ def prefetch_resource_if_needed(req)
       # generate track call
       def process_track(req, resource, mapping, user_traits_from_params, properties)
         configuration.services.transport.call(
-          ::Castle::Client.to_context(req),
-          ::Castle::Client.to_options(
-            user_id: Identification.id(resource, configuration.identify),
-            user_traits: Identification.traits(
-              resource, configuration.user_traits
-            ).merge(user_traits_from_params),
-            event: mapping.event,
-            properties: properties
+          ::Castle::Payload::Prepare.call(
+            {
+              user_id: Identification.id(resource, configuration.identify),
+              user_traits: Identification.traits(
+                resource, configuration.user_traits
+              ).merge(user_traits_from_params),
+              event: mapping.event,
+              properties: properties
+            },
+            req
           )
         )
       end

diff --git a/spec/castle/middleware_spec.rb b/spec/castle/middleware_spec.rb
@@ -6,7 +6,7 @@
 
     it { expect(config.api_secret).to be_eql('secret') }
 
-    it { expect(Castle.config.url.to_s).to be_eql('https://api.castle.local:3000') }
+    it { expect(Castle.config.base_url.to_s).to be_eql('https://api.castle.local:3000') }
   end
 
   describe '::configure' do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -12,7 +12,7 @@
   config.before do
     ::Castle::Middleware.configure do |c|
       c.api_secret = 'secret'
-      c.api_options = { url: 'https://api.castle.local:3000' }
+      c.api_options = { base_url: 'https://api.castle.local:3000' }
       c.app_id = '1234'
       c.file_path = './spec/castle/middleware/castle_config.yml'
     end