flyyer 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e464a893bc3a20b7889928cd9ab42e630219f9a0b6949d7cc932c277fe10d9
-  data.tar.gz: d285616617397391d3f4c424980e39a014d662b3de85850ea50d8be8b931cb80
+  metadata.gz: 46896540d9c40f5d658d5db29f07c082591bb01830e5452fa3f06d5e2dcbbb05
+  data.tar.gz: 651bfc065458eaac875cc2b22afc8e0ad94da5d1f8578fba8ff86f5348feaa7d
 SHA512:
-  metadata.gz: 9068e285b85d5c3fd9d06c23e65eead115f629d99a82bd416441d190ea940a4902478381db17ebe2ee07338bb630b6882d9d9fee1f97e41a6dff5a4785a70528
-  data.tar.gz: 7846e196cbd31432133259794763300f21f332d4a9294f35582b7512f69933d0c228b666ce04b35d125f5797ed24502fc5b067c9ed0aa0fa81140f9a32bf8525
+  metadata.gz: 158126ed6962b386ec0e7858878b62f450d4740cfaa68c9884a8e9e8b19878b363c4ddb700d6a91d491a5fadc071052a3d449ac53e72eb3523bb09473d4238a6
+  data.tar.gz: 1de7b1c5d527e1cd27ea5ab5860a85087218aca6c3f8c00c2f47dad6782addc2346ebefadeb8dcec3976a64976506c5ff9251601b72c039101329402a5c99a99

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flyyer (2.1.0)
+    flyyer (2.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/flyyer/version.rb

@@ -1,3 +1,3 @@
 module Flyyer
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/lib/flyyer.rb

@@ -125,23 +125,24 @@ module Flyyer
         _res: @meta[:resolution] || nil,
         _ua: @meta[:agent] || nil,
       }
-      jwt_defaults = {
-        i: @meta[:id] || nil,
-        w: @meta[:width] || nil,
-        h: @meta[:height] || nil,
-        r: @meta[:resolution] || nil,
-        u: @meta[:agent] || nil,
-        var: @variables,
-      }
       if @strategy && @secret
         key = @secret
         if @strategy.downcase == "hmac"
-          default_query = FlyyerHash.new(defaults).to_query
+          default_query = FlyyerHash.new([defaults, @variables].inject(&:merge)).to_query
+          puts [@deck, @template, @version || "", @extension || "", default_query].join("#")
           data = [@deck, @template, @version || "", @extension || "", default_query].join("#")
           __hmac = OpenSSL::HMAC.hexdigest('SHA256', key, data)[0..15]
           return FlyyerHash.new([defaults, default_v, @variables, {__hmac: __hmac}].inject(&:merge)).to_query
         end
         if @strategy.downcase == "jwt"
+          jwt_defaults = {
+            i: @meta[:id] || nil,
+            w: @meta[:width] || nil,
+            h: @meta[:height] || nil,
+            r: @meta[:resolution] || nil,
+            u: @meta[:agent] || nil,
+            var: @variables,
+          }
           payload = [{ d: @deck, t: @template, v: @version, e: @extension }, jwt_defaults].inject(&:merge)
           __jwt = JWT.encode(payload, key, 'HS256')
           return FlyyerHash.new({ __jwt: __jwt }.merge(default_v)).to_query

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flyyer
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Patricio López Juri
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies: []
 description: FLYYER.io helper classes and methods
 email: