omniauth-mail_ru 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 4443bb97ff026aa10df7700596b0177dfd8599ed660e5b7f77b483def1e800bc
-  data.tar.gz: b8dcab96ae5729a6f1ff8389ba5f1752e256e19c7d7ef9fa2ba8186e042134e9
+SHA1:
+  metadata.gz: 362190443dee58ae4ad91902961735446a896339
+  data.tar.gz: bf0d3ef6af83ab2a964fb80ec9b697ad411ef42c
 SHA512:
-  metadata.gz: fa7ec35b215d200aa65b095af9191c7339c75f3131526eb3d8f1cb304ea10f63fdd2a61b7fb85ded75dd4a6180401403a7d01795b8f44b04aa17ea99d6e699e3
-  data.tar.gz: 14b7d3666fd9ead84b70da5ed03d40812f17e5658250f4540304a7e2be1febb9164bceccd2b4cc3f2d964c20d7d737854c0e221683eb37830d3017cc0c604807
+  metadata.gz: 0bccfce146b862dc05c20093d354a6e5afc5d64d2d5e1c40f7b44bf5edc52c5195e34fe7498dc977ffd52458f9208693a4d227b7d67866c6c705ce2e99e92658
+  data.tar.gz: 440756d8b93047da1099d0826760473d817c34ed830c1f84bc9cb46e71ab65407f64f18c7506119488e7644b56597822b6073bcb439678da88e7900dfb40c9c6

data/.rubocop.yml

@@ -1,22 +1,4 @@
-ClassLength:
+Style/BracesAroundHashParameters:
   Enabled: false
-Layout/IndentHeredoc:
-  Enabled: false
-Metrics/AbcSize:
-  Enabled: false
-Metrics/BlockLength:
-  ExcludedMethods: ['describe', 'context']
-Metrics/CyclomaticComplexity:
-  Enabled: false
-Metrics/LineLength:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-Metrics/PerceivedComplexity:
-  Enabled: false
-Naming:
-  Enabled: false
-Style/MutableConstant:
-  Enabled: false
-Gemspec/RequiredRubyVersion:
+Naming/FileName:
   Enabled: false

data/README.md

@@ -19,7 +19,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
-Replace `"API_KEY"` and `"PRIVATE_KEY"` with the appropriate values you obtained (http://api.mail.ru).
+Replace `"API_KEY"` and `"PRIVATE_KEY"` with the appropriate values you obtained (https://oauth.mail.ru/app).
 
 ## Authentication Hash
 An example auth hash available in `request.env['omniauth.auth']`:
@@ -29,57 +29,19 @@ An example auth hash available in `request.env['omniauth.auth']`:
       provider: 'mail_ru',
       uid: '1111111111',
       info: {
-          name: 'John Smith',
-          email: 'john@mail.ru',
-          nickname: 'JohnS',
-          first_name: 'John',
-          last_name: 'Smith',
-          image: 'http://avt.appsmail.ru/mail/john/_avatar50',
-          urls: {
-              'Mailru' => 'http://my.mail.ru/mail/john/'
-          }
+        gender: "m",
+        name: "Алексей Иванов",
+        locale: "ru_RU",
+        first_name: "Алексей",
+        last_name: "Иванов",
+        email: "alex@ivanov.ru",
+        image: "https://...."
       },
       credentials: {
           token: '4ec9286c2f...',
           refresh_token: '351456424ad7c5...',
           expires_at: 1411054463,
           expires: true
-      },
-      extra: {
-          raw_info: {
-              pic_50: 'http://avt.appsmail.ru/mail/john/_avatar50',
-              friends_count: 256,
-              show_age: 1,
-              has_photosafe: 0,
-              nick: 'JohnS',
-              is_friend: 0,
-              is_online: 1,
-              has_pic: 1,
-              email: 'john@mail.ru',
-              pic_190: 'http://avt.appsmail.ru/mail/john/_avatar190',
-              referer_id: '',
-              pic_32: 'http://avt.appsmail.ru/mail/john/_avatar32',
-              referer_type: '',
-              last_visit: '1410961776',
-              uid: '1111111111',
-              app_installed: 1,
-              status_text: '',
-              pic_22: 'http://avt.appsmail.ru/mail/john/_avatar22',
-              age: 25,
-              last_name: 'Smith',
-              is_verified: 0,
-              pic_big: 'http://avt.appsmail.ru/mail/john/_avatarbig',
-              vip: 0,
-              birthday: '01.01.1901',
-              link: 'http://my.mail.ru/mail/john/',
-              pic_128: 'http://avt.appsmail.ru/mail/john/_avatar128',
-              sex: 0,
-              pic: 'http://avt.appsmail.ru/mail/john/_avatar',
-              pic_small: 'http://avt.appsmail.ru/mail/john/_avatarsmall',
-              pic_180: 'http://avt.appsmail.ru/mail/john/_avatar180',
-              first_name: 'John',
-              pic_40: 'http://avt.appsmail.ru/mail/john/_avatar40?1229336384'
-          }
       }
   }
 

data/lib/omniauth/mail_ru/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module MailRu
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

data/lib/omniauth/strategies/mail_ru.rb

@@ -4,26 +4,29 @@ module OmniAuth
   module Strategies
     # Authentication strategy for connecting with Mail.ru OAuth 2.0
     class MailRu < OmniAuth::Strategies::OAuth2
+      DEFAULT_SCOPE = 'userinfo'
+
       option :name, 'mail_ru'
 
-      option :client_options,
-             site: 'https://connect.mail.ru',
-             token_url: '/oauth/token',
-             authorize_url: '/oauth/authorize'
+      option :client_options, {
+        site: 'https://oauth.mail.ru',
+        token_url: '/token',
+        authorize_url: '/login'
+      }
+
+      option :auth_token_params, { mode: :query }
 
-      uid { access_token.params['x_mailru_vid'] }
+      uid { raw_info['email'] }
 
       info do
         {
-          name: [raw_info['first_name'], raw_info['last_name']].join(' ').strip,
+          name: raw_info['name'],
           email: raw_info['email'],
-          nickname: raw_info['nick'],
+          locale: raw_info['locale'],
+          gender: raw_info['gender'],
           first_name: raw_info['first_name'],
           last_name: raw_info['last_name'],
-          image: raw_info['has_pic'].to_i == 1 ? (raw_info['pic_50'] || raw_info['pic_small']) : nil,
-          urls: {
-            'Mailru' => raw_info['link']
-          }
+          image: raw_info['image']
         }
       end
 
@@ -34,30 +37,19 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get('https://www.appsmail.ru/platform/api', params: info_params).parsed.first
+        @raw_info ||= access_token.get('https://oauth.mail.ru/userinfo').parsed
       end
 
-      private
-
-      def callback_url
-        full_host + script_name + callback_path
+      def authorize_params
+        super.tap do |params|
+          params[:scope] ||= DEFAULT_SCOPE
+        end
       end
 
-      def info_params
-        params = {
-          app_id: options.client_id,
-          method: 'users.getInfo',
-          secure: 1,
-          session_key: access_token.token
-        }
-        params[:sig] = signature(params)
-
-        params
-      end
+      private
 
-      def signature(params)
-        params = params.sort.reduce([]) { |m, (key, value)| m.push("#{key}=#{value}") }.join
-        Digest::MD5.hexdigest([params, options.client_secret].join)
+      def callback_url
+        options[:redirect_uri] || (full_host + script_name + callback_path)
       end
     end
   end

data/omniauth-mail_ru.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'omniauth/mail_ru/version'
 
@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'omniauth-mail_ru'
   spec.version       = OmniAuth::MailRu::VERSION
   spec.authors       = ['Andrey Skuryatin']
-  spec.email         = ['andrey.skuryatin@gmai.com']
+  spec.email         = ['andrey.skuryatin@gmail.com']
   spec.summary       = 'OmniAuth strategy for Mail.ru'
   spec.description   = 'OmniAuth strategy for Mail.ru'
   spec.homepage      = 'https://github.com/andrey-skat/omniauth-mail_ru'
@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'omniauth-oauth2', '~> 1.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec', '~> 3.6'
+  spec.add_dependency 'omniauth-oauth2', '>= 1.0'
+  spec.add_development_dependency 'rake', '>= 12.0'
+  spec.add_development_dependency 'rspec', '>= 3.6'
   spec.add_development_dependency 'rubocop', '~> 0.49'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mail_ru
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrey Skuryatin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
@@ -68,7 +68,7 @@ dependencies:
         version: '0.49'
 description: OmniAuth strategy for Mail.ru
 email:
-- andrey.skuryatin@gmai.com
+- andrey.skuryatin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,7 +83,6 @@ files:
 - lib/omniauth/mail_ru/version.rb
 - lib/omniauth/strategies/mail_ru.rb
 - omniauth-mail_ru.gemspec
-- spec/omniauth/strategies/mail_ru_spec.rb
 - spec/rubocop_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/andrey-skat/omniauth-mail_ru
@@ -106,11 +105,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Mail.ru
 test_files:
-- spec/omniauth/strategies/mail_ru_spec.rb
 - spec/rubocop_spec.rb
 - spec/spec_helper.rb

data/spec/omniauth/strategies/mail_ru_spec.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'omniauth-mail_ru'
-
-describe OmniAuth::Strategies::MailRu do
-  let(:request) { double('Request', params: {}, cookies: {}, env: {}) }
-  let(:app) do
-    lambda do
-      [200, {}, ['Hello.']]
-    end
-  end
-
-  subject do
-    OmniAuth::Strategies::MailRu.new(app, 'appid', 'secret', @options || {}).tap do |strategy|
-      allow(strategy).to receive(:request) do
-        request
-      end
-    end
-  end
-
-  before do
-    OmniAuth.config.test_mode = true
-  end
-
-  after do
-    OmniAuth.config.test_mode = false
-  end
-
-  describe '#client_options' do
-    it 'has correct site' do
-      expect(subject.client.site).to eq('https://connect.mail.ru')
-    end
-
-    it 'has correct authorize_url' do
-      expect(subject.client.options[:authorize_url]).to eq('/oauth/authorize')
-    end
-
-    it 'has correct token_url' do
-      expect(subject.client.options[:token_url]).to eq('/oauth/token')
-    end
-
-    describe 'overrides' do
-      context 'as strings' do
-        it 'should allow overriding the site' do
-          @options = { client_options: { 'site' => 'https://example.com' } }
-          expect(subject.client.site).to eq('https://example.com')
-        end
-
-        it 'should allow overriding the authorize_url' do
-          @options = { client_options: { 'authorize_url' => 'https://example.com' } }
-          expect(subject.client.options[:authorize_url]).to eq('https://example.com')
-        end
-
-        it 'should allow overriding the token_url' do
-          @options = { client_options: { 'token_url' => 'https://example.com' } }
-          expect(subject.client.options[:token_url]).to eq('https://example.com')
-        end
-      end
-
-      context 'as symbols' do
-        it 'should allow overriding the site' do
-          @options = { client_options: { site: 'https://example.com' } }
-          expect(subject.client.site).to eq('https://example.com')
-        end
-
-        it 'should allow overriding the authorize_url' do
-          @options = { client_options: { authorize_url: 'https://example.com' } }
-          expect(subject.client.options[:authorize_url]).to eq('https://example.com')
-        end
-
-        it 'should allow overriding the token_url' do
-          @options = { client_options: { token_url: 'https://example.com' } }
-          expect(subject.client.options[:token_url]).to eq('https://example.com')
-        end
-      end
-    end
-  end
-
-  describe 'raw_info' do
-    it 'should have pic_50 url' do
-      allow(subject).to receive(:raw_info) { { 'has_pic' => '1', 'pic_50' => 'http://avt-17.foto.mail.ru/mail/test/_avatar50?111' } }
-
-      expect(subject.info[:image]).to eq('http://avt-17.foto.mail.ru/mail/test/_avatar50?111')
-    end
-
-    it 'should have pic_small url' do
-      allow(subject).to receive(:raw_info) { { 'has_pic' => '1', 'pic_small' => 'http://avt-17.foto.mail.ru/mail/test/_avatarsmall?111' } }
-
-      expect(subject.info[:image]).to eq('http://avt-17.foto.mail.ru/mail/test/_avatarsmall?111')
-    end
-
-    it 'should not have pic url' do
-      allow(subject).to receive(:raw_info) { { 'has_pic' => '0', 'pic_50' => 'http://avt-17.foto.mail.ru/mail/test/_avatar50?111', 'pic_small' => 'http://avt-17.foto.mail.ru/mail/test/_avatarsmall?111' } }
-
-      expect(subject.info[:image]).to be_nil
-    end
-  end
-end