oauth2_dingtalk 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3d012bf98b1dc7ca8cbbf7c43f1869415754d1a
-  data.tar.gz: 1fb0e703a6a8187d52c3d246f8a80041ed5c909e
+  metadata.gz: f094f2ae0851b8d3ef012277cd7b19604caa24f5
+  data.tar.gz: 554102e2502536878ac3bbecd23ff668f5a41776
 SHA512:
-  metadata.gz: 5aeaf74e1bb4c37b155d9c8444a2eb9f57d4ba13076c2e1648fdf2b38b4d770cccc1c1645cd60d6d3d9930b5cb9f3246ebe547f786653170036061968d09379b
-  data.tar.gz: dec0b555d7877dd764ca489b97d6a90487a65db673ba6e3a3a4fd022ca506195d30733f0bdb31f06a7927615c945165fa53b45529d2d9d31d3579fc5b26b8910
+  metadata.gz: 0df169d104797d520f06e6174a2fe58545c5564daa02805c1564e77672e94868ab85eba446954707c0f339fe2554dc41bb47e204541dd6b5e68d276c792ee441
+  data.tar.gz: a5dee3785d82e17a08228f202f53f28c7dc9382bbd1a1809e2a5f263e8b207c51a2719e0d6ff2a32813c276496c5d966d511541bc6a4e19e1ff67fd4af3c36fe

data/.rspec

@@ -1,2 +1,2 @@
---format documentation
+--format progress
 --color

data/README.md

@@ -1,36 +1,52 @@
-# Oauth2Dingtalk
+[![Gem Version](https://badge.fury.io/rb/oauth2_dingtalk.svg)](https://badge.fury.io/rb/oauth2_dingtalk)
 
-该 Gem 的主要是使用钉钉扫码登录 Gitlab。
+# Omniauth DingTalk Strategies
 
-## Usage
+Strategy to authenticate with DingTalk via OAuth2 in OmniAuth.
 
-1. 和其他的 Oauth2 Gem 一样，在 Gemfile 里面添加：
-```
-gem 'oauth2_dingtalk'
-```
+Get your API key at: http://open-dev.dingtalk.com/  Note the appId and the appSecret.
+
+For more details, read the DingTalk docs: https://open-doc.dingtalk.com/docs/doc.htm?spm=0.0.0.0.oVQWJc&treeId=168&articleId=104878&docType=1
 
-2. 然后在`config/initializers`里添加文件`dingding.rb`:
+## Installation
+
+Add to your `Gemfile`:
 
 ```ruby
-# config/initializers/dingding.rb
-  Rails.application.config.middleware.use OmniAuth::Builder do
-    provider :dingding, "Your_OAuth_App_ID", "Your_OAuth_App_Secret"
-  end
+gem 'oauth2_dingtalk'
 ```
 
-3. 然后可以看 example 文件里面的例子，如果是在 Rails 项目里面使用的话，可以在路由那边添加：
+Then `bundle install`.
+
+## appId & appSecret
+
+Go to: https://open-doc.dingtalk.com/docs/doc.htm?spm=a219a.7629140.0.0.o96KrM&treeId=168&articleId=104882&docType=1
+
+## Usage
+
+Here's an example for adding the middleware to a Rails app in `config/initializers/omniauth.rb`:
 
 ```ruby
-  get '/auth/:provider/callback', 'sessions#create'
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :dingding, "Your_OAuth_App_ID", "Your_OAuth_App_Secret"
+end
 ```
 
-或者其他的方式。
+You can now access the OmniAuth DingTalk OAuth2 URL: /auth/dingding
 
-4. 最主要的是
-```
-  auth = request.env["omniauth.auth"]
-  auth["provider"]   # dingding
-  auth["uid"]        # 用户在当前开放应用内的唯一标识
-```
+For more examples please check out example/config.ru
 
-可参考：http://railscasts.com/episodes/241-simple-omniauth?autoplay=true
+## Auth Hash
+
+Here's an example of an authentication hash available in the callback by accessing `request.env['omniauth.auth']`:
+
+```ruby
+{
+  "provider": "dingding",
+  "uid": "uid",
+  "info": {
+    "name": "liukun",
+    "ding_id": "ding_id"
+  }
+}
+```

data/lib/oauth2_dingtalk/version.rb

@@ -1,3 +1,3 @@
 module Oauth2Dingtalk
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/omniauth/strategies/dingding.rb

@@ -10,17 +10,20 @@ module OmniAuth
              authorize_url: '/connect/qrconnect',
              token_url:     '/sns/gettoken',
              persistent_url: '/sns/get_persistent_code',
+             sns_token: '/sns/get_sns_token',
+             user_info: '/sns/getuserinfo',
              token_method: :get
 
       option :authorize_params, scope: 'snsapi_login'
 
       uid do
-        raw_info['openid']
+        raw_info['user_info']['unionid']
       end
 
       info do
         {
-          unionid: raw_info['unionid']
+          name: raw_info['user_info']['nick'],
+          ding_id: raw_info['user_info']['dingId']
         }
       end
 
@@ -35,11 +38,9 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||=
-          access_token.post(options.client_options[:persistent_url] + "?access_token=#{access_token.token}") do |req|
-            req.headers['Content-Type'] = 'application/json'
-            req.body = "{\"tmp_auth_code\":\"#{request.params['code']}\"}"
-          end.parsed
+        return persistent_code if persistent_code['errcode'] != 0
+        return sns_token if sns_token['errcode'] != 0
+        user_info
       end
 
       protected
@@ -51,6 +52,28 @@ module OmniAuth
         }
         client.get_token(params)
       end
+
+      def persistent_code
+        @persistent_code ||=
+          access_token.post(options.client_options.persistent_url + "?access_token=#{access_token.token}") do |req|
+            req.headers['Content-Type'] = 'application/json'
+            req.body = "{\"tmp_auth_code\":\"#{request.params['code']}\"}"
+          end.parsed
+      end
+
+      def sns_token
+        @sns_token ||=
+          access_token.post(options.client_options.sns_token + "?access_token=#{access_token.token}") do |req|
+            req.headers['Content-Type'] = 'application/json'
+            req.body = "{\"openid\":\"#{@persistent_code['openid']}\",
+                      \"persistent_code\":\"#{@persistent_code['persistent_code']}\"}"
+          end.parsed
+      end
+
+      def user_info
+        @user_info ||=
+          access_token.get(options.client_options.user_info + "?sns_token=#{@sns_token['sns_token']}").parsed
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth2_dingtalk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - liukun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler