workarea-storefront 3.4.30 → 3.4.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f6fa3a951c3d12fedefc302b38c90265351850580d4dfc159700622e30589c
-  data.tar.gz: e989f30cd502dfc2ccd005bb93f379701548e0e87db65e78bf7414cc865aa71e
+  metadata.gz: 688b10056415b2e71288ba5898f835970ae7d8e19499b0bff0ee149af3a1e3f6
+  data.tar.gz: e16f0d4d08d396dff12da2d1579c75d63f932ed8727eb885ef84b684b7db2923
 SHA512:
-  metadata.gz: 406cf8056c0038a5a035e772c48692e97a5d964be38469582f7fb7f1a7cbfe4f99c9ec2cd2a78c878982028d7b4fadf56421f56fe0670a5cda805363890dfa82
-  data.tar.gz: efc2aeeb8127384987139327f39d7b848c6df3b28c971b6fb16f0d74cda9c1242801b4a69655413eefa720c8f0de7964f075cf5e970f17101faed616d8e3449d
+  metadata.gz: a365225a86ccff17b85c72aff436bdb4630d231e14d280e4f74ab23e3f43d8688972d09536fb8fe47cea1b42c76131cc9523b8775e7a705523fdab74dc14c3db
+  data.tar.gz: 551bf76be5c0e05beadb4cdb4ceb865d7b77b6d30449245b34e408b5305df43782f67784e48452ef8c0de9186ceb477de96d60b7ac5dae28de752959d7c6619f

data/app/controllers/workarea/storefront/users/passwords_controller.rb

@@ -8,7 +8,11 @@ module Workarea
 
     def edit
       reset = User::PasswordReset.find_by(token: params[:token]) rescue nil
-      redirect_to forgot_password_path unless reset
+
+      unless reset
+        flash[:error] = t('workarea.storefront.flash_messages.password_reset_expired')
+        redirect_to forgot_password_path
+      end
     end
 
     def create

data/app/views/workarea/storefront/products/templates/_option_selects.html.haml

@@ -10,6 +10,8 @@
     .product-prices.product-prices--details{ itemprop: 'offers', itemscope: true, itemtype: 'http://schema.org/Offer' }
       = render 'workarea/storefront/products/pricing', product: product
 
+    = append_partials('storefront.product_pricing_details', product: product)
+
     - if product.description.present?
       .product-details__description
         %p= truncated_product_description(product, t('workarea.storefront.products.read_more'))

data/app/views/workarea/storefront/products/templates/_option_thumbnails.html.haml

@@ -10,6 +10,8 @@
     .product-prices.product-prices--details{ itemprop: 'offers', itemscope: true, itemtype: 'http://schema.org/Offer' }
       = render 'workarea/storefront/products/pricing', product: product
 
+    = append_partials('storefront.product_pricing_details', product: product)
+
     - if product.description.present?
       .product-details__description
         %p= truncated_product_description(product, t('workarea.storefront.products.read_more'))

data/test/integration/workarea/storefront/users/passwords_integration_test.rb

@@ -31,6 +31,7 @@ module Workarea
 
         def test_handles_a_missing_password_reset
           get storefront.reset_password_path(token: 'foo')
+          assert(flash[:error].present?)
           assert_redirected_to(storefront.forgot_password_path)
         end
 
@@ -42,6 +43,24 @@ module Workarea
           assert(flash[:error].present?)
           assert(response.redirect?)
         end
+
+        def test_expired_resets
+          post storefront.forgot_password_path, params: { email: 'passwords@workarea.com' }
+          first = User::PasswordReset.desc(:created_at).first
+
+          get storefront.reset_password_path(token: first.token)
+          assert(response.ok?)
+
+          post storefront.forgot_password_path, params: { email: 'passwords@workarea.com' }
+          second = User::PasswordReset.desc(:created_at).first
+
+          get storefront.reset_password_path(token: second.token)
+          assert(response.ok?)
+
+          get storefront.reset_password_path(token: first.token)
+          assert(flash[:error].present?)
+          assert_redirected_to(storefront.forgot_password_path)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-storefront
 version: !ruby/object:Gem::Version
-  version: 3.4.30
+  version: 3.4.31
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.30
+        version: 3.4.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.30
+        version: 3.4.31
 description: Provides user-facing ecommerce storefront functionality for the Workarea
   Commerce Platform.
 email: