omniauth-vkontakte 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 82e2d058974ed802c866153a8248be53642069cc
+  data.tar.gz: 9f4b0fdc8a55fe501046821b0b91072028b14cbf
+SHA512:
+  metadata.gz: d513abcb0d1ddcff85a9ca4fbcf6108fddc560d414c5c85fe4a8f7cc192bd852850ce43c1852ee25038e9e0abbc889753cdf0cbffba6c5800971cced60cb9d01
+  data.tar.gz: 58492ea8f0a56bf9b1d324b5be67942b8d9e973c34a50075ca974c67517a67ab38a0af2c4de23bb7fdd406875ef2cbe576ed59b6b986398518f0e55a74d5d17b

data/README.md

@@ -2,7 +2,7 @@
 
 This is the unofficial [OmniAuth](https://github.com/intridea/omniauth) strategy for authenticating to VKontakte via OAuth.
 To use it, you'll need to sign up for an OAuth2 Application ID and Secret
-on the [Vkontakte Developers Page](http://vk.com/developers.php).
+on the [Vkontakte Developers Page](http://vk.com/dev).
 
 ## Basic Usage
 
@@ -15,24 +15,66 @@ end
 ## Configuring
 You can configure several options, which you pass in to the `provider` method via a `Hash`:
 
-* `scope`: A comma-separated list of permissions you want to request from the user. [Read the Vkontakte docs for more details](http://vk.com/developers.php?oid=-1&p=%D0%9F%D1%80%D0%B0%D0%B2%D0%B0_%D0%B4%D0%BE%D1%81%D1%82%D1%83%D0%BF%D0%B0_%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B9)
-* `display`: The display context to show the authentication page. Options are: `page`, `popup`, `touch` and `wap`.
+* `scope`: a comma-separated list of access permissions you want to request from the user. [Read the Vkontakte docs for more details](http://vk.com/dev/permissions)
+* `display`: the display context to show the authentication page. Options are: `page`, `popup` and `mobile`.
+* `lang`: specifies the language. Optional options are: `ru`, `ua`, `be`, `en`, `es`, `fi`, `de`, `it`.
 
 For example, to request `friends`, `audio` and `photos` permissions and display the authentication page in a popup window:
 
 ```ruby
 use OmniAuth::Builder do
   provider :vkontakte, ENV['API_KEY'], ENV['API_SECRET'],
-    :scope => 'friends,audio,photos', :display => 'popup'
+    :scope => 'friends,audio,photos', :display => 'popup', :lang => 'en'
 end
 ```
 
+## Auth Hash
+
+Here's an example *Auth Hash* available in `request.env['omniauth.auth']`:
+
+```ruby
+{"provider"=>"vkontakte",
+ "uid"=>"1",
+ "info"=>
+  {"name"=>"Павел Дуров",
+   "nickname"=>"",
+   "first_name"=>"Павел",
+   "last_name"=>"Дуров",
+   "image"=>"http://cs7001.vk.me/c7003/v7003079/374b/53lwetwOxD8.jpg",
+   "location"=>"Росiя, Санкт-Петербург",
+   "urls"=>{"Vkontakte"=>"http://vk.com/durov"}},
+ "credentials"=>
+  {"token"=>
+    "187041a618229fdaf16613e96e1caabc1e86e46bbfad228de41520e63fe45873684c365a14417289599f3",
+   "expires_at"=>1381826003,
+   "expires"=>true},
+ "extra"=>
+  {"raw_info"=>
+    {"id"=>1,
+     "first_name"=>"Павел",
+     "last_name"=>"Дуров",
+     "sex"=>2,
+     "nickname"=>"",
+     "screen_name"=>"durov",
+     "bdate"=>"10.10.1984",
+     "city"=>"2",
+     "country"=>"1",
+     "photo"=>"http://cs7001.vk.me/c7003/v7003079/374b/53lwetwOxD8.jpg",
+     "photo_big"=>"http://cs7001.vk.me/c7003/v7003736/3a08/mEqSflTauxA.jpg",
+     "online"=>1,
+     "online_app"=>"3140623",
+     "online_mobile"=>1}}}
+```
+
+The precise information available may depend on the permissions which you request.
+
+
 ## Supported Rubies
 
 Tested with the following Ruby versions:
 
+- MRI 2.0.0
 - MRI 1.9.3
-- MRI 1.8.7
 
 ## Contributing to omniauth-vkontakte
 
@@ -40,7 +82,7 @@ Tested with the following Ruby versions:
 
 ## License
 
-Copyright (c) 2011, 2012 Anton Maminov
+Copyright (c) 2011-2013 Anton Maminov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/examples/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'sinatra'
 gem 'omniauth-vkontakte', :path => '../'

data/examples/sinatra.rb

@@ -11,7 +11,7 @@ SCOPE = 'friends,audio'
 use Rack::Session::Cookie
 
 use OmniAuth::Builder do
-  provider :vkontakte,  ENV['VKONTAKTE_KEY'], ENV['VKONTAKTE_SECRET'], :scope => SCOPE, :display => 'popup'
+  provider :vkontakte,  ENV['VKONTAKTE_KEY'], ENV['VKONTAKTE_SECRET'], :scope => SCOPE, :display => 'popup', :lang => 'en'
 end
 
 get '/' do
@@ -24,5 +24,6 @@ end
 
 get '/auth/:provider/callback' do
   content_type 'text/plain'
+  pp request.env['omniauth.auth']
   request.env['omniauth.auth'].info.to_hash.inspect
 end

data/lib/omniauth-vkontakte/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Vkontakte
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/omniauth/strategies/vkontakte.rb

@@ -1,38 +1,37 @@
 require 'omniauth/strategies/oauth2'
 require 'multi_json'
+require 'pp'
 
 module OmniAuth
   module Strategies
     # Authenticate to Vkontakte utilizing OAuth 2.0 and retrieve
     # basic user information.
     # documentation available here:
-    # http://vk.com/developers.php?o=-17680044&p=Authorization&s=0
+    # http://vk.com/dev/authentication
     #
     # @example Basic Usage
     #     use OmniAuth::Strategies::Vkontakte, 'API Key', 'Secret Key'
+    #
     class Vkontakte < OmniAuth::Strategies::OAuth2
+      API_VERSION = '5.2'
       DEFAULT_SCOPE = ''
 
       option :name, 'vkontakte'
 
       option :client_options, {
         :site          => 'https://api.vk.com/',
-        :token_url     => '/oauth/token',
-        :authorize_url => '/oauth/authorize'
-      }
-
-      option :access_token_options, {
-        :param_name => 'access_token'
+        :token_url     => 'https://oauth.vk.com/access_token',
+        :authorize_url => 'https://oauth.vk.com/authorize',
       }
 
       option :authorize_options, [:scope, :display]
 
-      uid { access_token.params['user_id'] }
+      uid { raw_info['id'].to_s }
 
       # https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
       info do
         {
-          :name       => "#{raw_info['first_name']} #{raw_info['last_name']}".strip,
+          :name       => [raw_info['first_name'], raw_info['last_name']].map(&:strip).reject(&:empty?).join(' '),
           :nickname   => raw_info['nickname'],
           :first_name => raw_info['first_name'],
           :last_name  => raw_info['last_name'],
@@ -40,34 +39,45 @@ module OmniAuth
           :location   => location,
           :urls       => {
             'Vkontakte' => "http://vk.com/#{raw_info['screen_name']}"
-          }
+          },
         }
       end
 
       extra do
-        { 'raw_info' => raw_info }
+        {
+          'raw_info' => raw_info
+        }
       end
 
       def raw_info
-        # http://vk.com/developers.php?o=-17680044&p=Description+of+Fields+of+the+fields+Parameter
-        fields = ['uid', 'first_name', 'last_name', 'nickname', 'screen_name', 'sex', 'city', 'country', 'online', 'bdate', 'photo', 'photo_big']
-
+        access_token.options[:mode] = :query
+        access_token.options[:param_name] = :access_token
         @raw_info ||= begin
           params = {
-            :uids         => uid,
-            :fields       => fields.join(','),
-            #:access_token => access_token.token,
+            :fields   => info_options,
+            :lang     => lang_option,
+            :v        => API_VERSION,
           }
+
           result = access_token.get('/method/users.get', :params => params).parsed["response"]
-          result && result.first ? result.first : nil
+          (result && result.first) ? result.first : nil
         end
       end
 
-      ##
+      def info_options
+        # http://vk.com/dev/fields
+        fields = ['nickname', 'screen_name', 'sex', 'city', 'country', 'online', 'bdate', 'photo', 'photo_big']
+        return fields.join(',')
+      end
+
+      def lang_option
+        options[:lang] || ''
+      end
+
       # You can pass +display+ or +scope+ params to the auth request, if
       # you need to set them dynamically.
       #
-      # /auth/vkontakte?display=popup
+      # http://vk.com/dev/oauth_dialog
       #
       def authorize_params
         super.tap do |params|
@@ -75,46 +85,50 @@ module OmniAuth
           %w[display state scope].each do |v|
             if request.params[v]
               params[v.to_sym] = request.params[v]
+
               # to support omniauth-oauth2's auto csrf protection
               session['omniauth.state'] = params[:state] if v == 'state'
             end
           end
+
           params[:scope] ||= DEFAULT_SCOPE
         end
       end
 
       private
 
-      # http://vk.com/developers.php?o=-17680044&p=getCountries
+      # http://vk.com/dev/database.getCountriesById
       def get_country
         if raw_info['country'] && raw_info['country'] != "0"
           params = {
-            :cids         => raw_info['country'],
-            :access_token => access_token.token,
+            :country_ids => raw_info['country'],
+            :lang        => lang_option,
+            :v           => API_VERSION,
           }
-          country = access_token.get('/method/places.getCountryById', :params => params).parsed['response']
-          country && country.first ? country.first['name'] : ''
+          country = access_token.get('/method/database.getCountriesById', :params => params).parsed['response']
+          country && country.first ? country.first['title'] : ''
         else
           ''
         end
       end
 
-      # http://vk.com/developers.php?o=-17680044&p=getCities
+      # http://vk.com/dev/database.getCitiesById
       def get_city
         if raw_info['city'] && raw_info['city'] != "0"
           params = {
-            :cids         => raw_info['city'],
-            :access_token => access_token.token,
+            :city_ids => raw_info['city'],
+            :lang     => lang_option,
+            :v        => API_VERSION,
           }
-          city = access_token.get('/method/places.getCityById', :params => params).parsed['response']
-          city && city.first ? city.first['name'] : ''
+          city = access_token.get('/method/database.getCitiesById', :params => params).parsed['response']
+          city && city.first ? city.first['title'] : ''
         else
           ''
         end
       end
 
       def location
-        @location ||= "#{get_country}, #{get_city}"
+        @location ||= [get_country, get_city].map(&:strip).reject(&:empty?).join(', ')
       end
 
     end

data/omniauth-vkontakte.gemspec

@@ -1,9 +1,8 @@
-# -*- encoding: utf-8 -*-
 require File.expand_path('../lib/omniauth-vkontakte/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'omniauth', '~> 1.1.0'
-  gem.add_dependency 'omniauth-oauth2', '~> 1.0'
+  gem.add_dependency 'omniauth', '~> 1.0'
+  gem.add_dependency 'omniauth-oauth2', '~> 1.1'
   gem.add_dependency 'multi_json'
 
   gem.authors       = ["Anton Maminov"]

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-vkontakte
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Anton Maminov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Unofficial VKontakte strategy for OmniAuth 1.0
@@ -76,26 +69,25 @@ files:
 - omniauth-vkontakte.gemspec
 homepage: https://github.com/mamantoha/omniauth-vkontakte
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Unofficial VKontakte strategy for OmniAuth 1.0
 test_files: []