scavin-weibo-oauth2 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4411365d02b0462f81067ba7f645424e1ce519a2fa4e921620d936e924a05005
-  data.tar.gz: 72739c5305156059ba7ac83ff0fc45edd99cb12d60d1018d0801b15162df73e9
+  metadata.gz: ee14837dc969fc19b8ff0496011aa51033331f48a9247fe463b38b45a3511db4
+  data.tar.gz: 80ad22f904f2a589a397e79f8bf57315986e0d282743ff1e69ba90359e888c3c
 SHA512:
-  metadata.gz: dc3cb027d3b4467a01cfff389381525001d0349f00c748dfc8ad2940ae0dca066ec52ff2b3f103d8a637d212408c998cff798c4f79feda80990147f75261237e
-  data.tar.gz: cee56beb4a4b497d5963fdade1d40697f5695277da93ee1a644591b2790ee63ea805e13f1375ab55284462e50ecb7ddbb48ace0b3d059052484102f127b8a452
+  metadata.gz: 9547014ecb3a1fe028a59d0510a3853e5aafd73fe0a4707b18d0df79015ba1372d184921f223db15d19540870fb83671cbc83676481dc986f59597f08c32c65b
+  data.tar.gz: 203cca9522e526bfba1e505ef5ce5427b77a55115521ebcc8f015c4ed06491c71a290a27b796547793bae943ad5f0d8efb204dbd7f67eeeaa50e9a39c8fc5d91

data/lib/omniauth/strategies/weibo.rb

@@ -1,8 +1,11 @@
 require "omniauth-oauth2"
+require "oauth2"
 
 module OmniAuth
   module Strategies
     class Weibo < OmniAuth::Strategies::OAuth2
+      class Error < OAuth2::Error; end
+
       option :client_options, {
         :site           => "https://api.weibo.com",
         :authorize_url  => "/oauth2/authorize",
@@ -50,18 +53,14 @@ module OmniAuth
         access_token.options[:param_name] = 'access_token'
         @uid ||= access_token.get('/2/account/get_uid.json').parsed["uid"]
         @raw_info ||= access_token.get("/2/users/show.json", :params => {:uid => @uid}).parsed
+      rescue ::OAuth2::Error => e
+        raise Error.new(e.response)
       end
 
       def find_image
         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
@@ -76,13 +75,6 @@ module OmniAuth
         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
-      # in the OmniAuth config :authorize_params option.
-      #
-      # /auth/weibo?display=mobile&with_offical_account=1
-      #
       def authorize_params
         super.tap do |params|
           %w[display with_offical_account forcelogin].each do |v|
@@ -90,7 +82,6 @@ module OmniAuth
               params[v.to_sym] = request.params[v]
             end
           end
-          # Ensure state parameter is properly set for CSRF protection
           session['omniauth.state'] = params[:state] = SecureRandom.hex(24)
         end
       end
@@ -101,34 +92,6 @@ module OmniAuth
         end
         super
       end
-
-      protected
-      def build_access_token
-        params = {
-          'client_id'     => client.id,
-          'client_secret' => client.secret,
-          'code'          => request.params['code'],
-          'grant_type'    => 'authorization_code',
-          'redirect_uri'  => callback_url
-          }.merge(token_params.to_hash(symbolize_keys: true))
-        begin
-          client.get_token(params, deep_symbolize(options.token_params))
-        rescue ::OAuth2::Error => e
-          raise OmniAuth::Strategies::OAuth2::Error.new(e)
-        rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
-          raise OmniAuth::Strategies::OAuth2::Error.new(e)
-        end
-      end
-
-      def callback_phase
-        super
-      rescue ::OAuth2::Error => e
-        fail!(:invalid_credentials, e)
-      rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
-        fail!(:timeout, e)
-      rescue ::SocketError => e
-        fail!(:failed_to_connect, e)
-      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module OmniAuth
   module ScavinWeiboOauth2
-    VERSION = "0.5.6"
+    VERSION = "0.5.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scavin-weibo-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Scavin
@@ -64,6 +64,7 @@ files:
 - scavin-weibo-oauth2-0.5.3.gem
 - scavin-weibo-oauth2-0.5.4.gem
 - scavin-weibo-oauth2-0.5.5.gem
+- scavin-weibo-oauth2-0.5.6.gem
 - scavin-weibo-oauth2.gemspec
 homepage: https://github.com/scavin/omniauth-weibo-oauth2
 licenses: