omniauth-apple 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c485aae891ca049ae67179446bce1b1ec65386a9b7cbfdd965b7fde65fa688eb
-  data.tar.gz: ebbc624c1ebd90025579dc882c39717f65b7a1cc48cb81ac9e4557c6fd67d30b
+  metadata.gz: 9209606bc989d401e7a3b4df233f14b0d126a25a8e5fa4aaf39e52bdc86f8518
+  data.tar.gz: 863dbd6c01b45573d5e2fba5fc84078bff8415a265c4e99098495d49737b4bb2
 SHA512:
-  metadata.gz: 77ac0078fd69ce3038de8e8096581364bc71d739cbba2ac2669a8ae64fa0d3612edbba1e066831625dee3f330eea83e18b7eb1e7778d0f5829a9f15459460ffe
-  data.tar.gz: a0f3692d3d130cf18f82941a93ca2bf925c909c58d8bc105791f3b9f2ea22f768ca61c23059d504f7d348751336b383001b51a24f58ddfd707c82fda174e8392
+  metadata.gz: ec26c40908a1c669daa5adb25d985ce9d583466544e35094d0dc81089a3fe973bc71f1182cdbbe83614aa426de3a99560f28691d3f35b9641969d8c824b28511
+  data.tar.gz: b51d3b1ea9738f76cdc383cb5a616fe71b4d1e0a3acb72f16145e5c1d71556d0b0082d6b724a3c9c82c8ab28e8c3711c4489772a00b897941896a881e7d82aaa

data/.rakeTasks

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to: 
+1. Remove rake task
+2. Add existing rake tasks
+To add existing rake tasks automatically delete this file and reload the project.
+--><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>

data/lib/omniauth/apple/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Apple
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/omniauth/strategies/apple.rb

@@ -13,7 +13,8 @@ module OmniAuth
              token_url: '/auth/token'
       option :authorize_params,
              response_mode: 'form_post'
-
+      option :authorized_client_ids, []
+      
       uid { id_info['sub'] }
 
       info do
@@ -32,7 +33,7 @@ module OmniAuth
       end
 
       def client
-        ::OAuth2::Client.new(options.client_id, client_secret, deep_symbolize(options.client_options))
+        ::OAuth2::Client.new(client_id, client_secret, deep_symbolize(options.client_options))
       end
 
       def callback_url
@@ -42,9 +43,19 @@ module OmniAuth
       private
 
       def id_info
-        id_token = request.params['id_token'] || access_token.params['id_token']
-        log(:info, "id_token: #{id_token}")
-        @id_info ||= ::JWT.decode(id_token, nil, false)[0] # payload after decoding
+        if request.params&.key?('id_token') || access_token&.params&.key?('id_token')
+          id_token = request.params['id_token'] || access_token.params['id_token']
+          log(:info, "id_token: #{id_token}")
+          @id_info ||= ::JWT.decode(id_token, nil, false)[0] # payload after decoding
+        end
+      end
+
+      def client_id
+        unless id_info.nil?
+          return id_info['aud'] if options.authorized_client_ids.include? id_info['aud']
+        end
+
+        options.client_id
       end
 
       def user_info
@@ -70,7 +81,7 @@ module OmniAuth
         payload = {
           iss: options.team_id,
           aud: 'https://appleid.apple.com',
-          sub: options.client_id,
+          sub: client_id,
           iat: Time.now.to_i,
           exp: Time.now.to_i + 60
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-apple
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - nhosoya
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -76,6 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rakeTasks"
 - Gemfile
 - LICENSE
 - README.md
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Sign In with Apple