apple_id 0.5.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 428e587e5b398e65d11d97adbdd336ef3ddc61ef8200ade5087ba6435e2e5796
-  data.tar.gz: 58ffc15a5573a660e55dc0094bb30a8a4793851afdae038a6de4925af0d8bebe
+  metadata.gz: 8aec97bdb69637466419df18f24c42dce5ac8fd9fdb87439c71838461c66fdc2
+  data.tar.gz: 185267b0bc10970a1932885a4778ca18ec93249c5d12ad8a4c960775cfb0bfc8
 SHA512:
-  metadata.gz: 71c0f1ba573dca96972ae9bc73ebb9c993d77274d514a05f3399bcbf123c1b65c72b004bc0bb2deb56313c79d94a504d638bf3a58e027899e62b25ccd90df42b
-  data.tar.gz: f31da8e0b4c4e94bdbb08e99ae22a26d42fc8e8d526f664285f23f47592f5606cd92d643c5670facbdbfb35e681b0697d5bdf7056ee49c103221bc87a986d524
+  metadata.gz: 0d6bfd4581f452e9f7a34dfd7f184dc5444f926a74a06ed3c24a302cc0a6ef5a0c63d18dd68f72bce7e50c26ad35ed1da694b9b5776725a05cde4ad9ce9dc270
+  data.tar.gz: 563cb61bf4dc6550b0df458b6518efe0956b09e7fcbef456b670e71228d50f3d8e92a3c0c105bdbaee2d3f7b056a22025b1824dc0c830c936a58de67e877ffe2

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.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+1.1.1

data/apple_id.gemspec

@@ -18,7 +18,7 @@ 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.11'
+  spec.add_runtime_dependency 'rack-oauth2', '~> 1.12'
   spec.add_runtime_dependency 'openid_connect', '~> 1.1.7'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/apple_id.rb

@@ -54,3 +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'

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.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
@@ -34,15 +41,8 @@ module AppleID
 
     private
 
-    def jwks
-      @jwks ||= JSON.parse(
-        OpenIDConnect.http_client.get_content(JWKS_URI)
-      ).with_indifferent_access
-      JSON::JWK::Set.new @jwks[:keys]
-    end
-
     def verify_signature!
-      original_jwt.verify! jwks
+      original_jwt.verify! JWKS.fetch(original_jwt.kid)
     rescue
       raise VerificationFailed, 'Signature Verification Failed'
     end

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/jwks.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apple_id
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.1.1
 platform: ruby
 authors:
 - nov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: openid_connect
   requirement: !ruby/object:Gem::Requirement
@@ -143,8 +143,11 @@ 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:
 - MIT