omniauth-gitee 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5def4c47d6bb84a9fab81ad4c423fb296289242e13258596fde9cd3bca697b4
-  data.tar.gz: 8d5b96b0788d52940b3110a62149aebb7422c92991027f0eb46517b6937b7bbb
+  metadata.gz: 11d0c1bd76ececfdce69e574db1e4060d19a02dfedd5e8b3d1a73e07043e464f
+  data.tar.gz: af751b8d17862d015714342efcad7bfb87332462f2f86b9c8ed93e81d5b65286
 SHA512:
-  metadata.gz: 4692e0c0301a2012e46e1f7d0d1a5d532f2699e32488a7814b91525463113d9c500fc905692981e166d1907936d7c059061f2f45254c9249cb2813a8885a71d0
-  data.tar.gz: e97d242ba40936dc4a0a46919a64f40200b709da77d464768246adb7901b1baea585c29de4cdcaff30bef533d6827fb32ca11646acb9ef4977a2b53fe06f64e2
+  metadata.gz: d9018e2644149eae711e4d79ee260beb7cef44fae3ed88df89e1663d230b8f72200022570854926cdee7341fd5683cf773329d40614dc9343cd239f117f123d3
+  data.tar.gz: 1705b6d75b00ffda81d8c5f3e59f163fabad516480e73be55d74a305da1db1e98b8f1194d5cef9e1fd8d1014459fc81260cccea2998e4f63448370f6383ac237

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,12 +65,12 @@ 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']
+        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.2"
+    VERSION = "0.0.3"
   end
 end

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-gitee
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mashiro
 autorequire:
 bindir: bin
 cert_chain: []
-date:
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -130,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