omniauth-apple-sau226 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c621934826914eb43bfe969de4cf4a30a0100ccf92522e30cc8f5006a958870f
-  data.tar.gz: 2f4cdfed997ab7b5e4585fa3ed05bc51d48fea117de73c6e7faa41595ca0cbb3
+  metadata.gz: 5def05edbb741780cfd044218554788c7055c58354c6af327a7630793a3870bf
+  data.tar.gz: 6316e8050837aabeefcd1449dcbd427ac463b7b39189b9e07a06944218ed23f0
 SHA512:
-  metadata.gz: 3b32ea123ccc094429ee3ce5ceebaaa9b3e996c3c8875e4fea297f8faca63264d0589976292515db5aa5f40a5907ab4585603bd867ca71df806b4406020d1740
-  data.tar.gz: 48bf3d81261b4cc2a63be173618c1953e0923168043364b70b856a5604fda2c701d082e2c46bba7454058f24ddca6fbc0ed86a7fb03a8a79b7f7b82557cc2009
+  metadata.gz: 39f36c82ffb8c65f8c4b2f2bf991db4957defcb2308beb24e44669283f6e8d9404e88defc31e4556114facd61aafe5eb40f98b9e11754c6787bd962ecf971d95
+  data.tar.gz: 99cf9f9758b942750dfc21695a9efa94c905814c6ad729c1eb9edc15033a61145fff5565a65e7474550744d7b0e61b983f0195d480e524ec1240136073bd8944

data/.gitignore

@@ -48,3 +48,4 @@ Gemfile.lock
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+.idea

data/README.md

@@ -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/sau226/version.rb

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

data/lib/omniauth/strategies/apple.rb

@@ -1,24 +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',
-        response_mode: 'form_post',
-      }
 
-      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
-        { email: id_token['email'] }
+        {
+          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
@@ -26,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: (now = Time.respond_to?(:current) ? Time.current : Time.now),
-          exp: now + 60
-        )
-        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/omniauth-apple-sau226.gemspec

@@ -6,12 +6,12 @@ require "omniauth/apple/sau226/version"
 Gem::Specification.new do |spec|
   spec.name          = "omniauth-apple-sau226"
   spec.version       = Omniauth::Apple::Sau226::VERSION
-  spec.authors       = ["nhosoya", "sau226"]
-  spec.email         = ["hnhnnhnh@gmail.com"]
+  spec.authors       = ["nhosoya", "Fabian Jäger", "sau226"]
+  spec.email         = ["hnhnnhnh@gmail.com", "fabian@mailbutler.io"]
 
-  spec.summary       = %q{Customized build by sau226 of the omniauth-apple gem}
-  spec.description   = %q{Customized build by sau226 of the omniauth-apple gem}
-  spec.homepage      = "https://github.com/sau226/omniauth-apple"
+  spec.summary       = %q{sau226's custom build of omniauth-apple}
+  spec.description   = %q{OmniAuth strategy for Sign In with Apple}
+  spec.homepage      = "https://github.com/sau226dev/omniauth-apple"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'omniauth-oauth2'
-  spec.add_dependency 'json-jwt'
+  spec.add_dependency 'jwt'
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-apple-sau226
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - nhosoya
+- Fabian Jäger
 - sau226
 autorequire: 
 bindir: exe
@@ -26,7 +27,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json-jwt
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,9 +68,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Customized build by sau226 of the omniauth-apple gem
+description: OmniAuth strategy for Sign In with Apple
 email:
 - hnhnnhnh@gmail.com
+- fabian@mailbutler.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -86,7 +88,7 @@ files:
 - lib/omniauth/apple/sau226/version.rb
 - lib/omniauth/strategies/apple.rb
 - omniauth-apple-sau226.gemspec
-homepage: https://github.com/sau226/omniauth-apple
+homepage: https://github.com/sau226dev/omniauth-apple
 licenses:
 - MIT
 metadata: {}
@@ -108,5 +110,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Customized build by sau226 of the omniauth-apple gem
+summary: sau226's custom build of omniauth-apple
 test_files: []