omniauth-apple 1.3.0.alpha → 1.3.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfa80b37505eab851337bde06806ca93b16a36d0bba69c25a379842107a53672
-  data.tar.gz: 001a183e434b6bca8096c78b6dd78d4eb44519bef7a063c0774ac0b269a8b261
+  metadata.gz: ccdbe86490c5f075471da1d840b32d7cf2d8fff5269f69e28b8a1f3bd2fc181e
+  data.tar.gz: '08e94e6b4c9e87ae72d1e0e311c389a920dead7925a9ffe7debb128c71fd7024'
 SHA512:
-  metadata.gz: 95c48a4e63f6d8a92655ad3537061cd3877f68114954645cce888e0e1456986164166e28b3c7adffff50bc650dce217a29b34f8004190ddcf346d33c657b1987
-  data.tar.gz: fde578a7e24aabdf416b46a622753ba86121581898313a367bdbee09495adca1b039c272101a521839294763381c8cb5514bcfc4f81cb469a576857231f46ac4
+  metadata.gz: 200b3f18382054a6571771f4f5f6856192d5df2b185f8f4af2848d25ecde5411f0e91177f5b418e92db1c229b4fe90af54e83ece8aee2f8820af3225c2ff534d
+  data.tar.gz: 9440a958201d0506cc153ded2a1d9ed82819611c4beae85eb80b96ec9624a99838866445bb217dd88a4062c674c8348511341cc8e2d7d6be3ec64476a2917a3c

data/lib/omniauth/apple/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Apple
-    VERSION = '1.3.0.alpha'
+    VERSION = '1.3.0.alpha2'
   end
 end

data/lib/omniauth/strategies/apple.rb

@@ -77,20 +77,27 @@ module OmniAuth
         @id_info ||= if request.params&.key?('id_token') || access_token&.params&.key?('id_token')
                        id_token_str = request.params['id_token'] || access_token.params['id_token']
                        id_token = JSON::JWT.decode(id_token_str, :skip_verification)
-                       if (jwk = fetch_jwk(id_token.kid))
-                         id_token.verify! jwk
-                         verify_claims!(id_token)
-                         id_token
-                       else
-                         {}
-                       end
+                       verify_id_token! id_token
+                       id_token
                      end
       end
 
-      def fetch_jwk(kid)
+      def verify_id_token!(id_token)
+        jwk = fetch_jwk! id_token.kid
+        verify_signature! id_token, jwk
+        verify_claims! id_token
+      end
+
+      def fetch_jwk!(kid)
         JSON::JWK::Set::Fetcher.fetch File.join(ISSUER, 'auth/keys'), kid: kid
-      rescue JSON::ParserError, JSON::JWT::Exception, Faraday::Error => e
-        fail!(:jwks_fetching_failed, e) and nil
+      rescue => e
+        raise CallbackError.new(:jwks_fetching_failed, e)
+      end
+
+      def verify_signature!(id_token, jwk)
+        id_token.verify! jwk
+      rescue => e
+        raise CallbackError.new(:id_token_signature_invalid, e)
       end
 
       def verify_claims!(id_token)
@@ -122,9 +129,7 @@ module OmniAuth
       end
 
       def invalid_claim!(claim)
-        key = :"#{claim}_invalid"
-        message = "#{claim} invalid"
-        fail! key, CallbackError.new(key, message)
+        raise CallbackError.new(:id_token_claims_invalid, "#{claim} invalid")
       end
 
       def client_id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-apple
 version: !ruby/object:Gem::Version
-  version: 1.3.0.alpha
+  version: 1.3.0.alpha2
 platform: ruby
 authors:
 - nhosoya