lightrail_client 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c6b4592ac7e30408700f5d577f53a4aadbd35b8
-  data.tar.gz: e12987b5719e1399001fca35e5e612fbac84acb5
+  metadata.gz: d4b03b92b6056752123712d93bc1e574be852468
+  data.tar.gz: 7bf40af48e0fdf721dc0507e8636ac392f200a33
 SHA512:
-  metadata.gz: aad950b69d0821be109cf07e2523697d30b9c3e5a09a280755ccaa7d0dc3a389ca2bee54566a9107d2c9d364c0ccf62925e60931a99c9c3b7135c0331ebc704b
-  data.tar.gz: d721b386ccc2fb6d99a95c4d882284064db901ecf573045a74e9aaec25c6a94ab5daada340b7aedbfee08feeb798064bbd0c07102e319e11b125be92edfa8c45
+  metadata.gz: 72a74728a92d19ae2236e7ded5ad73ba364351d7dcbe99e6baccf885413cb6b48ce5f875b4d26c458bef912fea4dd56dfb1fa86730daff7e6ed084028a803205
+  data.tar.gz: 16874d6fb03e23c298996710ad3c0aa6a949f0a9b50d0ec77927a47f0e4725dec6adce72aad4aaca2bdf80b25d97435339c1aa14204422408b6e5d6285f49682

data/README.md

@@ -295,6 +295,14 @@ After checking out the repo, run `bin/setup` to install dependencies, then run `
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
+### Publishing
+
+Make sure to bump the version number before publishing changes. 
+
+Run `gem build lightrail_client` to build the gem locally. The output will contain the gem name, version, and filename of the built `.gem`. 
+
+Run `gem push {{filename}}` to publish to RubyGems. 
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/lightrail_client/shopper_token_factory.rb

@@ -1,6 +1,6 @@
 module Lightrail
   class ShopperTokenFactory
-    def self.generate (contact, validity_in_seconds=nil)
+    def self.generate (contact, options=nil)
       raise Lightrail::BadParameterError.new("Lightrail::api_key is not set") unless Lightrail::api_key
       raise Lightrail::BadParameterError.new("Lightrail::shared_secret is not set") unless Lightrail::shared_secret
 
@@ -9,14 +9,33 @@ module Lightrail
           Lightrail::Validator.has_valid_user_supplied_id?(contact))
 
       g = {}
-      if (Lightrail::Validator.has_valid_or_empty_shopper_id?(contact))
+      if Lightrail::Validator.has_valid_or_empty_shopper_id?(contact)
         g['shi'] = Lightrail::Validator.get_shopper_id(contact)
-      elsif (Lightrail::Validator.has_valid_contact_id?(contact))
+      elsif Lightrail::Validator.has_valid_contact_id?(contact)
         g['coi'] = Lightrail::Validator.get_contact_id(contact)
-      elsif (Lightrail::Validator.has_valid_user_supplied_id?(contact))
+      elsif Lightrail::Validator.has_valid_user_supplied_id?(contact)
         g['cui'] = Lightrail::Validator.get_user_supplied_id(contact)
       end
 
+      validity_in_seconds = 43200
+      metadata = nil
+      if !options
+        # no-op
+      elsif options.is_a?(Numeric)
+        # support for legacy code when options was validity_in_seconds
+        validity_in_seconds = options
+      elsif options.is_a?(Hash)
+        if options.has_key?(:validity_in_seconds)
+          validity_in_seconds = options[:validity_in_seconds]
+        end
+        if options.has_key?(:metadata)
+          metadata = options[:metadata]
+        end
+      end
+
+      if validity_in_seconds <= 0
+        raise Lightrail::LightrailArgumentError.new("validity_in_seconds must be > 0")
+      end
 
       payload = Lightrail::api_key.split('.')
       payload = JSON.parse(Base64.decode64(payload[1]))
@@ -28,14 +47,15 @@ module Lightrail
       payload = {
           g: g,
           iat: iat,
+          exp: iat + validity_in_seconds,
           iss: "MERCHANT"
       }
 
-      if validity_in_seconds
-        payload['exp'] = iat + validity_in_seconds
+      if metadata
+        payload["metadata"] = metadata
       end
 
       JWT.encode(payload, Lightrail::shared_secret, 'HS256')
     end
   end
-end
+end

data/lib/lightrail_client/version.rb

@@ -1,3 +1,3 @@
 module Lightrail
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightrail_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Lightrail
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler