workarea-api-storefront 4.4.6 → 4.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b35914b434546ccc6bfb92e627936a4a7a012686f2a9eb1883390f55d75add
-  data.tar.gz: 1c3c4c602f398f541937a4229f94039c8fce1f23153f2abe6c8257ea2487f558
+  metadata.gz: 46c493a6520203dddfec3bcc9ae914a661040f550c3bc896c2650f2a7756e8f3
+  data.tar.gz: a20ce0a23aa70ad2ca94331a5c14dcbe28e76199428d35a4a34d384a8e1efd56
 SHA512:
-  metadata.gz: d362d53c468c1496de0be57d962177ad21bfc8f2ddcab962ffb06b5fe0f4b11cdce6574cb6119a46847e9f29ee310a6e4e1e683f3679bb345120411e79f372c9
-  data.tar.gz: 8fb0927dff5edcbd5cb69a842d38055d7782dab40e218512a0c96c59dd416528a92d4cca9283c29d0e8e48d8a1c4d111d08d584f5f490cffce51cc7087105d97
+  metadata.gz: 80f9aeca36c57411fbade7179e0029f572fa7af309177b936b3153dcbc5bb36bd83bc5bb35e951770f70130804e72c2581fc2b0b874499dd1549e3f59cba533b
+  data.tar.gz: f5bba158201651ab1bd964cf494363f9e2ccedc0ab44529af467c50b9b0d7eea0a3adcdb3dc48fe588055d16defd9b8de9360a55e2cb7500e932b7713fb8a443

data/LICENSE

@@ -0,0 +1,52 @@
+WebLinc
+Business Source License
+
+Licensor: WebLinc Corporation, 22 S. 3rd Street, 2nd Floor, Philadelphia PA 19106
+
+Licensed Work: Workarea Commerce Platform
+               The Licensed Work is (c) 2019 WebLinc Corporation
+
+Additional Use Grant:
+                      You may make production use of the Licensed Work without an additional license agreement with WebLinc so long as you do not use the Licensed Work for a Commerce Service.
+
+                      A "Commerce Service" is a commercial offering that allows third parties (other than your employees and contractors) to access the functionality of the Licensed Work by creating or managing commerce functionality, the products, taxonomy, assets and/or content of which are controlled by such third parties. 
+
+                      For information about obtaining an additional license agreement with WebLinc, contact licensing@workarea.com.
+
+Change Date: 2019-08-20
+
+Change License: Version 2.0 or later of the GNU General Public License as published by the Free Software Foundation
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative works, redistribute, and make non-production use of the Licensed Work. The Licensor may make an Additional Use Grant, above, permitting limited production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly available distribution of a specific version of the Licensed Work under this License, whichever comes first, the Licensor hereby grants you rights under the terms of the Change License, and the rights granted in the paragraph above terminate.
+
+If your use of the Licensed Work does not comply with the requirements currently in effect as described in this License, you must purchase a commercial license from the Licensor, its affiliated entities, or authorized resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works of the Licensed Work, are subject to this License. This License applies separately for each version of the Licensed Work and the Change Date may vary for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy of the Licensed Work. If you receive the Licensed Work in original or modified form from a third party, the terms and conditions set forth in this License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically terminate your rights under this License for the current and all other versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License). TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE. MariaDB hereby grants you permission to use this License’s text to license your works and to refer to it using the trademark "Business Source License" as long as you comply with the Covenants of Licensor below.
+
+Covenants of Licensor
+In consideration of the right to use this License’s text and the "Business Source License" name and trademark, Licensor covenants to MariaDB, and to all other recipients of the licensed work to be provided by Licensor:
+
+To specify as the Change License the GPL Version 2.0 or any later version, or a license that is compatible with GPL Version 2.0 or a later version, where "compatible" means that software provided under the Change License can be included in a program with software provided under GPL Version 2.0 or a later version. Licensor may specify additional Change Licenses without limitation.
+
+To either: (a) specify an additional grant of rights to use that does not impose any additional restriction on the right granted in this License, as the Additional Use Grant; or (b) insert the text "None."
+
+To specify a Change Date.
+
+Not to modify this License in any other way.
+
+Notice
+The Business Source License (this document, or the "License") is not an Open Source license. However, the Licensed Work will eventually be made available under an Open Source License, as stated in this License.
+
+For more information on the use of the Business Source License generally, please visit the Adopting and Developing Business Source License FAQ.
+
+License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved. "Business Source License" is a trademark of MariaDB Corporation Ab.

data/README.md

@@ -48,11 +48,8 @@ curl \
   "http://yourincredibleheadlesscommercesolution.biz/api/carts.json"
 ```
 
-## Copyright & Licensing
+License
+--------------------------------------------------------------------------------
+Workarea Commerce Platform is released under the [Business Software License](https://github.com/workarea-commerce/workarea/blob/master/LICENSE)
 
-Copyright Workarea 2017-2019. All rights reserved.
-
-For licensing, contact [sales@workarea.com][].
-
-[Workarea API]: https://homebase.weblinc.com/plugins/workarea-api-admin
-[sales@workarea.com]: mailto:sales@workarea.com
+[Workarea API]: https://github.com/workarea-commerce/workarea-api

data/app/controllers/workarea/api/storefront/analytics_controller.rb

@@ -1,38 +1,50 @@
 module Workarea
   module Api
     module Storefront
-      class AnalyticsController < ActionController::Metal
-        include ActionController::Head
-        include ActionController::Instrumentation
-
+      class AnalyticsController < Api::Storefront::ApplicationController
         def category_view
           Metrics::CategoryByDay.inc(key: { category_id: params[:category_id] }, views: 1)
+
+          if current_metrics_id.present?
+            Metrics::User.save_affinity(
+              id: current_metrics_id,
+              action: 'viewed',
+              category_ids: params[:category_id]
+            )
+          end
+
           head :ok
         end
 
         def product_view
           Metrics::ProductByDay.inc(key: { product_id: params[:product_id] }, views: 1)
+
+          if current_metrics_id.present?
+            Metrics::User.save_affinity(
+              id: current_metrics_id,
+              action: 'viewed',
+              product_ids: params[:product_id]
+            )
+          end
+
           head :ok
         end
 
         def search
-          Metrics::SearchByDay.save_search(params[:q], params[:total_results])
-          head :ok
-        end
+          query_string = QueryString.new(params[:q])
 
-        def search_abandonment
-          warn <<~eos
-DEPRECATION WARNING: Search abandonment tracking is deprecated and will be removed \
-in Workarea 3.5.
-          eos
-          head :ok
-        end
+          if query_string.present? && !query_string.short?
+            Metrics::SearchByDay.save_search(params[:q], params[:total_results])
+
+            if current_metrics_id.present?
+              Metrics::User.save_affinity(
+                id: current_metrics_id,
+                action: 'viewed',
+                search_ids: query_string.id
+              )
+            end
+          end
 
-        def filters
-          warn <<~eos
-DEPRECATION WARNING: Filter analytics tracking is deprecated and will be removed \
-in Workarea 3.5.
-          eos
           head :ok
         end
       end

data/app/controllers/workarea/api/storefront/application_controller.rb

@@ -2,15 +2,15 @@ module Workarea
   module Api
     module Storefront
       class ApplicationController < Workarea::ApplicationController
-        include Workarea::Storefront::HttpCaching
+        include HttpCaching
         include Api::Storefront::Authentication
-        include Api::Storefront::UserActivity
 
         respond_to :json
 
         before_action :set_json_format
         before_action :skip_session
         before_action { params.permit! }
+        around_action :apply_segments
         after_action :disable_cors_protection
 
         rescue_from Mongoid::Errors::DocumentNotFound, with: :handle_not_found
@@ -28,6 +28,19 @@ module Workarea
           request.session_options[:skip] = true
         end
 
+        def assert_current_metrics_id
+          if current_metrics_id.blank?
+            render(
+              json: {
+                problem: t('workarea.api.storefront.recent_views.missing_id')
+              },
+              status: :unprocessable_entity
+            )
+
+            return false
+          end
+        end
+
         private
 
         def set_json_format

data/app/controllers/workarea/api/storefront/authentication.rb

@@ -10,19 +10,16 @@ module Workarea
           helper_method :current_user
         end
 
-        def current_user
-          return @current_user if defined?(@current_user)
-
-          user = authenticate_with_http_token do |token, options|
-            User::AuthenticationToken.authenticate(token, options).try(:user)
-          end
+        def self.find_user(token, options)
+          User::AuthenticationToken.authenticate(token, options).try(:user)
+        end
 
-          @current_user = user || raise(InvalidError)
+        def current_user
+          current_visit.current_user || raise(InvalidError)
         end
 
         def authentication?
-          regex = ActionController::HttpAuthentication::Token::TOKEN_REGEX
-          request.authorization.to_s[regex].present?
+          current_visit.logged_in?
         end
       end
     end

data/app/controllers/workarea/api/storefront/categories_controller.rb

@@ -5,7 +5,7 @@ module Workarea
         before_action :cache_page
 
         def index
-          models = Catalog::Category.active.page(params[:page])
+          models = Catalog::Category.page(params[:page]).select(&:active?)
           @categories = Workarea::Storefront::CategoryViewModel.wrap(
             models,
             view_model_options
@@ -14,6 +14,8 @@ module Workarea
 
         def show
           model = Catalog::Category.find_by(slug: params[:id])
+          raise InvalidDisplay unless model.active?
+
           @category = Workarea::Storefront::CategoryViewModel.wrap(
             model,
             view_model_options

data/app/controllers/workarea/api/storefront/checkouts_controller.rb

@@ -96,7 +96,6 @@ module Workarea
           if authentication?
             current_order.touch_checkout!(
               ip_address: request.remote_ip,
-              user_activity_id: current_user.id,
               checkout_by_id: current_user.id,
               source: 'storefront_api'
             )

data/app/controllers/workarea/api/storefront/menus_controller.rb

@@ -10,7 +10,9 @@ module Workarea
         end
 
         def show
-          model = Navigation::Menu.active.find(params[:id])
+          model = Navigation::Menu.find(params[:id])
+          raise InvalidDisplay unless model.active?
+
           @menu = Workarea::Storefront::MenuViewModel.wrap(model, params)
         end
       end

data/app/controllers/workarea/api/storefront/pages_controller.rb

@@ -5,7 +5,9 @@ module Workarea
         before_action :cache_page
 
         def show
-          model = Content::Page.active.find_by(slug: params[:id])
+          model = Content::Page.find_by(slug: params[:id])
+          raise InvalidDisplay unless model.active?
+
           @page = Workarea::Storefront::PageViewModel.new(model, view_model_options)
         end
       end

data/app/controllers/workarea/api/storefront/products_controller.rb

@@ -5,7 +5,9 @@ module Workarea
         before_action :cache_page
 
         def show
-          model = Workarea::Catalog::Product.active.find_by(slug: params[:id])
+          model = Workarea::Catalog::Product.find_by(slug: params[:id])
+          raise InvalidDisplay unless model.active?
+
           @product = Workarea::Storefront::ProductViewModel.wrap(
             model,
             view_model_options

data/app/controllers/workarea/api/storefront/recent_views_controller.rb

@@ -2,39 +2,26 @@ module Workarea
   module Api
     module Storefront
       class RecentViewsController < Api::Storefront::ApplicationController
-        before_action :assert_current_user_activity_id
+        before_action :assert_current_metrics_id
 
         def show
-          if stale?(
-            etag: user_activity,
-            last_modified: user_activity.updated_at,
-            public: true
+          @recent_views = Workarea::Storefront::UserActivityViewModel.new(
+            current_metrics
           )
-            @recent_views = Workarea::Storefront::UserActivityViewModel.new(
-              user_activity
-            )
-          end
         end
 
         def update
-          if params[:product_id].present?
-            Recommendation::UserActivity.save_product(
-              current_user_activity_id,
-              params[:product_id]
-            )
-          end
-
-          if params[:category_id].present?
-            Recommendation::UserActivity.save_category(
-              current_user_activity_id,
-              params[:category_id]
-            )
-          end
+          product_ids = Array.wrap(params[:product_id])
+          category_ids = Array.wrap(params[:category_id])
+          search_ids = Array.wrap(params[:search])
 
-          if params[:search].present?
-            Recommendation::UserActivity.save_search(
-              current_user_activity_id,
-              params[:search]
+          if current_metrics_id.present?
+            Metrics::User.save_affinity(
+              id: current_metrics_id,
+              action: 'viewed',
+              product_ids: product_ids,
+              category_ids: category_ids,
+              search_ids: search_ids
             )
           end
 

data/app/controllers/workarea/api/storefront/recommendations_controller.rb

@@ -2,17 +2,11 @@ module Workarea
   module Api
     module Storefront
       class RecommendationsController < Api::Storefront::ApplicationController
-        before_action :assert_current_user_activity_id
+        before_action :assert_current_metrics_id
 
         def show
-          fresh_when(
-            etag: user_activity,
-            last_modified: user_activity.updated_at,
-            public: true
-          )
-
           @recommendations = Workarea::Storefront::PersonalizedRecommendationsViewModel.new(
-            user_activity,
+            current_metrics,
             view_model_options
           )
         end

data/app/controllers/workarea/api/storefront/searches_controller.rb

@@ -4,18 +4,6 @@ module Workarea
       class SearchesController < Api::Storefront::ApplicationController
         before_action :cache_page
 
-        def index
-          search_query = QueryString.new(params[:q]).sanitized
-
-          render(nothing: true) && (return) if search_query.blank?
-          autocomplete_params = params.permit(:q)
-          search = Search::SearchSuggestions.new(autocomplete_params)
-
-          @results = search.results.map do |result|
-            SearchSuggestionViewModel.new(result).to_h
-          end
-        end
-
         def show
           response = Search::StorefrontSearch.new(params.to_unsafe_h).response
           @search = Workarea::Storefront::SearchViewModel.new(

data/app/views/workarea/api/storefront/categories/show.json.jbuilder

@@ -14,7 +14,7 @@ json.cache! @category.cache_key, expires_in: 1.hour do
     json.partial! 'workarea/api/storefront/taxons/taxon', taxon: taxon
   end
 
-  json.content_blocks @category.content.blocks do |block|
+  json.content_blocks @category.content.blocks.select(&:active?) do |block|
     json.partial! 'workarea/api/storefront/content_blocks/block', block: block
   end
 

data/app/views/workarea/api/storefront/email_signups/show.json.jbuilder

@@ -1,4 +1,4 @@
 json.title @email_signup.title
-json.content_blocks @email_signup.content.blocks do |block|
+json.content_blocks @email_signup.content.blocks.select(&:active?) do |block|
   json.partial! 'workarea/api/storefront/content_blocks/block', block: block
 end

data/app/views/workarea/api/storefront/menus/_menu.json.jbuilder

@@ -5,7 +5,7 @@ json.cache! menu.cache_key, expires_in: 1.hour do
   json.url menu_path(menu)
   json.taxon_url menu.taxon.url.presence || storefront_api_url_for(menu.taxon)
 
-  json.content_blocks menu.content.blocks do |block|
+  json.content_blocks menu.content.blocks.select(&:active?) do |block|
     json.partial! 'workarea/api/storefront/content_blocks/block', block: block
   end
 end

data/app/views/workarea/api/storefront/pages/show.json.jbuilder

@@ -10,7 +10,7 @@ json.cache! @page.cache_key, expires_in: 1.hour do
     json.partial! 'workarea/api/storefront/taxons/taxon', taxon: taxon
   end
 
-  json.content_blocks @page.content.blocks do |block|
+  json.content_blocks @page.content.blocks.select(&:active?) do |block|
     json.partial! 'workarea/api/storefront/content_blocks/block', block: block
   end
 end

data/app/views/workarea/api/storefront/recent_views/show.json.jbuilder

@@ -5,4 +5,3 @@ end
 json.products @recent_views.products do |product|
   json.partial! 'workarea/api/storefront/products/product', product: product
 end
-json.searches @recent_views.searches

data/app/views/workarea/api/storefront/searches/show.json.jbuilder

@@ -4,7 +4,7 @@ json.redirect @search.redirect
 json.sorts @search.sorts
 json.sort @search.sort
 
-json.content_blocks @search.content.blocks do |block|
+json.content_blocks @search.content.blocks.select(&:active?) do |block|
   json.partial! 'workarea/api/storefront/content_blocks/block', block: block
 end
 

data/app/views/workarea/api/storefront/system_content/show.json.jbuilder

@@ -6,7 +6,7 @@ json.cache! @content.cache_key, expires_in: 1.hour do
   json.browser_title @content.browser_title
   json.meta_description @content.meta_description
 
-  json.content_blocks @content.content.blocks do |block|
+  json.content_blocks @content.content.blocks.select(&:active?) do |block|
     json.partial! 'workarea/api/storefront/content_blocks/block', block: block
   end
 end

data/config/initializers/config.rb

@@ -1,2 +1,21 @@
 Workarea.config.api_product_image_jobs_blacklist ||= %i[convert encode rotate optim avatar thumb]
 Workarea.config.authentication_token_expiration ||= 1.week
+
+# Ok, this one's a doozy.
+#
+# To deliver segmentation in the storefront API, we need a way to change a
+# {Visit}'s definition of things like sessions, cookies, auth, etc.
+#
+# Since segments are determined first (before any other middleware), we need a
+# way to know whether this is an API request to for logic in {Visit}.
+#
+# Since this is before any other middleware (including Rails' routing), we don't
+# have a way to check the controller class or anything else application-related
+# for whether it's an API request or an ordinary request.
+#
+# The best thing I could come up with is this regex. This lambda provides a hook
+# for builds in case it doesn't work. They can provide their own logic here.
+#
+Workarea.config.is_api_visit = lambda do |request|
+  request.original_url =~ /:\/\/api\.|\/api\/./
+end