solidus_bolt 0.5.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a81224dbf00b809093c50581fa790f56f6389a85753a002eff55ed149ddbff
-  data.tar.gz: 84ee9afd0a6dd580df9d3ffcbe2550a3e957d5c43fafc209e42cd79965caf9c2
+  metadata.gz: 89aae31a58ea5e33c4ec759f8f3ccca8c9cde9c397986074ca0d980b701b6281
+  data.tar.gz: 1f02b9e4d932af604eabb21bc3fe5af3cb2e7e9c6991d431a6715ced090890e1
 SHA512:
-  metadata.gz: ed702363808663ef10223d943f670c2bc90b248be1f4953b9288b631b36ec9a40908d1c7d3b295bb6f5cbf27b92820845dbe49e8f51a3336a1da68372c247f18
-  data.tar.gz: 2398a99717a2d8f76b1b20c790062b5543d0f7323d90dc55637814bbeadac6d55c3078008a0213f2c6461630dd51362316d5d1b2a2c987fe37acac41cd4e34e8
+  metadata.gz: 6ca7162deec70cf4296d2a14ff3bc234c7ddb8a97619cb9a26e33092cc21621283bf36a0d866f000ba6ed2358afbfee9c728cc8255aed272184c66d1d9f853e1
+  data.tar.gz: d216520effb6569e31f6685e7472047523453ff68e0b15bed56b5a22a64aa712f5e888ff791a25c75a04de73b656d3a640f54e3850238534ec902c7bbbdf2261

data/Gemfile

@@ -4,7 +4,13 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
+solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
+                                      %w[solidusio/solidus solidusio/solidus_frontend]
+                                    else
+                                      %w[solidusio/solidus] * 2
+                                    end
+gem 'solidus', github: solidus_git, branch: branch
+gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.

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

@@ -3,21 +3,23 @@
 module Spree
   module Admin
     class BoltCallbackUrlsController < Spree::Admin::BaseController
-      def new
+      def edit
         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']
+        @oauth_logout = callback_urls['callback_urls'].find { |c| c['type'] == 'oauth_logout' }&.dig('url')
+        @oauth_redirect = callback_urls['callback_urls'].find { |c| c['type'] == 'oauth_redirect' }&.dig('url')
+        @get_account = callback_urls['callback_urls'].find { |c| c['type'] == 'get_account' }&.dig('url')
       end
 
       def update
         SolidusBolt::MerchantConfiguration::SetCallbackUrlsService.call(
           oauth_logout: params[:bolt_callback_urls][:oauth_logout],
-          oauth_redirect: params[:bolt_callback_urls][:oauth_redirect]
+          oauth_redirect: params[:bolt_callback_urls][:oauth_redirect],
+          get_account: params[:bolt_callback_urls][:get_account]
         )
         flash[:success] = "Successfully updated callback urls."
 
-        redirect_to new_admin_bolt_callback_urls_path
+        redirect_to edit_admin_bolt_callback_urls_path
       rescue SolidusBolt::ServerError => e
         flash[:error] = e.message
 

data/app/services/solidus_bolt/base_service.rb

@@ -10,8 +10,8 @@ module SolidusBolt
       raise NotImplementedError
     end
 
-    def self.call(*args)
-      new(*args).call
+    def self.call(*args, **kwargs, &block)
+      new(*args, **kwargs, &block).call
     end
 
     private

data/app/views/spree/admin/bolt_callback_urls/{new.html.erb → edit.html.erb}

@@ -7,11 +7,15 @@
         <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' %>
+            <%= f.text_field :oauth_redirect, class: 'fullwidth', value: @oauth_redirect || 'https://domain.com/users/auth/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' %>
+            <%= f.text_field :oauth_logout, class: 'fullwidth', value: @oauth_logout || 'https://domain.com/bolt_logout' %>
+          </div>
+          <div class="col-12">
+            <%= f.label :get_account %>
+            <%= f.text_field :get_account, class: 'fullwidth', value: @get_account || 'https://domain.com/api/accounts/bolt' %>
           </div>
         </div>
         <div class="row p-2 justify-content-center">

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

@@ -12,7 +12,7 @@
     </li>
   <% else %>
     <li>
-      <%= link_to 'Configure Callbacks URLs', new_admin_bolt_callback_urls_path, class: 'btn btn-primary' %>
+      <%= link_to 'Configure Callbacks URLs', edit_admin_bolt_callback_urls_path, class: 'btn btn-primary' %>
     </li>
     <li>
       <%= link_to 'Configure Webhooks', new_admin_bolt_webhook_path, class: 'btn btn-primary' %>

data/bin/sandbox

@@ -49,11 +49,18 @@ fi
 
 cd ./sandbox
 cat <<RUBY >> Gemfile
-gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
+gem "solidus_core", git: "https://github.com/solidusio/solidus.git", ref: '$BRANCH'
+gem "solidus_backend", git: "https://github.com/solidusio/solidus.git", ref: "$BRANCH"
+gem "solidus_api", git: "https://github.com/solidusio/solidus.git", ref: "$BRANCH"
+gem "solidus_sample", git: "https://github.com/solidusio/solidus.git", ref: "$BRANCH"
+gem "solidus_frontend", git: "https://github.com/solidusio/solidus_frontend.git", ref: "$BRANCH"
+
 gem 'solidus_auth_devise', '>= 2.1.0'
 gem 'rails-i18n'
 gem 'solidus_i18n'
 
+gem 'net-smtp', require: false
+
 gem '$extension_name', path: '..'
 
 group :test, :development do

data/config/routes.rb

@@ -4,7 +4,7 @@ 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]
+    resource :bolt_callback_urls, only: [:edit, :update]
   end
 
   post '/webhooks/bolt', to: '/solidus_bolt/webhooks#update'

data/lib/generators/solidus_bolt/install/install_generator.rb

@@ -40,26 +40,46 @@ module SolidusBolt
         solidus_social_initializer_file = 'config/initializers/solidus_social.rb'
         return if File.readlines(solidus_social_initializer_file).grep(/bolt/).any?
 
-        matcher = /amazon: {\n\s*api_key:\sENV\['AMAZON_API_KEY'\],\n\s*api_secret:\sENV\['AMAZON_API_SECRET'\],\n\s*}\n\s*}/m # rubocop:disable Layout/LineLength
+        matcher = /(Spree::SocialConfig\.configure\sdo\s\|config\|.*progname\s=\s'omniauth')/m
+        # rubocop:disable Layout/HeredocIndentation
         a = <<~BOLT_PROVIDER
-          amazon: {
-                api_key: ENV['AMAZON_API_KEY'],
-                api_secret: ENV['AMAZON_API_SECRET'],
-              }
-            }
+        Rails.application.config.to_prepare do
+          Spree::SocialConfig.configure do |c|
+            c.use_static_preferences!
+
+            c.providers = {}
 
             begin
-              config.providers[:bolt] = {
+              c.providers[:bolt] = {
                 api_key: SolidusBolt::BoltConfiguration.fetch.publishable_key,
                 api_secret: SolidusBolt::BoltConfiguration.fetch.api_key,
               }
             rescue StandardError
             end
+          end
+
+          SolidusSocial.init_providers
+        end
+
+        OmniAuth.config.logger = Logger.new(STDOUT)
+        OmniAuth.logger.progname = 'omniauth'
+        OmniAuth.config.allowed_request_methods = [:get]
         BOLT_PROVIDER
+        # rubocop:enable Layout/HeredocIndentation
 
         gsub_file solidus_social_initializer_file, matcher, a
       end
 
+      def add_omniauth_middleware
+        bolt_middleware_initializer = <<~BOLT_PROVIDER
+          Rails.application.config.middleware.use OmniAuth::Builder do
+            provider :bolt, publishable_key: SolidusBolt::BoltConfiguration.fetch.publishable_key,
+                      api_key: SolidusBolt::BoltConfiguration.fetch.api_key
+          end
+        BOLT_PROVIDER
+        append_file 'config/initializers/solidus_social.rb', bolt_middleware_initializer
+      end
+
       def run_migrations
         run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Layout/LineLength
         if run_migrations

data/lib/solidus_bolt/engine.rb

@@ -12,17 +12,19 @@ module SolidusBolt
     engine_name 'solidus_bolt'
 
     initializer "solidus_bolt.add_static_preference", after: "spree.register.payment_methods" do |app|
-      app.config.spree.payment_methods << SolidusBolt::PaymentMethod
-      Spree::Config.static_model_preferences.add(
-        SolidusBolt::PaymentMethod,
-        'bolt_credentials',
-        bolt_credentials_hash
-      )
-      Spree::Config.static_model_preferences.add(
-        SolidusBolt::PaymentMethod,
-        'bolt_config_credentials',
-        bolt_config_credentials_hash
-      )
+      app.config.spree.payment_methods << 'SolidusBolt::PaymentMethod'
+      app.config.to_prepare do
+        Spree::Config.static_model_preferences.add(
+          SolidusBolt::PaymentMethod,
+          'bolt_credentials',
+          ::SolidusBolt::Engine.bolt_credentials_hash
+        )
+        Spree::Config.static_model_preferences.add(
+          SolidusBolt::PaymentMethod,
+          'bolt_config_credentials',
+          ::SolidusBolt::Engine.bolt_config_credentials_hash
+        )
+      end
 
       Spree::PermittedAttributes.source_attributes.concat(%i[
         card_token card_last4 card_bin card_number card_expiration card_postal_code create_bolt_account
@@ -34,29 +36,29 @@ module SolidusBolt
       g.test_framework :rspec
     end
 
-    private
-
-    def bolt_credentials_hash
-      {
-        bolt_api_key: ENV['BOLT_API_KEY'],
-        bolt_signing_secret: ENV['BOLT_SIGNING_SECRET'],
-        bolt_publishable_key: ENV['BOLT_PUBLISHABLE_KEY'],
-      }
-    end
-
-    def bolt_config_credentials_hash
-      begin
-        bolt_config = SolidusBolt::BoltConfiguration.fetch
-      rescue ActiveRecord::StatementInvalid
-        bolt_config = nil
-      ensure
-        bolt_config_hash = {
-          bolt_api_key: bolt_config&.api_key,
-          bolt_signing_secret: bolt_config&.signing_secret,
-          bolt_publishable_key: bolt_config&.publishable_key,
+    class << self
+      def bolt_credentials_hash
+        {
+          bolt_api_key: ENV['BOLT_API_KEY'],
+          bolt_signing_secret: ENV['BOLT_SIGNING_SECRET'],
+          bolt_publishable_key: ENV['BOLT_PUBLISHABLE_KEY'],
         }
       end
-      bolt_config_hash
+
+      def bolt_config_credentials_hash
+        begin
+          bolt_config = SolidusBolt::BoltConfiguration.fetch
+        rescue ActiveRecord::StatementInvalid
+          bolt_config = nil
+        ensure
+          bolt_config_hash = {
+            bolt_api_key: bolt_config&.api_key,
+            bolt_signing_secret: bolt_config&.signing_secret,
+            bolt_publishable_key: bolt_config&.publishable_key,
+          }
+        end
+        bolt_config_hash
+      end
     end
   end
 end

data/lib/solidus_bolt/version.rb

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

data/solidus_bolt.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/nebulab/solidus_bolt'
   spec.metadata['changelog_uri'] = 'https://github.com/nebulab/solidus_bolt/blob/master/CHANGELOG.md'
 
-  spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5')
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'solidus_support', '~> 0.5'
   spec.add_dependency 'tweetnacl'
 
+  spec.add_development_dependency 'net-smtp'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'solidus_dev_support', '~> 2.5'
   spec.add_development_dependency 'vcr'

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

@@ -5,7 +5,7 @@ http_interactions:
     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"}]}'
+      string: '{"division_id":"<DIVISION_PUBLIC_ID>","callback_urls":[{"type":"oauth_redirect","url":"http://localhost:3000/users/auth/bolt"},{"type":"oauth_logout","url":"http://localhost:3000/user/spree_user/logout"},{"type":"get_account","url":"http://localhost:3000/api/accounts/bolt"}]}'
     headers:
       Content-Type:
       - application/json
@@ -23,7 +23,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Tue, 26 Jul 2022 21:17:15 GMT
+      - Wed, 17 Aug 2022 15:39:28 GMT
       Content-Type:
       - application/json; charset=UTF-8
       Content-Length:
@@ -33,22 +33,22 @@ http_interactions:
       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;
+      - trk=4702ac8b-e387-4557-a2d2-eecc98fb0b81; 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
+      - Root=1-62fd0bb0-24e313d41fce5fd10e2eeeda
       X-Device-Id:
-      - 65fb9d676354668c7128f58217c94230e32303007b66559078fee6aefb88e8a4
+      - 2a43c9a2f4fc3f8e06bc3007f8c13908180b0c7555c38d14a7ad494f0a6a4ddb
       X-Envoy-Upstream-Service-Time:
-      - '37'
+      - '45'
       Server:
       - envoy
     body:
       encoding: UTF-8
       string: 'null'
-  recorded_at: Tue, 26 Jul 2022 21:17:15 GMT
+  recorded_at: Wed, 17 Aug 2022 15:39:28 GMT
 recorded_with: VCR 6.1.0

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

@@ -3,12 +3,13 @@
 require 'spec_helper'
 
 RSpec.describe SolidusBolt::MerchantConfiguration::SetCallbackUrlsService, :vcr, :bolt_configuration do
-  subject(:api) { described_class.new(params) }
+  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'
+      oauth_logout: 'http://localhost:3000/user/spree_user/logout',
+      get_account: 'http://localhost:3000/api/accounts/bolt'
     }
   }
 

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'solidus_dev_support/rspec/coverage'
 require 'pry'
 require 'vcr'
 require 'webmock/rspec'
+require 'net/smtp'
 
 # Create the dummy app if it's still missing.
 dummy_env = "#{__dir__}/dummy/config/environment.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bolt
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.1
 platform: ruby
 authors:
 - piyushswain
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -158,6 +158,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +297,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_callback_urls/edit.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
@@ -416,7 +430,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement