omniauth-weibo-oauth2 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2447724a9eb14cae153f4df299a230ac70a6b5c8
-  data.tar.gz: a043480c8c10a7a9d33e1b58501801aa5bc0da3d
+  metadata.gz: 9c90da889897455e5e4761ed5ee66ef40a5d9763
+  data.tar.gz: 450175fbfeb1cb8c53012f282fd675e178baf72e
 SHA512:
-  metadata.gz: a86e6ca738c3bbb9aa84b47d7bb672b64497cb8d48a32fd1fd4e900bac60dcaa10225da9cc42dbe9601c2761a687e39067772c21f4fb0e6f11603c2b4479e7d1
-  data.tar.gz: 3db001dc2e88b7b5396942d95f2905123bd4e8b713cbdb0abed5995b23a7e86d42a04687ab5f7a160680513b0074afd33c148900cb46377eb9c5270e30fab23a
+  metadata.gz: 5b619ddbc6ff1a0163958a13c2d004d689746ddc6accd56d3bdefd1b11b87378fe4b15357a15d357ca5f89a5c62420ab8ce08d387a66afb9d9334312544f10d0
+  data.tar.gz: 143eede4cdd702e319ee9d7f10a938ee380a51d87e908f9f4b261e12859663a64634fd11a78575911acf991d1d0d5581cecd370832d13a46851bc6cbdd2df0f7

data/.gitignore

@@ -1,3 +1,4 @@
 .bundle
 *.swp
+.gem
 Gemfile.lock

data/README.md

@@ -29,6 +29,23 @@ Rails.application.config.middleware.use OmniAuth::Builder do
   provider :weibo, ENV['WEIBO_KEY'], ENV['WEIBO_SECRET']
 end
 ```
+## Configuration
+
+you can set up redirect_uri in `omniauth.rb` as following:
+
+```ruby
+provider :weibo, ENV['WEIBO_KEY'], ENV['WEIBO_SECRET'],
+         token_params: {redirect_uri: "http://127.0.0.1:3000/auth/weibo/callback" }
+```
+
+## Authentication Option
+* **image_size**: This option defines the size of the user's image in *Authentication Hash* (info['image']). Valid options include `small` (30x30), `middle` (50x50), `large` (180x180) and `original` (the size of the image originally uploaded). Default is `middle`.
+
+```ruby
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :weibo, ENV['WEIBO_KEY'], ENV['WEIBO_SECRET'], :image_size => 'original'
+end
+```
 
 ## Authentication Hash
 
@@ -78,4 +95,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/omniauth-weibo-oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module WeiboOauth2
-    VERSION = "0.4.0"
+    VERSION = "0.4.2"
   end
 end

data/lib/omniauth/strategies/weibo.rb

@@ -6,7 +6,8 @@ module OmniAuth
       option :client_options, {
         :site           => "https://api.weibo.com",
         :authorize_url  => "/oauth2/authorize",
-        :token_url      => "/oauth2/access_token"
+        :token_url      => "/oauth2/access_token",
+        :token_method => :post
       }
       option :token_params, {
         :parse          => :json
@@ -21,11 +22,11 @@ module OmniAuth
           :nickname     => raw_info['screen_name'],
           :name         => raw_info['name'],
           :location     => raw_info['location'],
-          :image        => find_image,
+          :image        => image_url,
           :description  => raw_info['description'],
           :urls => {
             'Blog'      => raw_info['url'],
-            'Weibo'     => raw_info['domain'].present?? "http://weibo.com/#{raw_info['domain']}" : "http://weibo.com/u/#{raw_info['id']}",
+            'Weibo'     => raw_info['domain'].empty? ? "http://weibo.com/u/#{raw_info['id']}" : "http://weibo.com/#{raw_info['domain']}",
           }
         }
       end
@@ -47,6 +48,26 @@ module OmniAuth
         raw_info[%w(avatar_hd avatar_large profile_image_url).find { |e| raw_info[e].present? }]
       end
 
+      #url:                 option:   size:
+      #avatar_hd            original  original_size
+      #avatar_large         large     180x180
+      #profile_image_url    middle    50x50
+      #                     small     30x30
+      #default is middle
+      def image_url
+        image_size = options[:image_size] || :middle
+        case image_size.to_sym
+        when :original
+          url = raw_info['avatar_hd']
+        when :large
+          url = raw_info['avatar_large']
+        when :small
+          url = raw_info['avatar_large'].sub('/180/','/30/')
+        else
+          url = raw_info['profile_image_url']
+        end
+      end
+
       ##
       # You can pass +display+, +with_offical_account+ or +state+ params to the auth request, if
       # you need to set them dynamically. You can also set these options
@@ -63,7 +84,18 @@ module OmniAuth
           end
         end
       end
-      
+
+      protected
+      def build_access_token
+        params = {
+          'client_id' => client.id,
+          'client_secret' => client.secret,
+          'code' => request.params['code'],
+          'grant_type' => 'authorization_code'
+        }.merge(token_params.to_hash(symbolize_keys: true))
+        client.get_token(params, deep_symbolize(options.auth_token_params))
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-weibo-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Bin He
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: OmniAuth Oauth2 strategy for weibo.com.