apple_id 1.1.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aec97bdb69637466419df18f24c42dce5ac8fd9fdb87439c71838461c66fdc2
-  data.tar.gz: 185267b0bc10970a1932885a4778ca18ec93249c5d12ad8a4c960775cfb0bfc8
+  metadata.gz: 4447d024e910da0480e07d58164eefce5daa78c1389ecb8a571ad20bf969c291
+  data.tar.gz: 9ad9be586a2c3e96e7fc3d35eb07c2c6360cde0736b705c7584bdd0fc5a6aac1
 SHA512:
-  metadata.gz: 0d6bfd4581f452e9f7a34dfd7f184dc5444f926a74a06ed3c24a302cc0a6ef5a0c63d18dd68f72bce7e50c26ad35ed1da694b9b5776725a05cde4ad9ce9dc270
-  data.tar.gz: 563cb61bf4dc6550b0df458b6518efe0956b09e7fcbef456b670e71228d50f3d8e92a3c0c105bdbaee2d3f7b056a22025b1824dc0c830c936a58de67e877ffe2
+  metadata.gz: c8655e9f56f4ba8e4e71b5048be8d637bb9e798acd48a5cccd979f6f55ef1d73cb1b7a2cf9e84c46a6d95727b8cf749f5b4e4a8bc7fe7a28170acea05e7581e5
+  data.tar.gz: a097b0398ac8da49da3874a6c073abbe844339773b638761a6f33a204c9c0207a72fdab38d2eb10cf5c0edddddb4562dfd7189ad8b2e7bc8d5dfec9064903eeb

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: nov

data/.travis.yml

@@ -6,4 +6,5 @@ before_install: gem install bundler
 rvm:
   - 2.5.8
   - 2.6.6
-  - 2.7.1
+  - 2.7.2
+  - 3.0.2

data/README.md

@@ -36,7 +36,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/apple_id. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/nov/apple_id. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -44,4 +44,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the AppleID project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/apple_id/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the AppleID project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/nov/apple_id/blob/master/CODE_OF_CONDUCT.md).

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.4.0

data/apple_id.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rack-oauth2', '~> 1.12'
-  spec.add_runtime_dependency 'openid_connect', '~> 1.1.7'
+  spec.add_runtime_dependency 'rack-oauth2', '~> 1.21'
+  spec.add_runtime_dependency 'openid_connect', '~> 1.3.0'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/apple_id/client.rb

@@ -7,7 +7,8 @@ module AppleID
     def initialize(attributes)
       attributes_with_default = {
         authorization_endpoint: File.join(ISSUER, '/auth/authorize'),
-        token_endpoint: File.join(ISSUER, '/auth/token')
+        token_endpoint:         File.join(ISSUER, '/auth/token'),
+        revocation_endpoint:    File.join(ISSUER, '/auth/revoke'),
       }.merge(attributes)
       super attributes_with_default
     end
@@ -17,6 +18,11 @@ module AppleID
       super :body, options
     end
 
+    def revoke!(options = {})
+      self.secret = client_secret_jwt
+      super :body, options
+    end
+
     private
 
     def client_secret_jwt

data/lib/apple_id/event_token/event.rb

@@ -0,0 +1,11 @@
+module AppleID
+  class EventToken::Event < OpenIDConnect::ConnectObject
+    attr_required :type, :sub, :event_time
+
+    class << self
+      def decode(json_string)
+        new JSON.parse(json_string).with_indifferent_access
+      end
+    end
+  end
+end

data/lib/apple_id/event_token.rb

@@ -0,0 +1,61 @@
+module AppleID
+  class EventToken < OpenIDConnect::ConnectObject
+    class VerificationFailed < Error; end
+
+    # NOTE: Apple uses `events` for the JWT key, but this gem uses `event` since it's always a single JSON Object.
+    #       Once they start returning an array of events, this gem might use `events` as the attribute name.
+    attr_required :iss, :aud, :exp, :iat, :jti, :event
+    alias_method :original_jwt, :raw_attributes
+
+    def initialize(attributes = {})
+      super
+      @event = Event.decode attributes[:events]
+    end
+
+    def verify!(verify_signature: true, client: nil)
+      verify_signature! if verify_signature
+      verify_claims! client, nonce, state, access_token, code
+      self
+    end
+
+    class << self
+      def decode(jwt_string)
+        new JSON::JWT.decode jwt_string, :skip_verification
+      end
+    end
+
+    private
+
+    def verify_signature!
+      original_jwt.verify! JWKS.fetch(original_jwt.kid)
+    rescue
+      raise VerificationFailed, 'Signature Verification Failed'
+    end
+
+    def verify_claims!(client, nonce, state, access_token, code)
+      aud = if client.respond_to?(:identifier)
+        client.identifier
+      else
+        client
+      end
+
+      failure_reasons = []
+      if self.iss != ISSUER
+        failure_reasons << :iss
+      end
+      if aud.present? && self.aud != aud
+        failure_reasons << :aud
+      end
+      if Time.now.to_i < iat
+        failure_reasons << :iat
+      end
+      if Time.now.to_i >= exp
+        failure_reasons << :exp
+      end
+
+      if failure_reasons.present?
+        raise VerificationFailed, "Claims Verification Failed at #{failure_reasons}"
+      end
+    end
+  end
+end

data/lib/apple_id/id_token.rb

@@ -1,6 +1,6 @@
 module AppleID
   class IdToken < OpenIDConnect::ResponseObject::IdToken
-    class VerificationFailed < StandardError; end
+    class VerificationFailed < Error; end
 
     attr_optional :email, :email_verified, :is_private_email, :nonce_supported, :real_user_status
     attr_accessor :original_jwt_string

data/lib/apple_id.rb

@@ -8,6 +8,8 @@ module AppleID
     ::File.join(::File.dirname(__FILE__), '../VERSION')
   ).chomp
 
+  class Error < StandardError; end
+
   def self.logger
     @@logger
   end
@@ -56,4 +58,6 @@ require 'apple_id/access_token'
 require 'apple_id/id_token'
 require 'apple_id/id_token/real_user_status'
 require 'apple_id/jwks'
+require 'apple_id/event_token'
+require 'apple_id/event_token/event'
 require 'apple_id/api/user_migration'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apple_id
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.4.0
 platform: ruby
 authors:
 - nov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-11 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: openid_connect
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -145,6 +146,8 @@ files:
 - lib/apple_id/access_token.rb
 - lib/apple_id/api/user_migration.rb
 - lib/apple_id/client.rb
+- lib/apple_id/event_token.rb
+- lib/apple_id/event_token/event.rb
 - lib/apple_id/id_token.rb
 - lib/apple_id/id_token/real_user_status.rb
 - lib/apple_id/jwks.rb
@@ -167,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Sign-in with Apple Backend