apple_id 0.4.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '018fb2f186c24595a953c2fe8e79c9091fcf83d10915b701dac91021dacfc04b'
-  data.tar.gz: a8b6bf32091ff20b60779551469a383f09ccf90d736ea1004046a9a635f993d2
+  metadata.gz: 1c660f0576768bf567a75575fc413a2edd9e1c805de1af2853be8fb6a04eeceb
+  data.tar.gz: '07494d150bfa11e09cf8216b2bb46b6686869ac8164baad467651fdedcd4b7ca'
 SHA512:
-  metadata.gz: 195ae7e87dff57ca72ee84be036a2a5927c9fdb7cbd9fa2f48e3a7421a0a9d77cd9ef7a042e1c567cdfff8f72305d9623889fade86a18b3939c2d0ba1efb7d32
-  data.tar.gz: acbc83c4ceb9c38e18db63b66a55855b96a26ca1b01f208cc7258bcb4c582487026c35bbe8b0446b0d8d0118c575b0201b7aab77b74e4d48f3b89bf83bc5d46c
+  metadata.gz: 13ede95f09ed940bd443001b63cc5fb3fc038c6d0e176f7d6ad52427325ec1764e5ec8eabcb38e94e7c6069f59c354c8be0947397bd29c55cd814734b024ee83
+  data.tar.gz: c8e8695d746b5a5431f45b0241530d2a49af18402e5f0f24924acd191eaac269e4a690e9998c4b5962905b89b3db98481900a75a3ced992aa3d95d3a35e5b8d6

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.4.0
+1.1.0

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.10'
+  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,5 @@ end
 require 'apple_id/client'
 require 'apple_id/access_token'
 require 'apple_id/id_token'
+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

@@ -34,15 +34,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/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.4.0
+  version: 1.1.0
 platform: ruby
 authors:
 - nov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-06-30 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.10'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: openid_connect
   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/jwks.rb
 homepage: https://github.com/nov/apple_id
 licenses:
 - MIT