omniauth-geekpark 1.0.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d85ef49526a5e0081670f8db93fde4f426a2d60
-  data.tar.gz: f31ac87bbb88591241e2814c4388a4433c40d1f8
+SHA256:
+  metadata.gz: 9f81bbb0c2f65021e6951349e2f30025dd8222578fdbc5f0d37bb7ef8dbd3e9a
+  data.tar.gz: 7ae6ce079f04659872c63059aa488071ce71e3f70b92c14011968e084cdeeb16
 SHA512:
-  metadata.gz: 27b0a527fc75555aef50b14db55a287ba2b27627810445c975e200b6b4a50ab62cca12d01a576d4c4ff5970fd4f32581e0432d54a08e29bc286fa4b0db281157
-  data.tar.gz: 0824aaf3f4cc853e034187bc5b25a4e22094f8bb8156001b1e648f012f58a84a02255213039325f3632b85be99fc36a0c9c1df18b3bab2c5e272c645a7c09ce4
+  metadata.gz: 2c7d436d34d26331b56efea5b72422e96c620ca81a7f473e5aa089ed287b7cb239a554e8c68ffd01cd3b5abf3a153a3024033f21fec6ce70f76849adc31d28ae
+  data.tar.gz: fe1fac3ff6b8997f35c069146dc1df58201c54a5e2420f10e173404438f11572dccdb8f62334b69deca69c0c8b682b2dc31432824601dbc4f9c8e5914e3e74cc

data/lib/omniauth/strategies/geekpark.rb

@@ -19,7 +19,9 @@ module OmniAuth
           company: raw_info['company'],
           title: raw_info['title'],
           bio: raw_info['bio'],
-          avatar_url: raw_info['avatar_url']
+          avatar_url: raw_info['avatar_url'],
+          email: raw_info['email'],
+          mobile: raw_info['mobile']
         }
       end
 

data/lib/omniauth/strategies/synced.rb

@@ -0,0 +1,29 @@
+module OmniAuth
+  module Strategies
+    class Synced < OmniAuth::Strategies::OAuth2
+      option :client_options, {
+        site: 'https://www.jiqizhixin.com/',
+        authorize_url: '/oauth/authorize',
+        token_url: '/oauth/token'
+      }
+
+      uid { raw_info['id'] }
+
+      info do
+        {
+          nickname: raw_info['name'],
+          avatar_url: raw_info['avatar_url'],
+          email: raw_info['email'],
+          bio: raw_info['bio'],
+          pubinfo: raw_info['pubinfo']
+        }
+      end
+
+      def raw_info
+        @raw_info ||= access_token.get('/api/v3/user').parsed
+      end
+    end
+  end
+end
+
+OmniAuth.config.add_camelization 'synced', 'Synced'

data/lib/omniauth/strategies/wechat_service.rb

@@ -15,7 +15,8 @@ module OmniAuth
         {
           nickname: raw_info['nickname'],
           city: raw_info['city'],
-          avatar: raw_info['headimgurl']
+          avatar: raw_info['headimgurl'],
+          openid: access_token['openid']
         }
       end
 
@@ -61,11 +62,12 @@ module OmniAuth
       end
 
       def callback_phase
+        # 其它 app 需要获取微信openid 时,将 callbackurl 传入 state 参数
         if request.params['state'].match(/\Ahttps?:\/\/(.*\.)?geekpark\.net\/.*\z/)
-          env['omniauth.redirect'] = {
-            callback_url: request.params['state'],
-            code: request.params['code']
-          }
+          uri = URI(request.params['state'])
+          query = Rack::Utils.parse_nested_query(uri.query).merge(code: request.params['code'])
+          uri.query = URI.encode_www_form query
+          env['omniauth.redirect'] = uri.to_s
           call_app!
         else
           super

data/lib/omniauth-geekpark/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GeekPark
-    VERSION = '1.0.5'
+    VERSION = '1.2.0'
   end
 end

data/lib/omniauth-geekpark.rb

@@ -6,3 +6,4 @@ require 'omniauth/strategies/geekpark'
 require 'omniauth/strategies/wechat'
 require 'omniauth/strategies/wechat_service'
 require 'omniauth/strategies/weibo'
+require 'omniauth/strategies/synced'

data/omniauth-geekpark.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'omniauth', '~> 1.0'
-  spec.add_dependency 'omniauth-oauth2', '1.3.1'
+  spec.add_dependency 'omniauth-oauth2', '~> 1.4'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-geekpark
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.2.0
 platform: ruby
 authors:
 - HaoYunfei
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -29,16 +29,16 @@ dependencies:
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - lib/omniauth-geekpark/helper.rb
 - lib/omniauth-geekpark/version.rb
 - lib/omniauth/strategies/geekpark.rb
+- lib/omniauth/strategies/synced.rb
 - lib/omniauth/strategies/wechat.rb
 - lib/omniauth/strategies/wechat_service.rb
 - lib/omniauth/strategies/weibo.rb
@@ -144,8 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.2.2
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategies for GeekPark. Includes geekpark, weibo and wechat.