omniauth-geekpark 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e1a2c9770079752b67ac406a8e968b4b469d57c
-  data.tar.gz: e3c15275e539fe46e17266538dd531cf216d37cd
+  metadata.gz: b3e056f9fad34b96205bc0db48dbebbc38859207
+  data.tar.gz: c55a0157df2f979353b6c9c2631b2b216b401bf7
 SHA512:
-  metadata.gz: d401796b9847193e48f68d1ebe665123bed2ce49a7a33da7e8947a1969a1899f6e2a2a81120e6cbfa35eee7ee45fb0423498644757fc8351cd8b0026329a4342
-  data.tar.gz: 12cfc7d44e0094e089717052a796ba2344801fc478a7328116cbef0e69641883aad872d6dbe35b1058357b8d955a91f58efb79072a2253703f9040e89cfbfc7a
+  metadata.gz: 196d15878dbf0c0aea49cd3c6c11e2c3487ca477d415e09744f915287c964ac32498566c0a7ae29e7736eecd40a9be02e98a14fa764d6cb8e928204813773ea9
+  data.tar.gz: 5ea857a323b3248af357fcc94a9420ea373c7025197e4bc8c78960e990a53291205f63d4e70dce2945092c3bb94258b9c672443a08fa0982e7b85c061fbe3c21

data/Gemfile

@@ -1,12 +1,11 @@
-source 'http://rubygems.org'
-
+source 'https://gems.ruby-china.org'
 # Specify your gem's dependencies in omniauth-geekpark.gemspec
 gemspec
 
 group :development, :test do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-bundler'
-  gem 'rb-fsevent'
-  gem 'growl'
+  gem 'guard-rspec', require: false
+end
+
+group :test do
+  gem 'codeclimate-test-reporter', require: false
 end

data/Gemfile.lock

@@ -1,118 +1,114 @@
 PATH
   remote: .
   specs:
-    omniauth-geekpark (0.0.1)
+    omniauth-geekpark (0.2.0)
       omniauth (~> 1.0)
-      omniauth-oauth2 (>= 1.1.1, < 2.0)
+      omniauth-oauth2 (= 1.3.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://gems.ruby-china.org/
   specs:
-    addressable (2.3.8)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    coderay (1.1.0)
-    crack (0.4.2)
+    addressable (2.4.0)
+    codeclimate-test-reporter (0.5.0)
+      simplecov (>= 0.7.1, < 1.0.0)
+    coderay (1.1.1)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.8)
+    ffi (1.9.10)
     formatador (0.2.5)
-    growl (1.0.3)
-    guard (2.12.5)
+    guard (2.13.0)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-bundler (2.1.0)
-      bundler (~> 1.0)
-      guard (~> 2.2)
-      guard-compat (~> 1.1)
     guard-compat (1.2.1)
-    guard-rspec (4.5.0)
+    guard-rspec (4.6.5)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashie (3.4.1)
-    hitimes (1.2.2)
-    jwt (1.4.1)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    hashdiff (0.3.0)
+    hashie (3.4.3)
+    json (1.8.3)
+    jwt (1.5.1)
+    listen (3.0.6)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
+      rb-inotify (>= 0.9.7)
+    lumberjack (1.0.10)
     method_source (0.8.2)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nenv (0.2.0)
-    notiffany (0.0.6)
+    nenv (0.3.0)
+    notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth2 (1.0.0)
+    oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+      jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    omniauth (1.2.2)
+      rack (>= 1.2, < 3)
+    omniauth (1.3.1)
       hashie (>= 1.2, < 4)
-      rack (~> 1.0)
-    omniauth-oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
-      multi_json (~> 1.3)
+      rack (>= 1.0, < 3)
+    omniauth-oauth2 (1.3.1)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.0)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
+    rack (1.6.4)
+    rake (10.5.0)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.3)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     safe_yaml (1.0.4)
     shellany (0.0.1)
-    simplecov (0.9.2)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     thor (0.19.1)
-    timers (4.0.1)
-      hitimes
-    webmock (1.21.0)
+    webmock (1.24.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  growl
-  guard
-  guard-bundler
+  bundler (~> 1.11)
+  codeclimate-test-reporter
   guard-rspec
   omniauth-geekpark!
-  rack-test
-  rb-fsevent
-  rspec (~> 2.7)
-  simplecov
-  webmock
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  webmock (~> 1.24, >= 1.24.2)
+
+BUNDLED WITH
+   1.11.2

data/Guardfile

@@ -1,10 +1,32 @@
-guard 'rspec', :version => 2 do
+
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Gem files
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
-
-guard 'bundler' do
-  watch('Gemfile')
-  watch('omniauth-geekpark.gemspec')
-end

data/Rakefile

@@ -1,8 +1,6 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new(:spec)
 
-desc 'Run specs'
-task :default => :spec
+task default: :spec

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'omniauth-geekpark'
+
+require "pry"
+Pry.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/omniauth-geekpark.rb

@@ -1,2 +1,5 @@
-require "omniauth-geekpark/version"
+require 'omniauth-geekpark/version'
+require 'omniauth-oauth2'
+require 'patch/omniauth-oauth2'
 require 'omniauth/strategies/geekpark'
+require 'omniauth/strategies/wechat'

data/lib/omniauth-geekpark/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GeekPark
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/lib/omniauth/strategies/geekpark.rb

@@ -1,5 +1,3 @@
-require 'omniauth-oauth2'
-
 module OmniAuth
   module Strategies
     class GeekPark < OmniAuth::Strategies::OAuth2
@@ -13,15 +11,15 @@ module OmniAuth
 
       info do
         {
-          'username' => raw_info['username'],
-          'realname' => raw_info['realname'],
-          'email' => raw_info['email'],
-          'company' => raw_info['company'],
-          'position' => raw_info['position'],
-          'mobile' => raw_info['mobile'],
-          'avatar' => raw_info['avatar'],
-          'bio' => raw_info['bio'],
-          'mygeekpark_open_id' => raw_info['mygeekpark_open_id'],
+          username: raw_info['username'],
+          realname: raw_info['realname'],
+          email: raw_info['email'],
+          company: raw_info['company'],
+          position: raw_info['position'],
+          mobile: raw_info['mobile'],
+          avatar: raw_info['avatar'],
+          bio: raw_info['bio'],
+          mygeekpark_open_id: raw_info['mygeekpark_open_id'],
         }
       end
 

data/lib/omniauth/strategies/wechat.rb

@@ -0,0 +1,75 @@
+module OmniAuth
+  module Strategies
+    class WeChat < OmniAuth::Strategies::OAuth2
+      option :client_options, {
+        site: 'https://api.weixin.qq.com',
+        authorize_url: 'https://open.weixin.qq.com/connect/qrconnect',
+        token_url: 'https://api.weixin.qq.com/sns/oauth2/access_token',
+      }
+
+      uid { raw_info['unionid'] }
+
+      info do
+        {
+          nickname: raw_info['nickname'],
+          city: raw_info['city'],
+          avatar: raw_info['headimgurl']
+        }
+      end
+
+      def raw_info
+        @raw_info ||= begin
+                        response = access_token.get(
+                          '/sns/userinfo',
+                          { params: { access_token: access_token.token,
+                                      openid: access_token['openid'],
+                                      lang: 'zh-CN' },
+                                      parse: :json }
+                        ).parsed
+                        log :debug, response
+                        response
+                      end
+      end
+
+      def request_phase
+        redirect client.authorize_url(authorize_params)+'#wechat_redirect'
+      end
+
+      def authorize_params
+        options.authorize_params[:state] = SecureRandom.hex(24)
+        params = options.authorize_params.merge({
+          appid: options.client_id,
+          redirect_uri: callback_url,
+          response_type: 'code',
+          scope: request.params['scope'] || 'snsapi_login',
+        })
+        if OmniAuth.config.test_mode
+          @env ||= {}
+          @env["rack.session"] ||= {}
+        end
+        session["omniauth.state"] = params[:state]
+        params
+      end
+
+      def token_params
+        { appid: options.client_id, secret: options.client_secret }
+      end
+
+      protected
+
+      def build_access_token
+        request_params = {
+          appid: options.client_id,
+          secret: options.client_secret,
+          code: request.params['code'],
+          grant_type: 'authorization_code',
+          parse: :json
+        }
+        client.get_token(request_params, {mode: :query})
+      end
+
+    end
+  end
+end
+
+OmniAuth.config.add_camelization('wechat', 'WeChat')

data/lib/patch/omniauth-oauth2.rb

@@ -0,0 +1,20 @@
+class OmniAuth::Strategies::OAuth2
+  def callback_phase # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
+    error = request.params["error_reason"] || request.params["error"]
+    if error
+      fail!(error, CallbackError.new(request.params["error"], request.params["error_description"] || request.params["error_reason"], request.params["error_uri"]))
+    elsif !options.provider_ignores_state && (request.params["state"].to_s.empty? || request.params["state"] != session.delete("omniauth.state"))
+      fail!(:csrf_detected, CallbackError.new(:csrf_detected, "CSRF detected"))
+    else
+      self.access_token = build_access_token
+      fail!(:token_expired, CallbackError.new(:token_expired,'Token has expired, refresh and try again.')) if access_token.expired?
+      super
+    end
+  rescue ::OAuth2::Error, CallbackError => e
+    fail!(:invalid_credentials, e)
+  rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
+    fail!(:timeout, e)
+  rescue ::SocketError => e
+    fail!(:failed_to_connect, e)
+  end
+end

data/omniauth-geekpark.gemspec

@@ -1,27 +1,28 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/omniauth-geekpark/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'omniauth-geekpark/version'
 
-Gem::Specification.new do |gem|
-  gem.authors       = %w(HaoYunfei Gavin)
-  gem.email         = ["cloudy9101@126.com"]
-  gem.description   = %q{Official OmniAuth strategy for GeekPark.}
-  gem.summary       = %q{Official OmniAuth strategy for GeekPark.}
-  gem.homepage      = "https://github.com/GeekPark/omniauth-geekpark"
-  gem.license       = "MIT"
+Gem::Specification.new do |spec|
+  spec.name          = 'omniauth-geekpark'
+  spec.version       = OmniAuth::GeekPark::VERSION
+  spec.authors       = %w(HaoYunfei Gavin)
+  spec.email         = ["haoyunfei@geekpark.net"]
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "omniauth-geekpark"
-  gem.require_paths = ["lib"]
-  gem.version       = OmniAuth::GeekPark::VERSION
+  spec.summary       = %q{ OmniAuth strategies for GeekPark. Includes geekpark, weibo and wechat. }
+  spec.description   = %q{ Official OmniAuth strategies for GeekPark. }
+  spec.homepage      = "https://github.com/GeekPark/omniauth-geekpark"
+  spec.license       = "MIT"
 
-  gem.add_dependency 'omniauth', '~> 1.0'
-  # Nothing lower than omniauth-oauth2 1.1.1
-  # http://www.rubysec.com/advisories/CVE-2012-6134/
-  gem.add_dependency 'omniauth-oauth2', '>= 1.1.1', '< 2.0'
-  gem.add_development_dependency 'rspec', '~> 2.7'
-  gem.add_development_dependency 'rack-test'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'webmock'
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'omniauth', '~> 1.0'
+  spec.add_dependency 'omniauth-oauth2', '1.3.1'
+  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'webmock', '~> 1.24', '>= 1.24.2'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-geekpark
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - HaoYunfei
 - Gavin
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -29,81 +29,81 @@ dependencies:
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.24'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.24'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: Official OmniAuth strategy for GeekPark.
+        version: 1.24.2
+description: " Official OmniAuth strategies for GeekPark. "
 email:
-- cloudy9101@126.com
+- haoyunfei@geekpark.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -114,12 +114,14 @@ files:
 - Guardfile
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - lib/omniauth-geekpark.rb
 - lib/omniauth-geekpark/version.rb
 - lib/omniauth/strategies/geekpark.rb
+- lib/omniauth/strategies/wechat.rb
+- lib/patch/omniauth-oauth2.rb
 - omniauth-geekpark.gemspec
-- spec/omniauth/strategies/geekpark_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/GeekPark/omniauth-geekpark
 licenses:
 - MIT
@@ -140,10 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
-summary: Official OmniAuth strategy for GeekPark.
-test_files:
-- spec/omniauth/strategies/geekpark_spec.rb
-- spec/spec_helper.rb
+summary: OmniAuth strategies for GeekPark. Includes geekpark, weibo and wechat.
+test_files: []

data/spec/omniauth/strategies/geekpark_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe OmniAuth::Strategies::GeekPark do
-  let(:access_token) { double('AccessToken', options: {}) }
-  let(:parsed_response) { double('ParsedResponse') }
-  let(:response) { double('Response', parsed: parsed_response) }
-
-  subject do
-    OmniAuth::Strategies::GeekPark.new({})
-  end
-
-  before(:each) do
-    subject.stub(:access_token).and_return(access_token)
-  end
-
-  context 'client options' do
-    it 'should have correct site' do
-      subject.options.client_options.site.should eq('http://www.geekpark.net')
-    end
-
-    it 'should have correct authorize url' do
-      subject.options.client_options.authorize_url.should eq('http://www.geekpark.net/oauth2/authorize')
-    end
-
-    it 'should have corrent token url' do
-      subject.options.client_options.token_url.should eq('http://www.geekpark.net/oauth2/token')
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,16 +0,0 @@
-$:.unshift File.expand_path('..', __FILE__)
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'simplecov'
-SimpleCov.start
-require 'rspec'
-require 'rack/test'
-require 'webmock/rspec'
-require 'omniauth'
-require 'omniauth-geekpark'
-
-RSpec.configure do |config|
-  config.include WebMock::API
-  config.include Rack::Test::Methods
-  config.extend  OmniAuth::Test::StrategyMacros, type: :strategy
-end
-