scavin-weibo-oauth2 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71c6ac3d8281cf957b6b661ec73a9c935de5a3af8f4e52c3dc63fc405a71c0db
-  data.tar.gz: 7e8541afa82c668c21cb4d62ad06970b899df630ac95600874c8c60de554f538
+  metadata.gz: ee14837dc969fc19b8ff0496011aa51033331f48a9247fe463b38b45a3511db4
+  data.tar.gz: 80ad22f904f2a589a397e79f8bf57315986e0d282743ff1e69ba90359e888c3c
 SHA512:
-  metadata.gz: 0d910da50f95629313e9d09cedc013ced1ef55d530c7c3744cbd9e95cb3f451f46531ac6bce54e2ec73b041a1bf2f9f3334051d1131a3577e29d236704aed8c7
-  data.tar.gz: 0c3b77497b219e39347abc8276f6756533644f5a799108c3b9b1ed5ccb06441c6fee42ed7833677a4d4153ef1abfd266aba936f50d2f7891ffef7e1e4588da90
+  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

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

data/lib/scavin-weibo-oauth2.rb

@@ -0,0 +1,2 @@
+require "scavin-weibo-oauth2/version"
+require 'omniauth/strategies/weibo'

data/scavin-weibo-oauth2.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/omniauth-weibo-oauth2/version', __FILE__)
+require File.expand_path('../lib/scavin-weibo-oauth2/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = "Scavin"
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "scavin-weibo-oauth2"
   gem.require_paths = ["lib"]
-  gem.version       = OmniAuth::WeiboOauth2::VERSION
+  gem.version       = OmniAuth::ScavinWeiboOauth2::VERSION
 
   gem.add_dependency 'omniauth', '~> 2.0'
   gem.add_dependency 'omniauth-oauth2', '~> 1.4', '>= 1.4.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scavin-weibo-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
 platform: ruby
 authors:
 - Scavin
@@ -56,11 +56,15 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- lib/omniauth-weibo-oauth2.rb
-- lib/omniauth-weibo-oauth2/version.rb
 - lib/omniauth/.DS_Store
 - lib/omniauth/strategies/weibo.rb
 - lib/omniauth/strategies/weibo_post_middleware.rb
+- lib/scavin-weibo-oauth2.rb
+- lib/scavin-weibo-oauth2/version.rb
+- 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:

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

@@ -1,5 +0,0 @@
-module OmniAuth
-  module WeiboOauth2
-    VERSION = "0.5.5"
-  end
-end

data/lib/omniauth-weibo-oauth2.rb

@@ -1,2 +0,0 @@
-require "omniauth-weibo-oauth2/version"
-require 'omniauth/strategies/weibo'