solidus_bolt 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9f19675a463bcfbccc9fe98a89fc973d5bdfb34d66a57e48ad3882441877863
-  data.tar.gz: d79c693485c474464c5563be4710c7c3898031ef879df7d9cb639d9ea203d195
+  metadata.gz: 85a81224dbf00b809093c50581fa790f56f6389a85753a002eff55ed149ddbff
+  data.tar.gz: 84ee9afd0a6dd580df9d3ffcbe2550a3e957d5c43fafc209e42cd79965caf9c2
 SHA512:
-  metadata.gz: 6fe90bea4b8ccd2712913f0ac7241a4b00458b066aa90cceda1adab3a6b0bad29fc0136f116b3edbf39d03d3b586cfbf89c9b071e0477fa4ec1f1501a100da42
-  data.tar.gz: 646680ba9a1f2a81337135e242696a759ae04f469d442e3b5241d1c255035443a0a066fc05fe220d16481dbf1314c1a2d1b246a97de7e0db47dd7e7aa0e091c3
+  metadata.gz: ed702363808663ef10223d943f670c2bc90b248be1f4953b9288b631b36ec9a40908d1c7d3b295bb6f5cbf27b92820845dbe49e8f51a3336a1da68372c247f18
+  data.tar.gz: 2398a99717a2d8f76b1b20c790062b5543d0f7323d90dc55637814bbeadac6d55c3078008a0213f2c6461630dd51362316d5d1b2a2c987fe37acac41cd4e34e8

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"]}`);
     }
   });
@@ -29,6 +31,11 @@ const redirectToNextStep = (frontend) => {
   }
 }
 
+async function getResponseText(response) {
+  const text = await response.text();
+  return text;
+}
+
 const updateOrder = async (card, paymentMethodId, frontend) => {
   await fetch(`/api/checkouts/${Spree.current_order_id}`, {
     method: 'PATCH',
@@ -37,6 +44,7 @@ const updateOrder = async (card, paymentMethodId, frontend) => {
       'X-Spree-Order-Token': Spree.current_order_token
     },
     body: JSON.stringify({
+      'state': 'payment',
       'order': {
         'payments_attributes': [{
           'payment_method_id': paymentMethodId,
@@ -53,8 +61,14 @@ const updateOrder = async (card, paymentMethodId, frontend) => {
       }
     })
   })
-  .then(() => {
-    redirectToNextStep(frontend)
+  .then((response) => {
+    if(response.ok) {
+      redirectToNextStep(frontend)
+    } else {
+      getResponseText(response).then(text => {
+        console.error(text);
+      });
+    }
   })
   .catch((response) => {
     console.log('Error updating order')

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class BoltCallbackUrlsController < Spree::Admin::BaseController
+      def new
+        callback_urls = SolidusBolt::MerchantConfiguration::GetCallbackUrlsService.call
+
+        @oauth_logout = callback_urls['callback_urls'].find { |c| c['type'] == 'oauth_logout' }['url']
+        @oauth_redirect = callback_urls['callback_urls'].find { |c| c['type'] == 'oauth_redirect' }['url']
+      end
+
+      def update
+        SolidusBolt::MerchantConfiguration::SetCallbackUrlsService.call(
+          oauth_logout: params[:bolt_callback_urls][:oauth_logout],
+          oauth_redirect: params[:bolt_callback_urls][:oauth_redirect]
+        )
+        flash[:success] = "Successfully updated callback urls."
+
+        redirect_to new_admin_bolt_callback_urls_path
+      rescue SolidusBolt::ServerError => e
+        flash[:error] = e.message
+
+        render :new
+      end
+
+      private
+
+      def bolt_webhook_params
+        params
+          .require(:bolt_webhook)
+          .permit(
+            :event,
+            :webhook_url,
+          )
+      end
+    end
+  end
+end

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/decorators/models/solidus_bolt/order_decorator.rb

@@ -5,6 +5,7 @@ module SolidusBolt
     def bolt_cart
       {
         total_amount: display_total.cents,
+        tax_amount: display_tax_total.cents,
         order_reference: number,
         currency: currency,
         shipments: bolt_shipments_payload,

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/services/solidus_bolt/merchant_configuration/get_callback_urls_service.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module SolidusBolt
+  module MerchantConfiguration
+    class GetCallbackUrlsService < SolidusBolt::BaseService
+      attr_reader :oauth_redirect, :oauth_logout, :get_account
+
+      def call
+        get_callbacks
+      end
+
+      private
+
+      def get_callbacks # rubocop:disable Naming/AccessorMethodName
+        url = "#{api_base_url}/#{api_version}/merchant/callbacks"
+        handle_result(
+          HTTParty.get(
+            url, headers: headers, query: query
+          )
+        )
+      end
+
+      def query
+        {
+          division_id: @config.division_public_id
+        }
+      end
+
+      def headers
+        {
+          'Content-Type' => 'application/json',
+        }.merge(authentication_header)
+      end
+    end
+  end
+end

data/app/services/solidus_bolt/merchant_configuration/set_callback_urls_service.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module SolidusBolt
+  module MerchantConfiguration
+    class SetCallbackUrlsService < SolidusBolt::BaseService
+      attr_reader :oauth_redirect, :oauth_logout, :get_account
+
+      def initialize(oauth_redirect: nil, oauth_logout: nil, get_account: nil)
+        @oauth_redirect = oauth_redirect
+        @oauth_logout = oauth_logout
+        @get_account = get_account
+
+        super
+      end
+
+      def call
+        set_callbacks
+      end
+
+      private
+
+      def set_callbacks
+        url = "#{api_base_url}/#{api_version}/merchant/callbacks"
+        handle_result(
+          HTTParty.post(
+            url, headers: headers, body: body.to_json
+          )
+        )
+      end
+
+      def body
+        {
+          division_id: @config.division_public_id,
+          callback_urls: callback_urls
+        }
+      end
+
+      def callback_urls
+        callback_urls = []
+
+        callback_urls <<  { type: 'oauth_redirect', url: oauth_redirect } if oauth_redirect.present?
+        callback_urls <<  { type: 'oauth_logout', url: oauth_logout } if oauth_logout.present?
+        callback_urls <<  { type: 'get_account', url: get_account } if get_account.present?
+
+        callback_urls
+      end
+
+      def headers
+        {
+          'Content-Type' => 'application/json',
+        }.merge(authentication_header)
+      end
+    end
+  end
+end

data/app/views/spree/admin/bolt_callback_urls/new.html.erb

@@ -0,0 +1,24 @@
+<% admin_breadcrumb(plural_resource_name(SolidusBolt::BoltConfiguration)) %>
+
+<%= form_for :bolt_callback_urls, url: admin_bolt_callback_urls_path, method: :patch do |f| %>
+  <fieldset class="form-group no-border-bottom no-border-top">
+    <div class="row">
+      <div id="general_fields" class="col-9">
+        <div class="row">
+          <div class="col-12">
+            <%= f.label :oauth_redirect %>
+            <%= f.text_field :oauth_redirect, class: 'fullwidth', value: @oauth_redirect || 'https://domain.com/webhooks/bolt' %>
+          </div>
+          <div class="col-12">
+            <%= f.label :oauth_logout %>
+            <%= f.text_field :oauth_logout, class: 'fullwidth', value: @oauth_logout || 'https://domain.com/webhooks/bolt' %>
+          </div>
+        </div>
+        <div class="row p-2 justify-content-center">
+          <%= f.submit 'Update', class: 'btn btn-primary', data: { disable_with: 'Creating..' } %>
+          <%= link_to 'Cancel', admin_bolt_path, class: 'button' %>
+        </div>
+      </div>
+    </div>
+  </fieldset>
+<% 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/app/views/spree/admin/bolts/show.html.erb

@@ -11,6 +11,9 @@
         ) %>
     </li>
   <% else %>
+    <li>
+      <%= link_to 'Configure Callbacks URLs', new_admin_bolt_callback_urls_path, class: 'btn btn-primary' %>
+    </li>
     <li>
       <%= link_to 'Configure Webhooks', new_admin_bolt_webhook_path, class: 'btn btn-primary' %>
     </li>

data/config/routes.rb

@@ -4,8 +4,13 @@ Spree::Core::Engine.routes.draw do
   namespace :admin do
     resource :bolt, only: [:show, :edit, :update]
     resource :bolt_webhook, only: [:new, :create]
+    resource :bolt_callback_urls, only: [:new, :update]
   end
 
   post '/webhooks/bolt', to: '/solidus_bolt/webhooks#update'
   post '/api/accounts/bolt', to: '/solidus_bolt/accounts#create'
+
+  devise_scope :spree_user do
+    get '/bolt_logout', to: '/spree/user_sessions#destroy', as: 'bolt_logout'
+  end
 end

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.5.0'
 end

data/lib/views/frontend/spree/shared/_login_bar_items.html.erb

@@ -1,6 +1,6 @@
 <% if spree_current_user %>
   <li><%= link_to t('spree.my_account'), spree.account_path %></li>
-  <li><%= link_to t('spree.logout'), spree.logout_path, method: Devise.sign_out_via %></li>
+  <li><div class="bolt-account-sso" data-logged-in="true"></div></li>
 <% else %>
   <li>
     <div class="bolt-account-sso"></div>

data/solidus_bolt.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'multi_json'
   spec.add_dependency 'omniauth-bolt'
   spec.add_dependency 'rails'
-  spec.add_dependency 'solidus_auth_devise'
   spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
   spec.add_dependency 'solidus_social'
   spec.add_dependency 'solidus_support', '~> 0.5'

data/spec/decorators/models/solidus_bolt/order_decorator_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe SolidusBolt::OrderDecorator do
     it 'returns a hash with line items and price' do
       result = {
         total_amount: (order.total * 100).to_i,
+        tax_amount: (order.tax_total * 100).to_i,
         order_reference: order.number,
         currency: 'USD',
         shipments: array_including(hash_including(:reference)),

data/spec/fixtures/vcr_cassettes/SolidusBolt_MerchantConfiguration_GetCallbackUrlsService/_call/receives_the_correct_response.yml

@@ -0,0 +1,54 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api-sandbox.bolt.com/v1/merchant/callbacks?division_id=<DIVISION_PUBLIC_ID>
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - application/json
+      X-Api-Key:
+      - "<API_KEY>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 27 Jul 2022 18:10:11 GMT
+      Content-Type:
+      - application/json; charset=UTF-8
+      Content-Length:
+      - '157'
+      Connection:
+      - keep-alive
+      Public-Key-Pins-Report-Only:
+      - max-age=2592000;pin-sha256="OGAVOYhLZd3ADKYGFZOED1c5m1ObMlRv9PyIWrO4Nd0=";pin-sha256="RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn/yOhI/y+ho=";pin-sha256="IXHYSIdST+XY22J5ivybYkntMIfjA5P6pMKX2hWG1BE=";report-uri="https://77aa1bd121ef22d50247a23390ce6cff.report-uri.io/r/default/hpkp/reportOnly"
+      Set-Cookie:
+      - trk=f47ec1df-c6f5-460c-baf3-2ff506846dd2; Path=/; Max-Age=31536000; HttpOnly;
+        Secure; SameSite=None
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Bolt-Api-Version:
+      - '2022-01-01'
+      X-Bolt-Trace-Id:
+      - Root=1-62e17f83-46d90f8f25fd210e0420dbdb
+      X-Device-Id:
+      - cc0e49b483c9bdb9dce4a6f35b9fcfb75194e19da94e18882fac74a192a8fc71
+      X-Envoy-Upstream-Service-Time:
+      - '29'
+      Server:
+      - envoy
+    body:
+      encoding: UTF-8
+      string: '{"callback_urls":[{"url":"http://localhost:3000/bolt_logout","type":"oauth_logout"},{"url":"http://localhost:3000/users/auth/bolt","type":"oauth_redirect"}]}'
+  recorded_at: Wed, 27 Jul 2022 18:10:11 GMT
+recorded_with: VCR 6.1.0

data/spec/fixtures/vcr_cassettes/SolidusBolt_MerchantConfiguration_SetCallbackUrlsService/_call/receives_the_correct_response.yml

@@ -0,0 +1,54 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api-sandbox.bolt.com/v1/merchant/callbacks
+    body:
+      encoding: UTF-8
+      string: '{"division_id":"Rq4qB1QajYLn","callback_urls":[{"type":"oauth_redirect","url":"http://localhost:3000/users/auth/bolt"},{"type":"oauth_logout","url":"http://localhost:3000//user/spree_user/logout"}]}'
+    headers:
+      Content-Type:
+      - application/json
+      X-Api-Key:
+      - "<API_KEY>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 26 Jul 2022 21:17:15 GMT
+      Content-Type:
+      - application/json; charset=UTF-8
+      Content-Length:
+      - '4'
+      Connection:
+      - keep-alive
+      Public-Key-Pins-Report-Only:
+      - max-age=2592000;pin-sha256="OGAVOYhLZd3ADKYGFZOED1c5m1ObMlRv9PyIWrO4Nd0=";pin-sha256="RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn/yOhI/y+ho=";pin-sha256="IXHYSIdST+XY22J5ivybYkntMIfjA5P6pMKX2hWG1BE=";report-uri="https://77aa1bd121ef22d50247a23390ce6cff.report-uri.io/r/default/hpkp/reportOnly"
+      Set-Cookie:
+      - trk=ea8f518e-f41d-4b8c-9615-161bff916a0f; Path=/; Max-Age=31536000; HttpOnly;
+        Secure; SameSite=None
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Bolt-Api-Version:
+      - '2022-01-01'
+      X-Bolt-Trace-Id:
+      - Root=1-62e059db-307d2def557ae7d63cda1f93
+      X-Device-Id:
+      - 65fb9d676354668c7128f58217c94230e32303007b66559078fee6aefb88e8a4
+      X-Envoy-Upstream-Service-Time:
+      - '37'
+      Server:
+      - envoy
+    body:
+      encoding: UTF-8
+      string: 'null'
+  recorded_at: Tue, 26 Jul 2022 21:17:15 GMT
+recorded_with: VCR 6.1.0

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,30 @@ 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
+
+    it 'returns nil if publishable_key is nil' do
+      bolt_configuration = create(:bolt_configuration, publishable_key: nil)
+      expect(bolt_configuration.division_public_id).to be_nil
+    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
+
+    it 'returns nil if publishable_key is nil' do
+      bolt_configuration = create(:bolt_configuration, publishable_key: nil)
+      expect(bolt_configuration.division_public_id).to be_nil
+    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/merchant_configuration/get_callback_urls_service_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe SolidusBolt::MerchantConfiguration::GetCallbackUrlsService, :vcr, :bolt_configuration do
+  subject(:api) { described_class.new }
+
+  describe '#call', vcr: true do
+    it 'receives the correct response' do
+      expect(api.call).to match hash_including(
+        'callback_urls' => array_including(hash_including('type', 'url'))
+      )
+    end
+  end
+end

data/spec/services/solidus_bolt/merchant_configuration/set_callback_urls_service_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe SolidusBolt::MerchantConfiguration::SetCallbackUrlsService, :vcr, :bolt_configuration do
+  subject(:api) { described_class.new(params) }
+
+  let(:params) {
+    {
+      oauth_redirect: 'http://localhost:3000/users/auth/bolt',
+      oauth_logout: 'http://localhost:3000//user/spree_user/logout'
+    }
+  }
+
+  describe '#call', vcr: true do
+    it 'receives the correct response' do
+      expect(api.call).to be_nil
+    end
+  end
+end

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,11 +5,9 @@ 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']
+    solidus_bolt_configuration.publishable_key = ENV['BOLT_PUBLISHABLE_KEY'] || 'abc.def.ghi'
 
     solidus_bolt_configuration.save!
 

data/spec/support/vcr.rb

@@ -19,8 +19,8 @@ VCR.configure do |config|
   end
 
   config.filter_sensitive_data('<PUBLISHABLE_KEY>') { SolidusBolt::BoltConfiguration.fetch.publishable_key }
+  config.filter_sensitive_data('<DIVISION_PUBLIC_ID>') { SolidusBolt::BoltConfiguration.fetch.division_public_id }
   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.5.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-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -96,20 +96,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: solidus_auth_devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +242,7 @@ files:
 - app/controllers/solidus_bolt/accounts_controller.rb
 - app/controllers/solidus_bolt/base_controller.rb
 - app/controllers/solidus_bolt/webhooks_controller.rb
+- app/controllers/spree/admin/bolt_callback_urls_controller.rb
 - app/controllers/spree/admin/bolt_webhooks_controller.rb
 - app/controllers/spree/admin/bolts_controller.rb
 - app/decorators/controllers/solidus_bolt/spree_checkout_controller/add_addresses_to_bolt.rb
@@ -279,6 +266,8 @@ files:
 - app/services/solidus_bolt/accounts/detail_service.rb
 - app/services/solidus_bolt/accounts/detect_account_service.rb
 - app/services/solidus_bolt/base_service.rb
+- app/services/solidus_bolt/merchant_configuration/get_callback_urls_service.rb
+- app/services/solidus_bolt/merchant_configuration/set_callback_urls_service.rb
 - app/services/solidus_bolt/oauth/token_service.rb
 - app/services/solidus_bolt/payments/capture_sync_service.rb
 - app/services/solidus_bolt/payments/credit_sync_service.rb
@@ -294,6 +283,7 @@ files:
 - app/services/solidus_bolt/users/sync_addresses_service.rb
 - app/services/solidus_bolt/users/sync_payment_sources_service.rb
 - app/services/solidus_bolt/webhooks/create_service.rb
+- app/views/spree/admin/bolt_callback_urls/new.html.erb
 - app/views/spree/admin/bolt_webhooks/new.html.erb
 - app/views/spree/admin/bolts/_configuration.html.erb
 - app/views/spree/admin/bolts/_form.html.erb
@@ -330,6 +320,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
@@ -354,6 +345,8 @@ files:
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_DetailService/_call/with_wrong_access_token/gives_an_error.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_DetectAccountService/_call/receives_the_correct_response.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_DetectAccountService/_call/returns_status_200.yml
+- spec/fixtures/vcr_cassettes/SolidusBolt_MerchantConfiguration_GetCallbackUrlsService/_call/receives_the_correct_response.yml
+- spec/fixtures/vcr_cassettes/SolidusBolt_MerchantConfiguration_SetCallbackUrlsService/_call/receives_the_correct_response.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Oauth_TokenService/_call/makes_the_API_call.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Transactions_AuthorizeService/when_repeat_payment/_call/makes_the_API_call.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Transactions_AuthorizeService/with_auto_capture/_call/makes_the_API_call.yml
@@ -385,6 +378,8 @@ files:
 - spec/services/solidus_bolt/accounts/detail_service_spec.rb
 - spec/services/solidus_bolt/accounts/detect_account_service_spec.rb
 - spec/services/solidus_bolt/base_service_spec.rb
+- spec/services/solidus_bolt/merchant_configuration/get_callback_urls_service_spec.rb
+- spec/services/solidus_bolt/merchant_configuration/set_callback_urls_service_spec.rb
 - spec/services/solidus_bolt/oauth/token_service_spec.rb
 - spec/services/solidus_bolt/payments/capture_sync_service_spec.rb
 - spec/services/solidus_bolt/payments/credit_sync_service_spec.rb
@@ -448,6 +443,8 @@ test_files:
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_DetailService/_call/with_wrong_access_token/gives_an_error.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_DetectAccountService/_call/receives_the_correct_response.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Accounts_DetectAccountService/_call/returns_status_200.yml
+- spec/fixtures/vcr_cassettes/SolidusBolt_MerchantConfiguration_GetCallbackUrlsService/_call/receives_the_correct_response.yml
+- spec/fixtures/vcr_cassettes/SolidusBolt_MerchantConfiguration_SetCallbackUrlsService/_call/receives_the_correct_response.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Oauth_TokenService/_call/makes_the_API_call.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Transactions_AuthorizeService/when_repeat_payment/_call/makes_the_API_call.yml
 - spec/fixtures/vcr_cassettes/SolidusBolt_Transactions_AuthorizeService/with_auto_capture/_call/makes_the_API_call.yml
@@ -479,6 +476,8 @@ test_files:
 - spec/services/solidus_bolt/accounts/detail_service_spec.rb
 - spec/services/solidus_bolt/accounts/detect_account_service_spec.rb
 - spec/services/solidus_bolt/base_service_spec.rb
+- spec/services/solidus_bolt/merchant_configuration/get_callback_urls_service_spec.rb
+- spec/services/solidus_bolt/merchant_configuration/set_callback_urls_service_spec.rb
 - spec/services/solidus_bolt/oauth/token_service_spec.rb
 - spec/services/solidus_bolt/payments/capture_sync_service_spec.rb
 - spec/services/solidus_bolt/payments/credit_sync_service_spec.rb