omniauth-apple 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7998a38a969afb6c44b52111e0ce267a2f64e39c8e1059c7a3b2d4804c2ac5c
-  data.tar.gz: e151d17ba689527597adf1a7ce5c152c005e3dd3c51865dd0b297aeffeb56e5b
+  metadata.gz: c485aae891ca049ae67179446bce1b1ec65386a9b7cbfdd965b7fde65fa688eb
+  data.tar.gz: ebbc624c1ebd90025579dc882c39717f65b7a1cc48cb81ac9e4557c6fd67d30b
 SHA512:
-  metadata.gz: ea94526792b55a24852ea3e2a637a44f9565c59399707dcef0079358f03e71311f90d274f2390f18b80593c113ad5dd9adb16a0c34d9ac16fb9a60e6bb0b09e2
-  data.tar.gz: 152441ec7c484bf1ee451113e65e94f3d8427e18418a75c2013cedd61ed22ffb9043f52246b73d141c562d0774f63db1bafe2f04bc0a9822bfebaae892ce1463
+  metadata.gz: 77ac0078fd69ce3038de8e8096581364bc71d739cbba2ac2669a8ae64fa0d3612edbba1e066831625dee3f330eea83e18b7eb1e7778d0f5829a9f15459460ffe
+  data.tar.gz: a0f3692d3d130cf18f82941a93ca2bf925c909c58d8bc105791f3b9f2ea22f768ca61c23059d504f7d348751336b383001b51a24f58ddfd707c82fda174e8392

data/.gitignore

@@ -42,9 +42,10 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
+Gemfile.lock
+.ruby-version
 # .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+.idea

data/README.md

@@ -7,7 +7,7 @@ OmniAuth strategy for [Sign In with Apple](https://developer.apple.com/sign-in-w
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'omniauth-apple' github: 'nhosoya/omniauth-apple', branch: master
+gem 'omniauth-apple', github: 'nhosoya/omniauth-apple', branch: 'master'
 ```
 
 And then execute:
@@ -22,9 +22,12 @@ Or install it yourself as:
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :apple, ENV['CLIENT_ID'], ENV['TEAM_ID'], ENV['KEY_ID'], ENV['PRIVATE_KEY'],
+  provider :apple, ENV['CLIENT_ID'], '',
            {
              scope: 'email name',
+             team_id: ENV['TEAM_ID'],
+             key_id: ENV['KEY_ID'],
+             pem: ENV['PRIVATE_KEY']
            }
 end
 ```

data/lib/{omniauth-apple → omniauth/apple}/version.rb

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

data/lib/omniauth/apple.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'omniauth/apple/version'
+require 'omniauth/strategies/apple'

data/lib/omniauth/strategies/apple.rb

@@ -1,23 +1,34 @@
+# frozen_string_literal: true
+
 require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
     class Apple < OmniAuth::Strategies::OAuth2
-
-      attr_reader :id_token
-      args %i[client_id team_id key_id pem]
-
       option :name, 'apple'
-      option :client_options, {
-        site: 'https://appleid.apple.com',
-        authorize_url: '/auth/authorize',
-        token_url: '/auth/token',
-      }
 
-      uid { id_token['sub'] }
+      option :client_options,
+             site: 'https://appleid.apple.com',
+             authorize_url: '/auth/authorize',
+             token_url: '/auth/token'
+      option :authorize_params,
+             response_mode: 'form_post'
+
+      uid { id_info['sub'] }
 
       info do
-        { sub: id_token['sub'] }
+        {
+          sub: id_info['sub'],
+          email: email,
+          first_name: first_name,
+          last_name: last_name
+        }
+      end
+
+      extra do
+        {
+          raw_info: id_info.merge(user_info)
+        }
       end
 
       def client
@@ -25,27 +36,47 @@ module OmniAuth
       end
 
       def callback_url
-        full_host + script_name + callback_path
+        options[:redirect_uri] || (full_host + script_name + callback_path)
       end
 
-      def build_access_token
-        _access_token = super
-        @id_token = ::JSON::JWT.decode(_access_token.params['id_token'], :skip_verification)
-        _access_token
+      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
       end
 
-      private
+      def user_info
+        return {} unless request.params['user'].present?
+
+        log(:info, "user_info: #{request.params['user']}")
+        @user_info ||= JSON.parse(request.params['user'])
+      end
+
+      def email
+        user_info['email'] || id_info['email']
+      end
+
+      def first_name
+        user_info.dig('name', 'firstName')
+      end
+
+      def last_name
+        user_info.dig('name', 'lastName')
+      end
 
       def client_secret
-        jwt = ::JSON::JWT.new(
+        payload = {
           iss: options.team_id,
           aud: 'https://appleid.apple.com',
           sub: options.client_id,
-          iat: Time.current,
-          exp: 1.minutes.after
-        )
-        jwt.kid = options.key_id
-        jwt.sign(private_key).to_s
+          iat: Time.now.to_i,
+          exp: Time.now.to_i + 60
+        }
+        headers = { kid: options.key_id }
+
+        ::JWT.encode(payload, private_key, 'ES256', headers)
       end
 
       def private_key

data/lib/omniauth-apple.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
-require 'omniauth-apple/version'
-require 'omniauth/strategies/apple'
+require 'omniauth/apple'

data/omniauth-apple.gemspec

@@ -1,13 +1,13 @@
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "omniauth-apple/version"
+require "omniauth/apple/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "omniauth-apple"
   spec.version       = Omniauth::Apple::VERSION
-  spec.authors       = ["nhosoya"]
-  spec.email         = ["hnhnnhnh@gmail.com"]
+  spec.authors       = ["nhosoya", "Fabian Jäger"]
+  spec.email         = ["hnhnnhnh@gmail.com", "fabian@mailbutler.io"]
 
   spec.summary       = %q{OmniAuth strategy for Sign In with Apple}
   spec.description   = %q{OmniAuth strategy for Sign In with Apple}
@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'omniauth-oauth2'
+  spec.add_dependency 'jwt'
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-apple
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - nhosoya
+- Fabian Jäger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -24,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -55,6 +70,7 @@ dependencies:
 description: OmniAuth strategy for Sign In with Apple
 email:
 - hnhnnhnh@gmail.com
+- fabian@mailbutler.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -67,7 +83,8 @@ files:
 - bin/console
 - bin/setup
 - lib/omniauth-apple.rb
-- lib/omniauth-apple/version.rb
+- lib/omniauth/apple.rb
+- lib/omniauth/apple/version.rb
 - lib/omniauth/strategies/apple.rb
 - omniauth-apple.gemspec
 homepage: https://github.com/nhosoya/omniauth-apple
@@ -89,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Sign In with Apple