omniauth-gitee 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e417ac429ac35665584df4030aa90ec4e33286df6fcc367ff6067be8f23a997f
-  data.tar.gz: d29dc59a39a9e716b9d6272c496e70a8d371a568fd46a48dbb659e0222475d07
+  metadata.gz: d56bad689067c680232ae928a05e410ce57bb01f1eada5bfe720eed8262a1eeb
+  data.tar.gz: 21d8acbf9567dd8bc84c18f3d014f722ef5533e87fcb2d5de6f8e1cc26bb6328
 SHA512:
-  metadata.gz: 23cfb2519e8678adade98b1c97c3ce8576fbca1b541e73e8d191f389c3d4a0757bbfc7e5d8328e624e2fc5a4e4094210d0f8de2562403f259df0c0e77d9cbf7f
-  data.tar.gz: 8ef217c2300f608c5446e8528e7980b675db317ff5c4ba28ddbfc5fcc3ae8f2c939f3519dfdd2722f44f4cf75c256db96efbf905cc0759de61e542efbbb9c873
+  metadata.gz: ba34fe3b4933fc9ac51c4a0c2b016d55640ad778a79e55864ac2055a39ed5497bc0d95f060758b53ec9274c8958f16c35520844265df20cf2de1c4ef80bbaf60
+  data.tar.gz: 372d421c7e636382f68d81a1e08698e778c054fc0bbf77525100a80e309afe6471142e15205ca61beca0e8ed85b4eb2d4ac8b4fc2e2474deb9e30bf00b6d4099

data/lib/omniauth/strategies/gitee.rb

@@ -4,7 +4,7 @@ module OmniAuth
   module Strategies
     class Gitee < OmniAuth::Strategies::OAuth2
       option :client_options, {
-        :site => 'https://gitee.com',
+        :site => 'https://gitee.com/api/v5/',
         :authorize_url => 'https://gitee.com/oauth/authorize',
         :token_url => 'https://gitee.com/oauth/token'
       }
@@ -32,8 +32,9 @@ module OmniAuth
           'name' => raw_info['name'],
           'image' => raw_info['avatar_url'],
           'urls' => {
-            'GitHub' => raw_info['html_url'],
+            'Gitee' => raw_info['html_url'],
             'Blog' => raw_info['blog'],
+            'Weibo' => raw_info['weibo'],
           },
         }
       end
@@ -56,7 +57,7 @@ module OmniAuth
       end
 
       def primary_email
-        primary = emails.find{ |i| i['primary'] && i['verified'] }
+        primary = emails.find{ |i| (i['scope'].include? 'primary') && i['state'] == 'confirmed' }
         primary && primary['email'] || nil
       end
 
@@ -64,13 +65,13 @@ module OmniAuth
       def emails
         return [] unless email_access_allowed?
         access_token.options[:mode] = :header
-        @emails ||= access_token.get('user/emails', :headers => { 'Accept' => 'application/vnd.github.v3' }).parsed
+        @emails ||= access_token.get('emails').parsed
       end
 
       def email_access_allowed?
         return false unless options['scope']
-        email_scopes = ['user', 'user:email']
-        scopes = options['scope'].split(',')
+        email_scopes = %w[user_info emails]
+        scopes = options['scope'].split(' ')
         (scopes & email_scopes).any?
       end
 

data/lib/omniauth-gitee/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Gitee
-    VERSION = "0.0.1"
+    VERSION = "1.0.0"
   end
 end

data/omniauth-gitee.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = OmniAuth::Gitee::VERSION
 
-  gem.add_dependency 'omniauth', '~> 2.0'
-  gem.add_dependency 'omniauth-oauth2', '~> 1.7.1'
+  gem.add_dependency 'omniauth', '>= 1.5', '< 3.0'
+  gem.add_dependency 'omniauth-oauth2', '>= 1.4.0', '< 2.0'
   gem.add_development_dependency 'rspec', '~> 3.5'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'simplecov'

data/spec/omniauth/strategies/github_spec.rb

@@ -15,7 +15,7 @@ describe OmniAuth::Strategies::Gitee do
 
   context 'client options' do
     it 'should have correct site' do
-      expect(subject.options.client_options.site).to eq('https://gitee.com')
+      expect(subject.options.client_options.site).to eq('https://gitee.com/api/v5/')
     end
 
     it 'should have correct authorize url' do
@@ -34,19 +34,19 @@ describe OmniAuth::Strategies::Gitee do
     end
 
     it 'should allow email if scope is user' do
-      subject.options['scope'] = 'user'
+      subject.options['scope'] = 'user_info'
       expect(subject).to be_email_access_allowed
     end
 
-    it 'should allow email if scope is a bunch of stuff including user' do
-      subject.options['scope'] = 'public_repo,user,repo,delete_repo,gist'
+    it 'should allow email if scope is a bunch of stuff including user_info' do
+      subject.options['scope'] = 'public_repo user_info repo delete_repo gist'
       expect(subject).to be_email_access_allowed
     end
 
-    it 'should not allow email if scope does not grant email access' do
-      subject.options['scope'] = 'repo,user:follow'
-      expect(subject).to_not be_email_access_allowed
-    end
+    # it 'should not allow email if scope does not grant email access' do
+    #   subject.options['scope'] = 'repo,user:follow'
+    #   expect(subject).to_not be_email_access_allowed
+    # end
 
     it 'should assume email access not allowed if scope is something currently not documented' do
       subject.options['scope'] = 'currently_not_documented'
@@ -103,20 +103,16 @@ describe OmniAuth::Strategies::Gitee do
 
   context '#emails' do
     it 'should use relative paths' do
-      expect(access_token).to receive(:get).with('user/emails', :headers => {
-        'Accept' => 'application/vnd.github.v3'
-      }).and_return(response)
+      expect(access_token).to receive(:get).with('emails').and_return(response)
 
-      subject.options['scope'] = 'user'
+      subject.options['scope'] = 'user_info'
       expect(subject.emails).to eq(parsed_response)
     end
 
     it 'should use the header auth mode' do
-      expect(access_token).to receive(:get).with('user/emails', :headers => {
-        'Accept' => 'application/vnd.github.v3'
-      }).and_return(response)
+      expect(access_token).to receive(:get).with('emails').and_return(response)
 
-      subject.options['scope'] = 'user'
+      subject.options['scope'] = 'user_info'
       subject.emails
       expect(access_token.options[:mode]).to eq(:header)
     end
@@ -133,7 +129,7 @@ describe OmniAuth::Strategies::Gitee do
   context '#info.urls' do
     it 'should use html_url from raw_info' do
       allow(subject).to receive(:raw_info).and_return({ 'login' => 'me', 'html_url' => 'http://enterprise/me' })
-      expect(subject.info['urls']['GitHub']).to eq('http://enterprise/me')
+      expect(subject.info['urls']['Gitee']).to eq('http://enterprise/me')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-gitee
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Mashiro
@@ -14,30 +14,42 @@ dependencies:
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +130,7 @@ files:
 - lib/omniauth-gitee/version.rb
 - lib/omniauth/strategies/gitee.rb
 - omniauth-gitee.gemspec
+- rce
 - spec/omniauth/strategies/github_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mashirozx/omniauth-gitee