hermes_api 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfeafd10d08ea6ffa236a36b66d94dc11f3b7883931aade9995a93488d9a17e9
-  data.tar.gz: 3d4fb22d7d6f794988fedbefc1d79c384b744a13085fb9b9e6073fed00bd7638
+  metadata.gz: 87f92e8ae4fdbdc63d9e57027707610b8e46beb0017887e3653b30fb7100917e
+  data.tar.gz: 9943983c9eb55d666baf6941450a5c960df500af17a653bd4f4c652b949b581d
 SHA512:
-  metadata.gz: 4fc203dac84c6484c990dcca4d2c070c083d8f0c588d465daa6c3de2eb0a02a0c2523376d9d30e9d37e2dc518c20b57b76c63c80070c5c45dc90404e6a5b46c8
-  data.tar.gz: 59160916b4fe767ead70309ef93f7c67c0392c577159ccde3f6d8fb8bded452194401db92781636cce250be07b614723461729d61fc9144fac4b153659051c45
+  metadata.gz: b0424b7e0049fd9fba5c542b22007b6232e5188f11c7711d4fcdab8d8255957d7382a04a8a7e66cb8ed0ef226021971ae0ebd76f1808f125c204ec81f5939038
+  data.tar.gz: 8118f608d127c49d58c843136d6269553dcabfccff2e05fe703dbbbafd970dfe86f280321252d54a8b7f38f17ed0c4977604094c2134696cb6bdad9c26fec81f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hermes_api (0.3.1)
+    hermes_api (0.5.1)
       activeresource (>= 4.1.0, < 6.0.0)
 
 GEM

data/lib/dev/config.rb

@@ -2,12 +2,7 @@ require "dotenv/load"
 
 def set_config
   HermesAPI.configure do |config|
-    config.user = ENV["HERMES_API_USER"]
-    config.password = ENV["HERMES_API_PASSWORD"]
-    config.env = :test
+    config.env = :production
     config.proxy = ENV["HERMES_API_PROXY"]
-    config.auth_id = ENV["HERMES_API_AUTH_ID"]
-    config.auth_secret = ENV["HERMES_API_AUTH_SECRET"]
-    config.api_key = ENV["HERMES_API_KEY"]
   end
 end

data/lib/hermes_api/bearer_auth.rb

@@ -0,0 +1,40 @@
+module HermesAPI
+  module BearerAuth
+    def with_oauth_session(api_key, client_id, client_secret)
+      existing_apikey = headers["apikey"]
+      existing_bearer_token = connection.bearer_token
+      headers["apikey"] = api_key
+      connection.bearer_token = fetch_token(client_id, client_secret)
+      response = yield
+      headers["apikey"] = existing_apikey
+      connection.bearer_token = existing_bearer_token
+      response
+    rescue ActiveResource::UnauthorizedAccess => e
+      clear_token_cache(client_id, client_secret)
+      raise e
+    end
+
+    def oauth_audience
+      prefix.match(/^\/?([^\/]*)/).captures.first
+    end
+
+    def clear_token_cache(client_id, client_secret)
+      cache_key = "HermesAPI/#{client_id}/#{client_secret}/#{oauth_audience}/oauth_token"
+      HermesAPI.cache.delete(cache_key)
+    end
+
+    def fetch_token(client_id, client_secret)
+      cache_key = "HermesAPI/#{client_id}/#{client_secret}/#{oauth_audience}/oauth_token"
+      cached_token = HermesAPI.cache.read(cache_key)
+      return cached_token if cached_token
+
+      response = OAuth.create(audience: oauth_audience, client_id: client_id, client_secret: client_secret)
+      HermesAPI.cache.write(
+        cache_key,
+        response.access_token,
+        expires_in: response.expires_in - 15 # clear cache earlier
+      )
+      response.access_token
+    end
+  end
+end

data/lib/hermes_api/cache.rb

@@ -1,10 +1,5 @@
 module HermesAPI
   mattr_accessor :cache
 
-  self.cache = if defined?(Rails) && Rails.respond_to?(:cache) &&
-                  Rails.cache.is_a?(ActiveSupport::Cache::Store)
-    Rails.cache
-  else
-    ActiveSupport::Cache::MemoryStore.new
-  end
-end
+  self.cache = ActiveSupport::Cache::MemoryStore.new
+end

data/lib/hermes_api/configuration.rb

@@ -1,6 +1,6 @@
 module HermesAPI
   class Configuration
-    attr_accessor :proxy, :env, :user, :password, :auth_id, :auth_secret, :api_key
+    attr_accessor :proxy, :env
   end
 
   PRODUCTION_SITE = "https://www.hermes-europe.co.uk"
@@ -10,9 +10,9 @@ module HermesAPI
   OAUTH_TESTING_SITE = "https://hermes-client-integration-pre.eu.auth0.com"
 
   JSON_PRODUCTION_SITE = "https://api.hermesworld.co.uk"
-  JSON_TESTING_SITE = "https://api.hermesworld.co.uk"
   # temporarily disabled until it is fixed
   # JSON_TESTING_SITE = "https://hermeslive-pre-prod.apigee.net"
+  JSON_TESTING_SITE = JSON_PRODUCTION_SITE
 
   class << self
     def config
@@ -22,13 +22,13 @@ module HermesAPI
     def after_configure
       HermesAPI::Base.site = config.env.to_s == "production" ? PRODUCTION_SITE : TESTING_SITE
       HermesAPI::Base.proxy = config.proxy
-      HermesAPI::Base.user = config.user
-      HermesAPI::Base.password = config.password
 
       HermesAPI::JsonBase.site = config.env.to_s == "production" ? JSON_PRODUCTION_SITE : JSON_TESTING_SITE
       HermesAPI::OAuth.site = config.env.to_s == "production" ? OAUTH_PRODUCTION_SITE : OAUTH_TESTING_SITE
 
-      HermesAPI::JsonBase.headers["apikey"] = config.api_key
+      if defined?(Rails) && Rails.respond_to?(:cache) && Rails.cache.is_a?(ActiveSupport::Cache::Store)
+        HermesAPI.cache = Rails.cache
+      end
     end
 
     def configure

data/lib/hermes_api/resources/json_base.rb

@@ -2,5 +2,9 @@ module HermesAPI
   class JsonBase < ActiveResource::Base
     self.include_format_in_path = false
     self.auth_type = :bearer
+
+    def self.inherited(subclass)
+      subclass.extend(BearerAuth)
+    end
   end
 end

data/lib/hermes_api/resources/o_auth.rb

@@ -1,17 +1,15 @@
 module HermesAPI
   class OAuth < ActiveResource::Base
     self.include_format_in_path = false
-    self.element_name=""
-    self.prefix="/oauth/token"
+    self.element_name = ""
+    self.prefix = "/oauth/token"
 
     def initialize(attributes = {}, persisted = false)
       attributes = {
         grant_type: "client_credentials",
-        client_id: HermesAPI.config.auth_id,
-        client_secret: HermesAPI.config.auth_secret,
         **attributes
       }
       super
     end
   end
-end
+end

data/lib/hermes_api/resources/print_in_store_qr_code.rb

@@ -1,7 +1,5 @@
 module HermesAPI
   class PrintInStoreQrCode < JsonBase
-    extend BearerTokenSetup
-
     self.element_name = ""
     self.prefix = "/client-print-in-store-api/v1/references"
 

data/lib/hermes_api/resources/return_label.rb

@@ -1,9 +1,56 @@
-"
-Create return label(s).
-You can choose to create a batch of return labels by passing in multiple collectionRoutingRequestEntry.
-"
 module HermesAPI
   class ReturnLabel < Base
+    # Create return label(s).
+    # You can choose to create a batch of return labels by passing in multiple collectionRoutingRequestEntry.
+    # Example:
+    # HermesAPI::Base.with_session("username", "password") do
+    #   request_body = {clientId: "1234",
+    #                   clientName: "Life",
+    #                   childClientId: "",
+    #                   childClientName: "",
+    #                   sourceOfRequest: "CLIENTWS",
+    #                   collectionRoutingRequestEntries: [{ #collectionRoutingRequestEntry
+    #                     customer: {
+    #                       address: {
+    #                         firstName: "Leonie", lastName: "E", houseName: "2", streetName: "Street",
+    #                         addressLine1: "2 Street", addressLine2: "Fulham", postCode: "SW6 6EL",
+    #                         city: "London", region: "", countryCode: "GB"
+    #                       },
+    #                       mobilePhoneNo: "+447884571522",
+    #                       email: "leonie@london.com",
+    #                       customerReference1: "8284"
+    #                     },
+    #                     countryOfOrigin: "GB"
+    #                   }]}
+    #   @order = HermesAPI::ReturnLabel.new(request_body)
+    #   @order.save
+    #
+    #   # Request for a single print in store QR code by wrapping in an oauth session block, only work with 1 label.
+    #   # To request a batch of QR codes, use the HermesAPI::PrintInStoreQrCode#create directly.
+    #
+    #   HermesAPI::PrintInStoreQrCode.with_oauth_session("api_key", "client_id/auth_id", "client_secret/auth_secret") do
+    #     @order.request_print_in_store_qr_code(
+    #       deliveryAddress: {
+    #         name: "Andy",
+    #         addressLine1: "7 Street",
+    #         addressLine2: "Fulham",
+    #         countryCode: "GB",
+    #         postcode: "SW6 6EL"
+    #       },
+    #       dimensions: {
+    #         depth: 15,
+    #         length: 20,
+    #         width: 15,
+    #         weight: 1
+    #       },
+    #       value: {
+    #         currency: "GBP",
+    #         amount: 10
+    #       }
+    #     )
+    #   end
+    # end
+    #
     self.prefix = "/routing/service/rest/v4/createReturnBarcodeAndLabel"
     self.element_name = ""
 
@@ -79,7 +126,6 @@ module HermesAPI
       barcode = carrier.barcode1
       customer = collectionRoutingRequestEntries[0].customer
       address = customer.address
-
       self.print_in_store_qr_code = PrintInStoreQrCode.create(
         customer: {
           customerReference1: customer.customerReference1
@@ -112,27 +158,27 @@ module HermesAPI
 
     def request_print_in_store_qr_code_error_message
       <<~HEREDOC
-      Missing attributes
-      Example:
-      HermesAPI::ReturnLabel#request_print_in_store_qr_code(
-        dimensions: {
-          depth: 15,
-          length: 20,
-          width: 15,
-          weight: 1
-        },
-        value: {
-          currency: 'GBP',
-          amount: 10
-        },
-        deliveryAddress: {
-          name: 'Don Joe',
-          addressLine1: 'Real Logic',
-          addressLine2: '4-4 Ridings Park, Eastern Way',
-          countryCode: 'GB',
-          postcode: 'WS117FJ'
-        }
-      )
+        Missing attributes
+        Example:
+        HermesAPI::ReturnLabel#request_print_in_store_qr_code(
+          dimensions: {
+            depth: 15,
+            length: 20,
+            width: 15,
+            weight: 1
+          },
+          value: {
+            currency: 'GBP',
+            amount: 10
+          },
+          deliveryAddress: {
+            name: 'Don Joe',
+            addressLine1: 'Real Logic',
+            addressLine2: '4-4 Ridings Park, Eastern Way',
+            countryCode: 'GB',
+            postcode: 'WS117FJ'
+          }
+        )
       HEREDOC
     end
   end

data/lib/hermes_api/resources/tracking_event.rb

@@ -1,6 +1,10 @@
 module HermesAPI
   class TrackingEvent < JsonBase
-    extend BearerTokenSetup
+    #   # Retrieve TrackingEvents by wrapping in an oauth session block
+    #
+    #   HermesAPI::TrackingEvent.with_oauth_session("api_key", "client_id/auth_id", "client_secret/auth_secret") do
+    #     HermesAPI::TrackingEvent.where(barcode: "123456789")
+    #   end
 
     self.element_name = ""
     self.prefix = "/client-tracking-api/v1/events"

data/lib/hermes_api/resources/web_tracking.rb

@@ -23,6 +23,8 @@ module HermesAPI
 
     def self.find(barcode)
       uniqueId = format.decode(connection.get("#{prefix}/search/#{barcode}", headers).body).first
+      return nil if uniqueId.nil?
+
       find_single("", params: {uniqueIds: uniqueId})
     end
   end

data/lib/hermes_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HermesAPI
-  VERSION = "0.4.0"
+  VERSION = "0.5.2"
 end

data/lib/hermes_api.rb

@@ -5,6 +5,7 @@ require "active_resource"
 
 module HermesAPI
   require "hermes_api/cache"
+  require "hermes_api/bearer_auth"
   require "hermes_api/configuration"
   require "hermes_api/creation_error"
   require "hermes_api/connection"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hermes_api
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Andy Chong
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -151,7 +151,7 @@ files:
 - lib/dev/config.rb
 - lib/dev/zeitwerk_loader.rb
 - lib/hermes_api.rb
-- lib/hermes_api/bearer_token_setup.rb
+- lib/hermes_api/bearer_auth.rb
 - lib/hermes_api/cache.rb
 - lib/hermes_api/configuration.rb
 - lib/hermes_api/connection.rb

data/lib/hermes_api/bearer_token_setup.rb

@@ -1,23 +0,0 @@
-module HermesAPI
-  module BearerTokenSetup
-    def connection(refresh = false)
-      connection = super
-      connection.bearer_token = fetch_token
-      connection
-    end
-
-    def fetch_token
-      oauth_audience = prefix.match(/^\/?([^\/]*)/).captures.first
-      cached_token = HermesAPI.cache.read("#{oauth_audience}/oauth_token")
-      return cached_token if cached_token
-
-      response = OAuth.create(audience: oauth_audience)
-      HermesAPI.cache.write(
-        "#{oauth_audience}/oauth_token",
-        response.access_token,
-        expires_in: response.expires_in - 15 # clear cache earlier
-      )
-      response.access_token
-    end
-  end
-end