omniauth-openid-connect 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6684f874a6e6cf6c99e102d128363c74aea21591
-  data.tar.gz: 4eaaf78f7d3831ec4556bd6a11bbf48228619248
+  metadata.gz: 35259c91b0a952af5b6a7adf23b8f9ec8172f850
+  data.tar.gz: 9363495f6379fa1750ef1aae17496a87d7f41180
 SHA512:
-  metadata.gz: e5cb9fc2011ceccc3eaa9b724c08177bca44c1c6f90824b89e439ec403d8dc1d133cca57626785767424707ac0667c634029dbb4420dd36ae885276c25d4e413
-  data.tar.gz: d4cd21adc087562e0251137894288deda422c48eb5a1ecb2706d9702f8bb1c84ee476afdb8edfe52b3424e557febf55494a0d7178e319524081d56921b44c40e
+  metadata.gz: e779b236142b111fd5fe2cffe5f04802e7623a59f71ca078d2ea0548b1bfe8c74f254737583940376731fc1e052ed9e875a364cb89fdfbd03b1ec5bfa6a42ea9
+  data.tar.gz: 5d073d720718c9445cf7adc4ce37e9bd8140b81f3abe9e5024054ac4a81f8c7022592e74f7eac97993c835f87618ca16a985f80927e144018dca21668ceeee74

data/lib/omniauth/openid_connect/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module OpenIDConnect
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/lib/omniauth/strategies/openid_connect.rb

@@ -168,22 +168,7 @@ module OmniAuth
       end
 
       def decode_id_token(id_token)
-        header = JSON.parse(UrlSafeBase64.decode64(id_token.split('.').first))
-        if header.has_key?('kid')
-          keys = public_key.inject({}) do |keys, jwk|
-            key = JSON::JWK.new(jwk)
-            keys.merge! jwk['kid'] => key.to_key.public_key
-          end
-          ::OpenIDConnect::ResponseObject::IdToken.decode(id_token, keys[header[:kid]])
-        else
-          case public_key.class
-            when JSON::JWK::Set
-              jwk = JSON::JWK.new(public_key.first)
-              ::OpenIDConnect::ResponseObject::IdToken.decode(id_token, jwk.to_key)
-            else
-              ::OpenIDConnect::ResponseObject::IdToken.decode(id_token, public_key)
-          end
-        end
+        ::OpenIDConnect::ResponseObject::IdToken.decode(id_token, public_key)
       end
 
 
@@ -232,7 +217,11 @@ module OmniAuth
 
       def parse_jwk_key(key)
         json = JSON.parse(key)
-        JSON::JWK::Set.new json['keys']
+        if json.has_key?('keys')
+          JSON::JWK::Set.new json['keys']
+        else
+          JSON::JWK.new json
+        end
       end
 
       def decode(str)

data/test/lib/omniauth/strategies/openid_connect_test.rb

@@ -313,13 +313,23 @@ class OmniAuth::Strategies::OpenIDConnectTest < StrategyTestCase
     assert(strategy.send :access_token)
   end
 
-  def test_public_key_with_jwk
+  def test_public_key_with_jwks
     strategy.options.client_signing_alg = :RS256
     strategy.options.client_jwk_signing_key = File.read('./test/fixtures/jwks.json')
 
     assert_equal JSON::JWK::Set, strategy.public_key.class
   end
 
+  def test_public_key_with_jwk
+    strategy.options.client_signing_alg = :RS256
+    jwks_str = File.read('./test/fixtures/jwks.json')
+    jwks = JSON.parse(jwks_str)
+    jwk = jwks['keys'].first
+    strategy.options.client_jwk_signing_key = jwk.to_json
+
+    assert_equal JSON::JWK, strategy.public_key.class
+  end
+
   def test_public_key_with_x509
     strategy.options.client_signing_alg = :RS256
     strategy.options.client_x509_signing_key = File.read('./test/fixtures/test.crt')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-openid-connect
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - John Bohn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth