solidus_bolt 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9f19675a463bcfbccc9fe98a89fc973d5bdfb34d66a57e48ad3882441877863
-  data.tar.gz: d79c693485c474464c5563be4710c7c3898031ef879df7d9cb639d9ea203d195
+  metadata.gz: f450560bb140e6c7a301138a192a5c8a96016500980580de6866eb1ed79a061d
+  data.tar.gz: 84ace4cc0e18e06ddb78b72ff4d06460c1bc0eeed5f7ad1beb1c53e0791a8a8f
 SHA512:
-  metadata.gz: 6fe90bea4b8ccd2712913f0ac7241a4b00458b066aa90cceda1adab3a6b0bad29fc0136f116b3edbf39d03d3b586cfbf89c9b071e0477fa4ec1f1501a100da42
-  data.tar.gz: 646680ba9a1f2a81337135e242696a759ae04f469d442e3b5241d1c255035443a0a066fc05fe220d16481dbf1314c1a2d1b246a97de7e0db47dd7e7aa0e091c3
+  metadata.gz: c2be760b6012c698408e74d73a5b312cd3b9117f8defee100ac4f4234fa404efcff9d8553fa42170764772d2a334162ac7a30a0f3a2d4dbeb8544f29ea354547
+  data.tar.gz: 171b51d8f32782f81c7d50871161f8a731ccdc308cc9485c21efdb14a03248a8112f27db93cf2a4bebc69a3af2c75aa6389297242c4c00b4dfd2001a9db6b26b

data/README.md

@@ -27,8 +27,6 @@ Many of the API calls handled by this gem use the variables set in Bolt Configur
 
 ```
 BOLT_ENVIRONMENT
-BOLT_MERCHANT_PUBLIC_ID
-BOLT_DIVISION_PUBLIC_ID
 BOLT_API_KEY
 BOLT_SIGNING_SECRET
 BOLT_PUBLISHABLE_KEY

data/app/assets/javascripts/solidus_bolt.js

@@ -16,6 +16,8 @@ const tokenize = async (paymentField, paymentMethodId, frontend) => {
     if (result["token"]) {
       updateOrder(result, paymentMethodId, frontend)
     } else {
+      const submitButton = document.getElementById("bolt-submit-button")
+      submitButton.disabled = false;
       console.log(`error ${result["type"]}: ${result["message"]}`);
     }
   });

data/app/controllers/spree/admin/bolts_controller.rb

@@ -30,8 +30,6 @@ module Spree
           .require(:solidus_bolt_bolt_configuration)
           .permit(
             :environment,
-            :merchant_public_id,
-            :division_public_id,
             :api_key,
             :signing_secret,
             :publishable_key

data/app/models/solidus_bolt/bolt_configuration.rb

@@ -15,6 +15,14 @@ module SolidusBolt
 
     validate :config_can_be_created, on: :create
 
+    def merchant_public_id
+      publishable_key.split('.').first
+    end
+
+    def division_public_id
+      publishable_key.split('.').second
+    end
+
     def self.fetch
       first_or_create
     end

data/app/views/spree/admin/bolts/_configuration.html.erb

@@ -2,7 +2,7 @@
   <table class="index">
     <thead>
       <tr>
-        <th><%= SolidusBolt::BoltConfiguration.human_attribute_name(:merchant_public_id) %></th>
+        <th><%= SolidusBolt::BoltConfiguration.human_attribute_name(:publishable_key) %></th>
         <th><%= SolidusBolt::BoltConfiguration.human_attribute_name(:environment) %></th>
         <th><%= SolidusBolt::BoltConfiguration.human_attribute_name(:created_at) %></th>
         <th><%= SolidusBolt::BoltConfiguration.human_attribute_name(:updated_at) %></th>
@@ -11,7 +11,7 @@
     </thead>
     <tbody>
       <tr>
-        <td><%= @bolt_configuration.merchant_public_id %></td>
+        <td><%= @bolt_configuration.publishable_key %></td>
         <td><%= @bolt_configuration.environment %></td>
         <td>
           <%= @bolt_configuration.created_at.to_s(:long) %>

data/app/views/spree/admin/bolts/_form.html.erb

@@ -6,10 +6,6 @@
         <div class="col-12">
           <%= f.label :environment %>
           <%= f.select :environment, %w[production sandbox staging] %><br />
-          <%= f.label 'Merchant Public Id' %><br />
-          <%= f.text_field :merchant_public_id, class: 'fullwidth' %>
-          <%= f.label 'Division Public Id' %><br />
-          <%= f.text_field :division_public_id, class: 'fullwidth' %>
           <%= f.label :api_key %><br />
           <%= f.text_field :api_key, class: 'fullwidth' %>
           <%= f.label :signing_secret %><br />

data/db/migrate/20220725133701_remove_merchant_id_and_division_public_id_on_bolt_configuration.rb

@@ -0,0 +1,6 @@
+class RemoveMerchantIdAndDivisionPublicIdOnBoltConfiguration < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :solidus_bolt_bolt_configurations, :division_public_id, :string
+    remove_column :solidus_bolt_bolt_configurations, :merchant_public_id, :string
+  end
+end

data/db/seeds.rb

@@ -3,8 +3,6 @@
 solidus_bolt_configuration = SolidusBolt::BoltConfiguration.fetch
 
 solidus_bolt_configuration.environment = ENV.fetch('BOLT_ENVIRONMENT', 'sandbox')
-solidus_bolt_configuration.merchant_public_id = ENV['BOLT_MERCHANT_PUBLIC_ID']
-solidus_bolt_configuration.division_public_id = ENV['BOLT_DIVISION_PUBLIC_ID']
 solidus_bolt_configuration.api_key = ENV['BOLT_API_KEY']
 solidus_bolt_configuration.signing_secret = ENV['BOLT_SIGNING_SECRET']
 solidus_bolt_configuration.publishable_key = ENV['BOLT_PUBLISHABLE_KEY']

data/lib/solidus_bolt/testing_support/factories.rb

@@ -3,11 +3,9 @@
 FactoryBot.define do
   factory :bolt_configuration, class: SolidusBolt::BoltConfiguration do
     environment { 'sandbox' }
-    merchant_public_id { SecureRandom.hex }
-    division_public_id { SecureRandom.hex }
     api_key { SecureRandom.hex }
     signing_secret { SecureRandom.hex }
-    publishable_key { SecureRandom.hex }
+    publishable_key { "#{SecureRandom.hex}.#{SecureRandom.hex}.#{SecureRandom.hex}" }
   end
 
   factory :bolt_payment_method, class: SolidusBolt::PaymentMethod do

data/lib/solidus_bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBolt
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/models/solidus_bolt/bolt_configuration_spec.rb

@@ -5,8 +5,6 @@ RSpec.describe SolidusBolt::BoltConfiguration, type: :model do
     [
       'id',
       'environment',
-      'merchant_public_id',
-      'division_public_id',
       'api_key',
       'signing_secret',
       'publishable_key',
@@ -46,8 +44,6 @@ RSpec.describe SolidusBolt::BoltConfiguration, type: :model do
     it 'is true for a record with empty fields' do
       create(
         :bolt_configuration,
-        merchant_public_id: '',
-        division_public_id: '',
         api_key: '',
         signing_secret: '',
         publishable_key: ''
@@ -61,6 +57,20 @@ RSpec.describe SolidusBolt::BoltConfiguration, type: :model do
     end
   end
 
+  describe '#merchant_public_id' do
+    it 'returns the merchant_public_id' do
+      bolt_configuration = create(:bolt_configuration, publishable_key: 'abc.def.ghi')
+      expect(bolt_configuration.merchant_public_id).to eq('abc')
+    end
+  end
+
+  describe '#division_public_id' do
+    it 'returns the division_public_id' do
+      bolt_configuration = create(:bolt_configuration, publishable_key: 'abc.def.ghi')
+      expect(bolt_configuration.division_public_id).to eq('def')
+    end
+  end
+
   describe '#environment_url' do
     context 'when production envornment' do
       let(:config) { create(:bolt_configuration, environment: 'production') }

data/spec/requests/spree/admin/bolt_spec.rb

@@ -6,8 +6,6 @@ RSpec.describe "Spree::Admin::Bolts", type: :request do
   let(:bolt_configuration_params) {
     {
       environment: 'sandbox',
-      merchant_public_id: SecureRandom.hex,
-      division_public_id: SecureRandom.hex,
       api_key: SecureRandom.hex,
       signing_secret: SecureRandom.hex,
       publishable_key: SecureRandom.hex
@@ -56,8 +54,6 @@ RSpec.describe "Spree::Admin::Bolts", type: :request do
 
       updated_attributes = SolidusBolt::BoltConfiguration.fetch.attributes.slice(
         'environment',
-        'merchant_public_id',
-        'division_public_id',
         'api_key',
         'signing_secret',
         'publishable_key'

data/spec/services/solidus_bolt/webhooks/create_service_spec.rb

@@ -4,13 +4,15 @@ require 'spec_helper'
 
 RSpec.describe SolidusBolt::Webhooks::CreateService, :vcr, :bolt_configuration do
   describe '#call', vcr: true do
-    subject(:create) { described_class.call(url: 'https://solidus-test.com/webhook', event: event) }
+    subject(:create_service) { described_class.call(url: 'https://solidus-test.com/webhook', event: event) }
+
+    before { SolidusBolt::BoltConfiguration.fetch.update(publishable_key: 'abc.def.ghi') }
 
     context 'with an event' do
       let(:event) { 'payment' }
 
       it 'returns a webhook id' do
-        expect(create).to match hash_including('webhook_id')
+        expect(create_service).to match hash_including('webhook_id')
       end
     end
 
@@ -18,7 +20,7 @@ RSpec.describe SolidusBolt::Webhooks::CreateService, :vcr, :bolt_configuration d
       let(:event) { 'all' }
 
       it 'returns a webhook id' do
-        expect(create).to match hash_including('webhook_id')
+        expect(create_service).to match hash_including('webhook_id')
       end
     end
 
@@ -26,7 +28,7 @@ RSpec.describe SolidusBolt::Webhooks::CreateService, :vcr, :bolt_configuration d
       let(:event) { '' }
 
       it 'raises a server error' do
-        expect{ create }.to raise_error SolidusBolt::ServerError
+        expect{ create_service }.to raise_error SolidusBolt::ServerError
       end
     end
   end

data/spec/support/bolt_configuration.rb

@@ -5,8 +5,6 @@ RSpec.configure do |config|
     solidus_bolt_configuration = SolidusBolt::BoltConfiguration.fetch
 
     solidus_bolt_configuration.environment = 'sandbox'
-    solidus_bolt_configuration.merchant_public_id = ENV['BOLT_MERCHANT_PUBLIC_ID']
-    solidus_bolt_configuration.division_public_id = ENV['BOLT_DIVISION_PUBLIC_ID']
     solidus_bolt_configuration.api_key = ENV['BOLT_API_KEY']
     solidus_bolt_configuration.signing_secret = ENV['BOLT_SIGNING_SECRET']
     solidus_bolt_configuration.publishable_key = ENV['BOLT_PUBLISHABLE_KEY']

data/spec/support/vcr.rb

@@ -20,7 +20,6 @@ VCR.configure do |config|
 
   config.filter_sensitive_data('<PUBLISHABLE_KEY>') { SolidusBolt::BoltConfiguration.fetch.publishable_key }
   config.filter_sensitive_data('<API_KEY>') { SolidusBolt::BoltConfiguration.fetch.api_key }
-  config.filter_sensitive_data('<DIVISION_ID>') { SolidusBolt::BoltConfiguration.fetch.division_public_id }
 
   # Let's you set default VCR record mode with VCR_RECORDE_MODE=all for re-recording
   # episodes. :once is VCR default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bolt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - piyushswain
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -330,6 +330,7 @@ files:
 - db/migrate/20220530102107_rename_bolt_configuration_merchant_id_to_division_public_id.rb
 - db/migrate/20220531075527_update_bolt_configuration_environment_column_restrictions.rb
 - db/migrate/20220629131950_remove_bearer_token_on_solidus_bolt_bolt_configuration.rb
+- db/migrate/20220725133701_remove_merchant_id_and_division_public_id_on_bolt_configuration.rb
 - db/seeds.rb
 - lib/generators/solidus_bolt/install/install_generator.rb
 - lib/generators/solidus_bolt/install/templates/initializer.rb