apple_id 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e9aeb4597a1a98ef66341021c5587910e618d8b3ad37e355c44abf2a9105803
-  data.tar.gz: 312203fe9cf4ce80ed4b48cff8a024d7a83c03b0b7fda6b9895b9203a83efcd1
+  metadata.gz: 8f1661521a859bf390a20f26adc70587b74e8443d11af6f887d44b72a858423e
+  data.tar.gz: 883584d2104c9de4d4ccbb2fe82501d24a08a299f0b9c64dc9f7c3358cf4f96c
 SHA512:
-  metadata.gz: 48e60bc4416e5516576b1e61386a72e40e27bc905e026d84444c247dfe1d226b6855abc0157a0955f90847d818c93cf7b33aab5fe8266214c1917ecf89502a04
-  data.tar.gz: 71d120ad10a5179b6925b7014cc37758a238b63544594f21bfec4bd49bca1cd4510fda334a7f7b6590e572e1f56b8cb43967000304ebbcf2edd2721d47f44f81
+  metadata.gz: 61905204b8ae74d331a34ae379993a8d0c2de9419c65893adc76386bb8253dda24fb5dedda5fda73c090e6b65d4e522622849565de9912d2c28777d96898793c
+  data.tar.gz: cc07894558b23bb8fdd453d35069d69af2cd31eeda3465b57cd5efd654962cc1a978af2da942dae33ff009018a9340412b8e5c10376afae8ca670cbbb1677f67

data/.travis.yml

@@ -4,6 +4,6 @@ language: ruby
 cache: bundler
 before_install: gem install bundler
 rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.2
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.2.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.19'
+  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/access_token.rb

@@ -1,6 +1,7 @@
 module AppleID
   class AccessToken < OpenIDConnect::AccessToken
     undef_required_attributes :client
+    attr_optional :client
 
     def initialize(access_token, attributes = {})
       super attributes.merge(access_token: access_token)

data/lib/apple_id/api/user_migration.rb

@@ -0,0 +1,36 @@
+module AppleID
+  module API
+    module UserMigration
+      def transfer_from!(transfer_sub:)
+        resource_request do
+          post(
+            user_migration_endpoint,
+            transfer_sub:  transfer_sub,
+            client_id:     client.identifier,
+            client_secret: client.secret
+          )
+        end
+      end
+
+      def transfer_to!(sub:, target:)
+        resource_request do
+          post(
+            user_migration_endpoint,
+            sub:           sub,
+            target:        client.team_id,
+            client_id:     client.identifier,
+            client_secret: client.secret
+          )
+        end
+      end
+
+      private
+
+      def user_migration_endpoint
+        File.join(ISSUER, '/auth/usermigrationinfo')
+      end
+    end
+
+    AccessToken.include UserMigration
+  end
+end

data/lib/apple_id/client.rb

@@ -40,7 +40,7 @@ module AppleID
 
     def handle_success_response(response)
       token_hash = JSON.parse(response.body).with_indifferent_access
-      AccessToken.new token_hash.delete(:access_token), token_hash
+      AccessToken.new token_hash.delete(:access_token), token_hash.merge(client: self)
     end
 
     def handle_error_response(response)

data/lib/apple_id/id_token/real_user_status.rb

@@ -0,0 +1,27 @@
+module AppleID
+  class IdToken::RealUserStatus
+    class UndefinedStatus < StandardError; end
+
+    attr_accessor :value
+
+    STATUSES = [
+      :unsupported,
+      :unknown,
+      :likely_real
+    ]
+
+    def initialize(value)
+      self.value = value
+    end
+
+    STATUSES.each do |expected_status|
+      define_method :"#{expected_status}?" do
+        send(:status) == expected_status
+      end
+    end
+
+    def status
+      STATUSES[value] or raise UndefinedStatus
+    end
+  end
+end

data/lib/apple_id/id_token.rb

@@ -2,7 +2,7 @@ module AppleID
   class IdToken < OpenIDConnect::ResponseObject::IdToken
     class VerificationFailed < StandardError; end
 
-    attr_optional :email, :email_verified, :is_private_email, :nonce_supported
+    attr_optional :email, :email_verified, :is_private_email, :nonce_supported, :real_user_status
     attr_accessor :original_jwt_string
     alias_method :original_jwt, :raw_attributes
 
@@ -18,6 +18,13 @@ module AppleID
       end
     end
 
+    def initialize(attributes = {})
+      super
+      unless self.real_user_status.nil?
+        self.real_user_status = RealUserStatus.new(self.real_user_status)
+      end
+    end
+
     def verify!(verify_signature: true, client: nil, nonce: nil, state: nil, access_token: nil, code: nil)
       verify_signature! if verify_signature
       verify_claims! client, nonce, state, access_token, code
@@ -35,7 +42,7 @@ module AppleID
     private
 
     def verify_signature!
-      original_jwt.verify! AppleID::JWKS.fetch(original_jwt.kid)
+      original_jwt.verify! JWKS.fetch(original_jwt.kid)
     rescue
       raise VerificationFailed, 'Signature Verification Failed'
     end

data/lib/apple_id/jwks.rb

@@ -1,5 +1,5 @@
 module AppleID
-  class JWKS
+  class JWKS < JSON::JWK::Set
     class Cache
       def fetch(cache_key)
         yield
@@ -16,7 +16,7 @@ module AppleID
 
     def self.fetch(cache_key)
       jwks = cache.fetch("apple_id:jwks:#{cache_key}") do
-        JSON::JWK::Set.new(
+        new(
           JSON.parse(
             OpenIDConnect.http_client.get_content(JWKS_URI)
           ).with_indifferent_access[:keys]

data/lib/apple_id.rb

@@ -54,4 +54,6 @@ end
 require 'apple_id/client'
 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/api/user_migration'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apple_id
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - nov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2021-10-01 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.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.19'
 - !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
@@ -143,8 +143,10 @@ files:
 - bin/setup
 - lib/apple_id.rb
 - lib/apple_id/access_token.rb
+- lib/apple_id/api/user_migration.rb
 - lib/apple_id/client.rb
 - lib/apple_id/id_token.rb
+- lib/apple_id/id_token/real_user_status.rb
 - lib/apple_id/jwks.rb
 homepage: https://github.com/nov/apple_id
 licenses:
@@ -165,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Sign-in with Apple Backend