omniauth-wechat-oauth2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8ce6f400f236ade461b6de6f0475e29d6efa2663
-  data.tar.gz: 7406fddc873587f98f976085265bccee6c450d4c
+SHA256:
+  metadata.gz: 90919b05aecd6b3de0d6d41e1c0e18bac5abbc10d70a2d59c406a4acc139cb99
+  data.tar.gz: 70f0b3689eabd805a81e15c4ecc7ea80e68c2f1dfde663472d8f74807b9aa5df
 SHA512:
-  metadata.gz: 324edff8a03b06a2eec788c5a612efef7ca2099be123fe721f6d77995a94a59f9a35e2adc5a52599d21cd1a00d880a5e7522155d1fa447e0cdecd67c91f3645e
-  data.tar.gz: a2cdacfde5eb3c2f0d87a7a5f30bde685315d242f6dbc5c9247a43a42502b60996b2d7702adb4031f9f8f62fc4564181afa391977a46a31b38479f8004bb6dea
+  metadata.gz: ec12ab658d9e4a71ad8d7fee8af7e2a14d6884fb13fa92f70004becd5598bbffdc6a668b21089ef74d9e7a7c39e9138f2754f43eac7d67b5fadd8c3e133feef8
+  data.tar.gz: 940c92c6ea780000f4b0a3cc1c207cee2828f2c7ae635825ae0e63a9ed1d32869de39fd75dfed0bef60f49675a95ec6900ca3e7ae0b8da8d902f62b19ae26f34

data/README.md

@@ -1,11 +1,20 @@
 Omniauth-wechat-oauth2
 ======================
 
-Wechat OAuth2 Strategy for OmniAuth 1.0. 
+[![Gem Version](https://img.shields.io/gem/v/omniauth-wechat-oauth2.svg)][gem]
+[![Security Check](https://hakiri.io/github/NeverMin/omniauth-wechat-oauth2/master.svg)][security]
+[![Build Status](https://travis-ci.org/NeverMin/omniauth-wechat-oauth2.svg)][travis]
 
-You need to get a wechat API key at: http://mp.weixin.qq.com
+[gem]: https://rubygems.org/gems/omniauth-weibo-oauth2
+[security]: https://hakiri.io/github/NeverMin/omniauth-wechat-oauth2/master
+[travis]: https://travis-ci.org/NeverMin/omniauth-wechat-oauth2
 
-Wechat oauth2 specification can be found at: http://mp.weixin.qq.com/wiki/index.php?title=网页授权获取用户基本信息
+
+Wechat OAuth2 Strategy for OmniAuth 1.0.
+
+You need to get a wechat API key at: https://mp.weixin.qq.com
+
+Wechat oauth2 specification can be found at: https://mp.weixin.qq.com/wiki/index.php?title=网页授权获取用户基本信息
 
 ## Installation
 

data/lib/omniauth-wechat-oauth2.rb

@@ -1 +1,2 @@
 require "omniauth/strategies/wechat"
+require "omniauth/strategies/wechat_qiye"

data/lib/omniauth/strategies/wechat.rb

@@ -46,9 +46,12 @@ module OmniAuth
         @raw_info ||= begin
           access_token.options[:mode] = :query
           if access_token["scope"] == "snsapi_userinfo"
-            @raw_info = access_token.get("/sns/userinfo", :params => {"openid" => @uid}, parse: :json).parsed
+            response = access_token.get("/sns/userinfo", :params => {"openid" => @uid, "lang" => "zh_CN"}, parse: :text)
+            @raw_info = JSON.parse(response.body.gsub(/[\u0000-\u001f]+/, ''))
           else
             @raw_info = {"openid" => @uid }
+            @raw_info.merge!("unionid" => access_token["unionid"]) if access_token["unionid"]
+            @raw_info
           end
         end
       end

data/lib/omniauth/strategies/wechat_qiye.rb

@@ -0,0 +1,80 @@
+require "omniauth-oauth2"
+
+module OmniAuth
+  module Strategies
+    class WechatQiye < OmniAuth::Strategies::OAuth2
+      option :name, "wechat_qiye"
+
+      option :client_options, {
+                                :site => "https://qyapi.weixin.qq.com",
+                                authorize_url: "https://open.weixin.qq.com/connect/oauth2/authorize#wechat_redirect",
+                                token_url:     "/cgi-bin/gettoken",
+                                token_method:  :get,
+                                connection_opts: {
+                                    ssl: { verify: false }
+                                }
+                              }
+
+      option :authorize_params, {scope: "snsapi_userinfo"}
+      option :token_params, {parse: :json}
+
+      uid do
+        raw_info['userid']
+      end
+
+      info do
+        {
+            userid:     raw_info['userid'],
+            name:       raw_info['name'],
+            department: raw_info['department'],
+            gender:     raw_info['gender'],
+            weixinid:   raw_info['weixinid'],
+            avatar:     raw_info['avatar'],
+            status:     raw_info['status'],
+            extattr:    raw_info['extattr']
+        }
+      end
+
+      extra do
+        { raw_info: raw_info }
+      end
+
+      def request_phase
+        params = client.auth_code.authorize_params.merge(redirect_uri: callback_url).merge(authorize_params)
+        params["appid"] = params.delete("client_id")
+        redirect client.authorize_url(params)
+      end
+
+      def raw_info
+        # step 2: get userid via code and access_token
+        @code ||= access_token[:code]
+
+        # step 3: get user info via userid
+        @uid ||= begin
+          access_token.options[:mode] = :query
+          response = access_token.get('/cgi-bin/user/getuserinfo', :params => {'code' => @code}, parse: :json)
+          response.parsed['UserId']
+        end
+
+        @raw_info ||= begin
+          access_token.options[:mode] = :query
+          response = access_token.get("/cgi-bin/user/get", :params => {"userid" => @uid}, parse: :json)
+          response.parsed
+        end
+      end
+
+      protected
+      def build_access_token
+        # step 0: wechat respond code
+        code = request.params['code']
+
+        # step 1: get access token
+        params = {
+            'corpid' => client.id,
+            'corpsecret' => client.secret,
+        }.merge(token_params.to_hash(symbolize_keys: true))
+        client.get_token(params, deep_symbolize(options.auth_token_params.merge({code: code})))
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-wechat-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Skinnyworm
+- Never Min
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,28 +17,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +55,9 @@ dependencies:
         version: '2.7'
 description: Using OAuth2 to authenticate wechat user when web resources being viewed
   within wechat(weixin) client.
-email: askinnyworm@gmail.com
+email:
+- askinnyworm@gmail.com
+- Never.Min@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -62,8 +65,10 @@ files:
 - README.md
 - lib/omniauth-wechat-oauth2.rb
 - lib/omniauth/strategies/wechat.rb
-homepage: https://github.com/skinnyworm/omniauth-wechat-oauth2
-licenses: []
+- lib/omniauth/strategies/wechat_qiye.rb
+homepage: https://github.com/nevermin/omniauth-wechat-oauth2
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -73,16 +78,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.23
+      version: '0'
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Omniauth strategy for wechat(weixin)