RubyGems - omniauth-jaccount - Versions diffs - 0.1.3 → 0.1.5 - Mend

omniauth-jaccount 0.1.3 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +5 -5
data/Gemfile.lock +48 -33
data/lib/omniauth/jaccount/version.rb +1 -1
data/lib/omniauth/strategies/jaccount.rb +15 -14
data/omniauth-jaccount.gemspec +6 -8
metadata +21 -44

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cea20086b1caeff033d67b2b982fdab818d9669c
-  data.tar.gz: 0dbb4661ce3752a1109c8f619667af811e660f2d
+SHA256:
+  metadata.gz: b9ec845ac5d4c3003fc9ba2cef08142610d07ad607f9f8c46c1148f52c3273b7
+  data.tar.gz: eee1a0e9bcceafbfa8a329dd02fbfc03506be84513440188c48cc0e5a7958a40
 SHA512:
-  metadata.gz: 23b23bdc4bec831582a1aa6ced677518513c942c8dc0236914d4b15d00d297293f2d659923f0c35f579f1e7b7b872b21b57a4320a27cb5028b35972b2b727196
-  data.tar.gz: 1ee4748ef0cccbe7f7eb50131ce10bddada62e9acd4b1d36091e7a87483ee9def2ebfffb4ab93b9d1a2a0c377ac9f897f6d89eafebac0ab0b1b77723f40475fe
+  metadata.gz: 9b06eb26133d5a6178d74a7638c068f843bace408d37801a88ed5a880c3d2f6be1d22247e4236198ee7eda8d808bcf1fd2a349033d7d2a8e7d58dfa18b48a99e
+  data.tar.gz: 807279cb64543341406672b1e25ea930781bc97f6e06356e57a993e2aa7906e5092b9a2f1a161181a3e52fbe130aed0835b4068b05aada75f545fea3d8cda4fe

data/Gemfile.lock CHANGED Viewed

@@ -1,57 +1,72 @@
 PATH
   remote: .
   specs:
-    omniauth-jaccount (0.1.2)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.0)
+    omniauth-jaccount (0.1.5)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    faraday (0.15.4)
+    diff-lcs (1.4.4)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    hashie (3.6.0)
-    jwt (2.1.0)
-    multi_json (1.13.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    hashie (4.1.0)
+    jwt (2.3.0)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    multipart-post (2.1.1)
+    oauth2 (1.4.7)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.9)
-    rack (2.0.5)
-    rake (10.4.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    omniauth-oauth2 (1.7.1)
+      oauth2 (~> 1.4)
+      omniauth (>= 1.9, < 3)
+    rack (2.2.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.5)
 PLATFORMS
   ruby
 DEPENDENCIES
-  bundler (~> 1.16)
   omniauth-jaccount!
-  rake (~> 10.0)
-  rspec (~> 3.0)
+  rspec (~> 3.5)
 BUNDLED WITH
-   1.16.4
+   2.2.29

data/lib/omniauth/jaccount/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Omniauth
   module Jaccount
-    VERSION = "0.1.3"
+    VERSION = "0.1.5"
   end
 end

data/lib/omniauth/strategies/jaccount.rb CHANGED Viewed

@@ -4,34 +4,35 @@ module OmniAuth
   module Strategies
     class JAccount < OmniAuth::Strategies::OAuth2
       option :client_options, {
-        :site => 'https://api.sjtu.edu.cn/v1',
-        :authorize_url => 'https://jaccount.sjtu.edu.cn/oauth2/authorize',
-        :token_url => 'https://jaccount.sjtu.edu.cn/oauth2/token'
+        site: 'https://api.sjtu.edu.cn/v1',
+        authorize_url: 'https://jaccount.sjtu.edu.cn/oauth2/authorize',
+        token_url: 'https://jaccount.sjtu.edu.cn/oauth2/token'
       }
-      option :authorize_params, {scope: "essential"}
-      def request_phase
-        super
+      def authorize_params
+        super.tap do |params|
+          %w[scope client_options].each do |v|
+            params[v.to_sym] = request.params[v] if request.params[v]
+          end
+        end
       end
-      uid { raw_info["id"].to_s }
+      uid { raw_info['id'].to_s }
       info do
         {
-          'email' => raw_info['account'] + "@sjtu.edu.cn",
-          'name' => raw_info['name']
+          'email': raw_info['account'] + '@sjtu.edu.cn',
+          'name': raw_info['name'],
+          'account': raw_info['account']
         }
       end
       extra do
-        {:raw_info => raw_info}
+        {raw_info: raw_info}
       end
       def raw_info
-        @raw_info ||= access_token.get('https://api.sjtu.edu.cn/v1/me/profile').parsed
-        #puts @raw_info
-        @raw_info["entities"][0]
+        @raw_info ||= access_token.get('/me/profile').parsed['entities'][0]
       end
       def callback_url

data/omniauth-jaccount.gemspec CHANGED Viewed

@@ -1,7 +1,7 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "omniauth/jaccount/version"
+# lib = File.expand_path("../lib", __FILE__)
+# $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require File.expand_path("../lib/omniauth/jaccount/version", __FILE__)
 Gem::Specification.new do |spec|
   spec.name          = "omniauth-jaccount"
@@ -21,9 +21,7 @@ Gem::Specification.new do |spec|
   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.0'
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_dependency 'omniauth', '~> 1.5'
+  spec.add_dependency 'omniauth-oauth2', '>= 1.4.0', '< 2.0'
+  spec.add_development_dependency 'rspec', '~> 3.5'
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-jaccount
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - feynixs
-autorequire:
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,71 +16,49 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 1.4.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 1.4.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-description:
+        version: '3.5'
+description:
 email:
 - feynixs@gmail.com
 executables: []
@@ -100,10 +78,10 @@ files:
 - lib/omniauth/jaccount/version.rb
 - lib/omniauth/strategies/jaccount.rb
 - omniauth-jaccount.gemspec
-homepage:
+homepage:
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,9 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.8
-signing_key:
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: omniauth for jaccount
 test_files: []