shopapp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd35ca9cc34524542e7f1737944d03780e2548e
-  data.tar.gz: b20ac78460821d5a62073c53d48a22b16573291b
+  metadata.gz: 11d8a7b899e944cfb00f6f4185f20d0813d443fd
+  data.tar.gz: 952204164e72577170ad84ffe6a1a3f69b911caa
 SHA512:
-  metadata.gz: 1535e764828d7a99d6c58d66785994dd00843582d83d93ba29f7013d7b702e3b23194eb689a53b0c3fae0154a0878a4cde1161b8e7a0f65d547fcb0409de00c5
-  data.tar.gz: '0878f67ceb98639ed4da44a1ec908ce82fa16a4f0ef496292a1d136d3c62229c3ba1e14d44aded49f1a7c3c359f1b7e6f7678132d3c637d276766a77d219c217'
+  metadata.gz: 79b023e030673c89a256c11f73ff43a2b9b3405f2f72e6693b0808faf433e0f2b0cab4dc97e5942e8ed4f01ef78118985aa74ab654aa631445ccf427eac2eb65
+  data.tar.gz: 5b800820ded0a09c9f054067352a70dd7d89a80ff18a26f29882bafb6c2e893744f55f06189878c265a1f97b4b5b2d33b7d533b97d84b48f4da1dc673744f251

data/app/controllers/concerns/shoplift_client.rb

@@ -83,7 +83,12 @@ module ShopliftClient
     redirect_unauthorized unless authenticate_user
   end
 
-  def authenticate_company!
+  def authenticate_user_or_api!
+    redirect_unauthorized unless authenticate_company!(true)
+  end
+    
+
+  def authenticate_company!(soft = false)
     return if authenticate_user
 
     @api_key = if params['key'].present?
@@ -94,7 +99,10 @@ module ShopliftClient
                  Rails.configuration.settings['authlift_default_app_key']
                end
 
-    fail ActionController::RoutingError, 'Authentication token missing' if @api_key.blank?
+    if @api_key.blank?
+      return false if soft
+      fail ActionController::RoutingError, 'Authentication token missing'
+    end
 
     response = srv.post 'auth/api_key',
                         body: {
@@ -102,7 +110,10 @@ module ShopliftClient
                           requested_action: "#{self.controller_name}##{self.action_name}"
                         }
 
-    fail ActionController::RoutingError, 'Request not authorized' if response.blank?
+    if response.blank?
+      return false if soft
+      fail ActionController::RoutingError, 'Request not authorized'
+    end
 
     @authentication = JSON.parse response.body
     find_company_by_code authentication['company']

data/shopapp.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.0.5'
+  s.version     = '0.0.6'
   s.date        = '2018-01-09'
   s.summary     = 'Do a shoplift.'
   s.description = 'Ha! Art thou Bedlam? Dost thou thirst base Trojan, to have me fold up Parca\'s fatal web? Hence!\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopapp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Zeljko