omniauth-geekpark 1.0.4 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 484872d3d03863a03bc5f43d937425f472c1c433
-  data.tar.gz: e9825002eaaddf0db70ac2bd042c183fe27e5167
+SHA256:
+  metadata.gz: 1a2ff60a5562a3016e57b4fbed16ecc0b08eb0a83912aaccc16dd4fa7bde93c7
+  data.tar.gz: 0fac56d8ce9bfebf66374aa75996b05af62c3163e9c5e7182d74e19819e6b54e
 SHA512:
-  metadata.gz: a7cfa51d0998b6add02cd6bdf006eea1329995032e7c08f8cc1273813874376e887ca63c38f8fef49a610566077630cbdb3a23ad5a2fe81cc31423eac2d509c9
-  data.tar.gz: 2bb0944037864d082bae7fcf65a1e9089cdc7206ffcce0180c90bfb82eaa40876e525e302394c425d9b17b152544f23aa0898c5190fa7761ea51927b73a77536
+  metadata.gz: f5c554964289e65ddd3e6f1586cdbec91168bc00bdcc33baa15f77b5d368773cfe7f53a42bad8303228a0075691b1df13fcb75e2abb63cab494aef9dd63dcd1f
+  data.tar.gz: 41dc11a4606d59aba003f83063ad33d4ae49410369106a0c8e2ee7af01940c0469c4da74fa218d675a18e20fb77aa0c6c01eaf3da1656683f99d18edf37dae66

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-geekpark (0.2.1)
+    omniauth-geekpark (1.0.4)
       omniauth (~> 1.0)
       omniauth-oauth2 (= 1.3.1)
 
@@ -43,7 +43,7 @@ GEM
       rb-inotify (>= 0.9.7)
     lumberjack (1.0.10)
     method_source (0.8.2)
-    multi_json (1.12.0)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nenv (0.3.0)
@@ -111,4 +111,4 @@ DEPENDENCIES
   webmock (~> 1.24, >= 1.24.2)
 
 BUNDLED WITH
-   1.12.3
+   1.12.4

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.rb

@@ -3,7 +3,7 @@ module OmniAuth
     class WeChat < OmniAuth::Strategies::OAuth2
       option :client_options, {
         site: 'https://api.weixin.qq.com',
-        authorize_url: 'https://open.weixin.qq.com/connect/oauth2/authorize',
+        authorize_url: 'https://open.weixin.qq.com/connect/qrconnect',
         token_url: 'https://api.weixin.qq.com/sns/oauth2/access_token',
       }
 
@@ -42,7 +42,7 @@ module OmniAuth
           appid: options.client_id,
           redirect_uri: callback_url,
           response_type: 'code',
-          scope: 'snsapi_userinfo',
+          scope: request.params['scope'] || 'snsapi_login',
         })
         if OmniAuth.config.test_mode
           @env ||= {}

data/lib/omniauth/strategies/wechat_service.rb

@@ -0,0 +1,94 @@
+module OmniAuth
+  module Strategies
+    class WeChatService < OmniAuth::Strategies::OAuth2
+      option :client_options, {
+        site: 'https://api.weixin.qq.com',
+        authorize_url: 'https://open.weixin.qq.com/connect/oauth2/authorize',
+        token_url: 'https://api.weixin.qq.com/sns/oauth2/access_token',
+      }
+
+      option :provider_ignores_state, true
+
+      uid { raw_info['unionid'] }
+
+      info do
+        {
+          nickname: raw_info['nickname'],
+          city: raw_info['city'],
+          avatar: raw_info['headimgurl'],
+          openid: access_token['openid']
+        }
+      end
+
+      def raw_info
+        @raw_info ||= begin
+                        response = access_token.get(
+                          '/sns/userinfo',
+                          { params: { access_token: access_token.token,
+                                      openid: access_token['openid'],
+                                      lang: 'zh-CN' },
+                                      parse: :json }
+                        ).parsed
+                        log :debug, response
+                        response
+                      end
+      end
+
+      def request_phase
+        redirect client.authorize_url(authorize_params)+'#wechat_redirect'
+      end
+
+      def authorize_params
+        params = options.authorize_params.merge({
+          appid: options.client_id,
+          redirect_uri: callback_url,
+          response_type: 'code',
+          state: request.params['state'],
+          scope: request.params['scope'] || 'snsapi_userinfo'
+        })
+        if OmniAuth.config.test_mode
+          @env ||= {}
+          @env["rack.session"] ||= {}
+        end
+        unless options.provider_ignores_state
+          params[:state] = SecureRandom.hex(24)
+          session["omniauth.state"] = params[:state]
+        end
+        params
+      end
+
+      def token_params
+        { appid: options.client_id, secret: options.client_secret }
+      end
+
+      def callback_phase
+        # 其它 app 需要获取微信openid 时,将 callbackurl 传入 state 参数
+        if request.params['state'].match(/\Ahttps?:\/\/(.*\.)?geekpark\.net\/.*\z/)
+          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
+        end
+      end
+
+      protected
+
+      def build_access_token
+        request_params = {
+          appid: options.client_id,
+          secret: options.client_secret,
+          code: request.params['code'],
+          grant_type: 'authorization_code',
+          parse: :json
+        }
+        client.get_token(request_params, {mode: :query})
+      end
+
+    end
+  end
+end
+
+OmniAuth.config.add_camelization('wechatservice', 'WeChatService')

data/lib/omniauth-geekpark/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GeekPark
-    VERSION = '1.0.4'
+    VERSION = '1.1.1'
   end
 end

data/lib/omniauth-geekpark.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-geekpark
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors:
 - HaoYunfei
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -120,7 +120,9 @@ 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
 - lib/patch/omniauth-oauth2.rb
 - omniauth-geekpark.gemspec
@@ -143,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.