castle-rb 6.0.1 → 7.0.0

data/spec/lib/castle/utils/merge_spec.rb

@@ -5,7 +5,9 @@ describe Castle::Utils::Merge do
 
   describe 'call' do
     let(:first) { { test: { test1: { c: '4' }, test2: { c: '3' }, a: '1', b: '2' } } }
-    let(:second) { { test2: '2', test: { 'test1' => { d: '5' }, test2: '6', a: nil, b: '3' } } }
+    let(:second) do
+      { test2: '2', test: { 'test1' => { d: '5' }, :test2 => '6', :a => nil, :b => '3' } }
+    end
     let(:result) { { test2: '2', test: { test1: { c: '4', d: '5' }, test2: '6', b: '3' } } }
 
     it { expect(merge.call(first, second)).to be_eql(result) }

data/spec/lib/castle/validators/present_spec.rb

@@ -8,9 +8,7 @@ describe Castle::Validators::Present do
       let(:keys) { %i[second third] }
 
       it do
-        expect do
-          call
-        end.to raise_error(Castle::InvalidParametersError, 'third is missing or empty')
+        expect { call }.to raise_error(Castle::InvalidParametersError, 'third is missing or empty')
       end
     end
 
@@ -18,9 +16,10 @@ describe Castle::Validators::Present do
       let(:keys) { %i[second invalid] }
 
       it do
-        expect do
-          call
-        end.to raise_error(Castle::InvalidParametersError, 'invalid is missing or empty')
+        expect { call }.to raise_error(
+          Castle::InvalidParametersError,
+          'invalid is missing or empty'
+        )
       end
     end
 

data/spec/lib/castle/webhooks/verify_spec.rb

@@ -4,12 +4,7 @@ describe Castle::Webhooks::Verify do
   describe '#call' do
     subject(:call) { described_class.call(webhook) }
 
-    let(:env) do
-      Rack::MockRequest.env_for(
-        '/',
-        'HTTP_X_CASTLE_SIGNATURE' => signature
-      )
-    end
+    let(:env) { Rack::MockRequest.env_for('/', 'HTTP_X_CASTLE_SIGNATURE' => signature) }
 
     let(:webhook) { Rack::Request.new(env) }
     let(:user_id) { '12345' }
@@ -37,32 +32,21 @@ describe Castle::Webhooks::Verify do
     context 'when success' do
       let(:signature) { '3ptx3rUOBnGEqPjMrbcJn2UUfzwTKP54dFyP5uyPY+Y=' }
 
-      before do
-        allow(Castle::Core::ProcessWebhook)
-          .to receive(:call)
-          .and_return(webhook_body)
-      end
+      before { allow(Castle::Core::ProcessWebhook).to receive(:call).and_return(webhook_body) }
 
-      it do
-        expect { call }.not_to raise_error
-      end
+      it { expect { call }.not_to raise_error }
     end
 
     context 'when signature is malformed' do
       let(:signature) { '123' }
 
-      before do
-        allow(Castle::Core::ProcessWebhook)
-          .to receive(:call)
-          .and_return(webhook_body)
-      end
+      before { allow(Castle::Core::ProcessWebhook).to receive(:call).and_return(webhook_body) }
 
       it do
-        expect { call }
-          .to raise_error(
-            Castle::WebhookVerificationError,
-            'Signature not matching the expected signature'
-          )
+        expect { call }.to raise_error(
+          Castle::WebhookVerificationError,
+          'Signature not matching the expected signature'
+        )
       end
     end
   end

data/spec/lib/castle_spec.rb

@@ -42,11 +42,7 @@ describe Castle do
     end
 
     context 'with block and options' do
-      before do
-        castle.configure(request_timeout: timeout) do |config|
-          config.api_secret = value
-        end
-      end
+      before { castle.configure(request_timeout: timeout) { |config| config.api_secret = value } }
 
       it_behaves_like 'config_setup'
     end
@@ -56,11 +52,9 @@ describe Castle do
     let(:value) { 'new_secret' }
 
     it do
-      expect do
-        castle.configure do |config|
-          config.wrong_config = value
-        end
-      end.to raise_error(Castle::ConfigurationError)
+      expect { castle.configure { |config| config.wrong_config = value } }.to raise_error(
+        Castle::ConfigurationError
+      )
     end
   end
 end

data/spec/spec_helper.rb

@@ -19,8 +19,6 @@ Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 RSpec.configure do |config|
   config.before do
     Castle.config.reset
-    Castle.configure do |cfg|
-      cfg.api_secret = 'secret'
-    end
+    Castle.configure { |cfg| cfg.api_secret = 'secret' }
   end
 end

data/spec/support/shared_examples/action_request.rb

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for 'action request' do |action|
+  subject(:request_response) { client.send(action.to_sym, options) }
+
+  let(:options) do
+    {
+      request_token: request_token,
+      event: event,
+      status: status,
+      user: user,
+      context: context,
+      properties: properties
+    }
+  end
+  let(:request_token) { '7e51335b-f4bc-4bc7-875d-b713fb61eb23-bf021a3022a1a302' }
+  let(:event) { '$login' }
+  let(:status) { '$succeeded' }
+  let(:user) { { id: '1234', email: 'foobar@mail.com' } }
+  let(:properties) { {} }
+  let(:request_body) do
+    {
+      request_token: request_token,
+      event: event,
+      status: status,
+      user: user,
+      context: context,
+      properties: properties,
+      timestamp: time_auto,
+      sent_at: time_auto
+    }
+  end
+
+  context 'when used with symbol keys' do
+    it do
+      request_response
+
+      assert_requested :post, "https://api.castle.io/v1/#{action}", times: 1 do |req|
+        JSON.parse(req.body) == JSON.parse(request_body.to_json)
+      end
+    end
+
+    context 'when passed timestamp in options and no defined timestamp' do
+      let(:client) { client_with_no_timestamp }
+
+      before do
+        options[:timestamp] = time_user
+        request_body[:timestamp] = time_user
+
+        request_response
+      end
+
+      it do
+        assert_requested :post, "https://api.castle.io/v1/#{action}", times: 1 do |req|
+          JSON.parse(req.body) == JSON.parse(request_body.to_json)
+        end
+      end
+    end
+
+    context 'with client initialized with timestamp' do
+      let(:client) { client_with_user_timestamp }
+
+      before do
+        request_body[:timestamp] = time_user
+
+        request_response
+      end
+
+      it do
+        assert_requested :post, "https://api.castle.io/v1/#{action}", times: 1 do |req|
+          JSON.parse(req.body) == JSON.parse(request_body.to_json)
+        end
+      end
+    end
+  end
+
+  context 'when used with string keys' do
+    before { request_response }
+
+    it do
+      assert_requested :post, "https://api.castle.io/v1/#{action}", times: 1 do |req|
+        JSON.parse(req.body) == JSON.parse(request_body.to_json)
+      end
+    end
+  end
+
+  context 'when tracking enabled' do
+    before { request_response }
+
+    it do
+      assert_requested :post, "https://api.castle.io/v1/#{action}", times: 1 do |req|
+        JSON.parse(req.body) == JSON.parse(request_body.to_json)
+      end
+    end
+
+    it { expect(request_response[:failover]).to be false }
+    it { expect(request_response[:failover_reason]).to be_nil }
+  end
+
+  context 'when tracking disabled' do
+    before do
+      client.disable_tracking
+      request_response
+    end
+
+    it { assert_not_requested :post, "https://api.castle.io/v1/#{action}" }
+    it { expect(request_response[:action]).to be_eql(Castle::Verdict::ALLOW) }
+    it { expect(request_response[:user_id]).to be_eql('1234') }
+    it { expect(request_response[:failover]).to be true }
+    it { expect(request_response[:failover_reason]).to be_eql('Castle is set to do not track.') }
+  end
+
+  context 'when request with fail' do
+    before do
+      allow(Castle::API).to receive(:send_request).and_raise(
+        Castle::RequestError.new(Timeout::Error)
+      )
+    end
+
+    context 'with request error and throw strategy' do
+      before { allow(Castle.config).to receive(:failover_strategy).and_return(:throw) }
+
+      it { expect { request_response }.to raise_error(Castle::RequestError) }
+    end
+
+    context 'with request error and not throw on eg deny strategy' do
+      it { assert_not_requested :post, "https:/:secret@api.castle.io/v1/#{action}" }
+      it { expect(request_response[:action]).to be_eql('allow') }
+      it { expect(request_response[:user_id]).to be_eql('1234') }
+      it { expect(request_response[:failover]).to be true }
+      it { expect(request_response[:failover_reason]).to be_eql('Castle::RequestError') }
+    end
+  end
+
+  context 'when request is internal server error' do
+    before { allow(Castle::API).to receive(:send_request).and_raise(Castle::InternalServerError) }
+
+    describe 'throw strategy' do
+      before { allow(Castle.config).to receive(:failover_strategy).and_return(:throw) }
+
+      it { expect { request_response }.to raise_error(Castle::InternalServerError) }
+    end
+
+    describe 'not throw on eg deny strategy' do
+      it { assert_not_requested :post, "https:/:secret@api.castle.io/v1/#{action}" }
+      it { expect(request_response[:action]).to be_eql('allow') }
+      it { expect(request_response[:user_id]).to be_eql('1234') }
+      it { expect(request_response[:failover]).to be true }
+      it { expect(request_response[:failover_reason]).to be_eql('Castle::InternalServerError') }
+    end
+  end
+end

data/spec/support/shared_examples/configuration.rb

@@ -16,81 +16,55 @@ end
 
 shared_examples 'configuration_request_timeout' do
   describe 'request_timeout' do
-    it do
-      expect(config.request_timeout).to be_eql(1000)
-    end
+    it { expect(config.request_timeout).to be_eql(1000) }
 
     context 'with setter' do
       let(:value) { 50.0 }
 
-      before do
-        config.request_timeout = value
-      end
+      before { config.request_timeout = value }
 
-      it do
-        expect(config.request_timeout).to be_eql(value)
-      end
+      it { expect(config.request_timeout).to be_eql(value) }
     end
   end
 end
 
 shared_examples 'configuration_allowlisted' do
   describe 'allowlisted' do
-    it do
-      expect(config.allowlisted.size).to be_eql(0)
-    end
+    it { expect(config.allowlisted.size).to be_eql(0) }
 
     context 'with setter' do
-      before do
-        config.allowlisted = ['header']
-      end
+      before { config.allowlisted = ['header'] }
 
-      it do
-        expect(config.allowlisted).to be_eql(['Header'])
-      end
+      it { expect(config.allowlisted).to be_eql(['Header']) }
     end
   end
 end
 
 shared_examples 'configuration_denylisted' do
   describe 'denylisted' do
-    it do
-      expect(config.denylisted.size).to be_eql(0)
-    end
+    it { expect(config.denylisted.size).to be_eql(0) }
 
     context 'with setter' do
-      before do
-        config.denylisted = ['header']
-      end
+      before { config.denylisted = ['header'] }
 
-      it do
-        expect(config.denylisted).to be_eql(['Header'])
-      end
+      it { expect(config.denylisted).to be_eql(['Header']) }
     end
   end
 end
 
 shared_examples 'configuration_failover_strategy' do
   describe 'failover_strategy' do
-    it do
-      expect(config.failover_strategy).to be_eql(Castle::Failover::Strategy::ALLOW)
-    end
+    it { expect(config.failover_strategy).to be_eql(Castle::Failover::Strategy::ALLOW) }
 
     context 'with setter' do
-      before do
-        config.failover_strategy = Castle::Failover::Strategy::DENY
-      end
+      before { config.failover_strategy = Castle::Failover::Strategy::DENY }
 
-      it do
-        expect(config.failover_strategy).to be_eql(Castle::Failover::Strategy::DENY)
-      end
+      it { expect(config.failover_strategy).to be_eql(Castle::Failover::Strategy::DENY) }
     end
 
     context 'when broken' do
       it do
-        expect do
-          config.failover_strategy = :unicorn
-        end.to raise_error(Castle::ConfigurationError)
+        expect { config.failover_strategy = :unicorn }.to raise_error(Castle::ConfigurationError)
       end
     end
   end
@@ -103,9 +77,7 @@ shared_examples 'configuration_api_secret' do
       let(:secret_key) { 'secret_key' }
 
       before do
-        allow(ENV).to receive(:fetch).with(
-          'CASTLE_API_SECRET', ''
-        ).and_return(secret_key_env)
+        allow(ENV).to receive(:fetch).with('CASTLE_API_SECRET', '').and_return(secret_key_env)
         config.reset
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: castle-rb
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Johan Brissmyr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -37,11 +37,12 @@ files:
 - lib/castle/api/approve_device.rb
 - lib/castle/api/authenticate.rb
 - lib/castle/api/end_impersonation.rb
+- lib/castle/api/filter.rb
 - lib/castle/api/get_device.rb
 - lib/castle/api/get_devices_for_user.rb
-- lib/castle/api/identify.rb
+- lib/castle/api/log.rb
 - lib/castle/api/report_device.rb
-- lib/castle/api/review.rb
+- lib/castle/api/risk.rb
 - lib/castle/api/start_impersonation.rb
 - lib/castle/api/track.rb
 - lib/castle/client.rb
@@ -50,11 +51,12 @@ files:
 - lib/castle/commands/approve_device.rb
 - lib/castle/commands/authenticate.rb
 - lib/castle/commands/end_impersonation.rb
+- lib/castle/commands/filter.rb
 - lib/castle/commands/get_device.rb
 - lib/castle/commands/get_devices_for_user.rb
-- lib/castle/commands/identify.rb
+- lib/castle/commands/log.rb
 - lib/castle/commands/report_device.rb
-- lib/castle/commands/review.rb
+- lib/castle/commands/risk.rb
 - lib/castle/commands/start_impersonation.rb
 - lib/castle/commands/track.rb
 - lib/castle/configuration.rb
@@ -67,7 +69,6 @@ files:
 - lib/castle/core/process_webhook.rb
 - lib/castle/core/send_request.rb
 - lib/castle/errors.rb
-- lib/castle/events.rb
 - lib/castle/failover/prepare_response.rb
 - lib/castle/failover/strategy.rb
 - lib/castle/headers/extract.rb
@@ -101,11 +102,12 @@ files:
 - spec/lib/castle/api/approve_device_spec.rb
 - spec/lib/castle/api/authenticate_spec.rb
 - spec/lib/castle/api/end_impersonation_spec.rb
+- spec/lib/castle/api/filter_spec.rb
 - spec/lib/castle/api/get_device_spec.rb
 - spec/lib/castle/api/get_devices_for_user_spec.rb
-- spec/lib/castle/api/identify_spec.rb
+- spec/lib/castle/api/log_spec.rb
 - spec/lib/castle/api/report_device_spec.rb
-- spec/lib/castle/api/review_spec.rb
+- spec/lib/castle/api/risk_spec.rb
 - spec/lib/castle/api/start_impersonation_spec.rb
 - spec/lib/castle/api/track_spec.rb
 - spec/lib/castle/api_spec.rb
@@ -115,11 +117,12 @@ files:
 - spec/lib/castle/commands/approve_device_spec.rb
 - spec/lib/castle/commands/authenticate_spec.rb
 - spec/lib/castle/commands/end_impersonation_spec.rb
+- spec/lib/castle/commands/filter_spec.rb
 - spec/lib/castle/commands/get_device_spec.rb
 - spec/lib/castle/commands/get_devices_for_user_spec.rb
-- spec/lib/castle/commands/identify_spec.rb
+- spec/lib/castle/commands/log_spec.rb
 - spec/lib/castle/commands/report_device_spec.rb
-- spec/lib/castle/commands/review_spec.rb
+- spec/lib/castle/commands/risk_spec.rb
 - spec/lib/castle/commands/start_impersonation_spec.rb
 - spec/lib/castle/commands/track_spec.rb
 - spec/lib/castle/configuration_spec.rb
@@ -131,7 +134,6 @@ files:
 - spec/lib/castle/core/process_response_spec.rb
 - spec/lib/castle/core/process_webhook_spec.rb
 - spec/lib/castle/core/send_request_spec.rb
-- spec/lib/castle/events_spec.rb
 - spec/lib/castle/failover/strategy_spec.rb
 - spec/lib/castle/headers/extract_spec.rb
 - spec/lib/castle/headers/filter_spec.rb
@@ -154,6 +156,7 @@ files:
 - spec/lib/castle/webhooks/verify_spec.rb
 - spec/lib/castle_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples/action_request.rb
 - spec/support/shared_examples/configuration.rb
 homepage: https://castle.io
 licenses:
@@ -174,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Castle
@@ -184,6 +187,7 @@ test_files:
 - spec/integration/rails/support/all.rb
 - spec/integration/rails/support/home_controller.rb
 - spec/integration/rails/rails_spec.rb
+- spec/support/shared_examples/action_request.rb
 - spec/support/shared_examples/configuration.rb
 - spec/lib/castle_spec.rb
 - spec/lib/castle/session_spec.rb
@@ -213,30 +217,31 @@ test_files:
 - spec/lib/castle/headers/format_spec.rb
 - spec/lib/castle/headers/extract_spec.rb
 - spec/lib/castle/headers/filter_spec.rb
-- spec/lib/castle/api/review_spec.rb
 - spec/lib/castle/api/report_device_spec.rb
 - spec/lib/castle/api/authenticate_spec.rb
 - spec/lib/castle/api/track_spec.rb
 - spec/lib/castle/api/get_device_spec.rb
+- spec/lib/castle/api/risk_spec.rb
 - spec/lib/castle/api/start_impersonation_spec.rb
+- spec/lib/castle/api/log_spec.rb
 - spec/lib/castle/api/approve_device_spec.rb
 - spec/lib/castle/api/get_devices_for_user_spec.rb
 - spec/lib/castle/api/end_impersonation_spec.rb
-- spec/lib/castle/api/identify_spec.rb
-- spec/lib/castle/commands/review_spec.rb
+- spec/lib/castle/api/filter_spec.rb
 - spec/lib/castle/commands/report_device_spec.rb
 - spec/lib/castle/commands/authenticate_spec.rb
 - spec/lib/castle/commands/track_spec.rb
 - spec/lib/castle/commands/get_device_spec.rb
+- spec/lib/castle/commands/risk_spec.rb
 - spec/lib/castle/commands/start_impersonation_spec.rb
+- spec/lib/castle/commands/log_spec.rb
 - spec/lib/castle/commands/approve_device_spec.rb
 - spec/lib/castle/commands/get_devices_for_user_spec.rb
 - spec/lib/castle/commands/end_impersonation_spec.rb
-- spec/lib/castle/commands/identify_spec.rb
+- spec/lib/castle/commands/filter_spec.rb
 - spec/lib/castle/validators/not_supported_spec.rb
 - spec/lib/castle/validators/present_spec.rb
 - spec/lib/castle/webhooks/verify_spec.rb
 - spec/lib/castle/failover/strategy_spec.rb
 - spec/lib/castle/secure_mode_spec.rb
 - spec/lib/castle/singleton_configuration_spec.rb
-- spec/lib/castle/events_spec.rb