apple_id 1.5.0 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d960eb2153d5e632113ef0e7c916d1e4c98cc3c113cc3f174f6b3fbec13eb656
-  data.tar.gz: 5d894c4223f3ef3f0648736c3f9bcec50e798a59efc418526091cc740186eca7
+  metadata.gz: c046d068616210402adb14f58276b0aa984c6b7d308457bae068ba78d4b06795
+  data.tar.gz: 91d102d2c9bca0c22f328887f69baa0ced4d14c2f425ac1c52114735dba6d144
 SHA512:
-  metadata.gz: 3a14c1cb7ee1eb22b902e8f536106c2141eb03d381131603c3627767cfc78755ce7f7a71b5a244d3ecf5682d58763c8c683ace0c6d76caf91838530dd833cc18
-  data.tar.gz: 115cd71531fefe3b923a8bcd47ea82edf1f8ef5f2cf0e63ebc872fe754a2e546fa94078009e36cf740b20f6f0cff900c0325e0f9c7ee445fdfae281f53030a75
+  metadata.gz: b58d74bb0f479d09e7ab807c826467852ed70a101859a64b5063a7bbefcca5067928eed699c2120e146aa089a1907c8a345d696836545566219f69b671d7c849
+  data.tar.gz: 1fbb9fe991a92cfa7838492831a76c6378a292c83b2ae6566053e578477095d054bd3ef1d2758f534507d3d7e50b892ca7c3a07ba204426b58093216ff59a655

data/.github/workflows/spec.yml

@@ -0,0 +1,31 @@
+name: Spec
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  spec:
+    strategy:
+      matrix:
+        os: ['ubuntu-20.04', 'ubuntu-22.04']
+        ruby-version: ['3.1', '3.2', '3.3']
+        include:
+        - os: 'ubuntu-20.04'
+          ruby-version: '3.0'
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run Specs
+      run: bundle exec rake spec

data/CHANGELOG.md

@@ -0,0 +1,30 @@
+## [Unreleased]
+
+## [1.6.2] - 2022-10-20
+
+### Fixed
+
+- rescue un-parsable / non-hash error response  https://github.com/nov/apple_id/commit/75a35e9d15fa2af299237ceb3b71def819e9cc03
+
+## [1.6.2] - 2022-10-14
+
+### Fixed
+
+- stringify jwt secret, faraday does not do so automatically  https://github.com/nov/apple_id/commit/660ba5f8036279b111abc75a2708b945d4ab0be9
+
+## [1.6.1] - 2022-10-14
+
+### Fixed
+
+- fix json response handling https://github.com/nov/apple_id/commit/3b6199b56de2eda0b35fcb13a76438916961ba47
+
+
+## [1.6.0] - 2022-10-09
+
+### Added
+
+- start recording CHANGELOG
+
+### Changed
+
+- updated underlying gems and use faraday instead of httpclient through them https://github.com/nov/apple_id/commit/055de30ce6f7beb2e034ab99f6f46a1de7004111

data/README.md

@@ -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/nov/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/main/CODE_OF_CONDUCT.md).

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.4

data/apple_id.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'json-jwt', '~> 1.15.0'
-  spec.add_runtime_dependency 'rack-oauth2', '~> 1.21.2'
-  spec.add_runtime_dependency 'openid_connect', '~> 1.3.0'
+  spec.add_runtime_dependency 'json-jwt', '~> 1.16'
+  spec.add_runtime_dependency 'rack-oauth2', '~> 2.0'
+  spec.add_runtime_dependency 'openid_connect', '~> 2.2'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/apple_id/client.rb

@@ -34,7 +34,7 @@ module AppleID
         exp: 1.minutes.from_now
       )
       jwt.kid = key_id
-      jwt.sign(private_key)
+      jwt.sign(private_key).to_s
     end
 
     def setup_required_scope(scopes)
@@ -45,13 +45,15 @@ module AppleID
     end
 
     def handle_success_response(response)
-      token_hash = JSON.parse(response.body).with_indifferent_access
+      token_hash = response.body.with_indifferent_access
       AccessToken.new token_hash.delete(:access_token), token_hash.merge(client: self)
     end
 
     def handle_error_response(response)
-      error = JSON.parse(response.body).with_indifferent_access
+      error = response.body.with_indifferent_access
       raise Error.new(response.status, error)
+    rescue Faraday::ParsingError, NoMethodError
+      raise Error.new(response.status, error: 'Unknown', error_description: response.body)
     end
   end
 end

data/lib/apple_id/event_token/event.rb

@@ -1,6 +1,7 @@
 module AppleID
   class EventToken::Event < OpenIDConnect::ConnectObject
     attr_required :type, :sub, :event_time
+    attr_optional :email, :is_private_email
 
     module Type
       EMAIL_ENABLED   = 'email-enabled'
@@ -26,6 +27,14 @@ module AppleID
     end
     alias_method :account_delete?, :account_deleted?
 
+    def is_private_email?
+      if is_private_email.is_a? String
+        is_private_email == 'true'
+      else
+        !!is_private_email
+      end
+    end
+
     class << self
       def decode(json_string)
         new JSON.parse(json_string).with_indifferent_access

data/lib/apple_id/jwks.rb

@@ -7,8 +7,8 @@ module AppleID
       JSON::JWK::Set::Fetcher.cache
     end
 
-    def self.fetch(kid)
-      JSON::JWK::Set::Fetcher.fetch JWKS_URI, kid: kid
+    def self.fetch(kid, options = {})
+      JSON::JWK::Set::Fetcher.fetch JWKS_URI, kid: kid, **options
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apple_id
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.4
 platform: ruby
 authors:
 - nov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-jwt
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: openid_connect
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -144,9 +144,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -169,7 +170,7 @@ homepage: https://github.com/nov/apple_id
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -184,8 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Sign-in with Apple Backend
 test_files: []

data/.travis.yml

@@ -1,10 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-before_install: gem install bundler
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.2