nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

omniauth 1.0 replaced 'user_info' with 'info'

Browse source
This commit is contained in:
danielgrippi 2011-12-06 17:53:41 -08:00
parent d0f58e1bd4
commit beeb02dcd6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/services_controller.rb
View file

@ -18,7 +18,7 @@ class ServicesController < ApplicationController
secret = auth['credentials']['secret']
provider = auth['provider']
user = auth['user_info']
user = auth['info']
service = "Services::#{provider.camelize}".constantize.new(:nickname => user['nickname'],
:access_token => toke,

6
spec/controllers/services_controller_spec.rb
View file

@ -10,7 +10,7 @@ describe ServicesController do
let(:omniauth_auth) {
{ 'provider' => 'twitter',
'uid' => '2',
'user_info' => { 'nickname' => 'grimmin' },
'info' => { 'nickname' => 'grimmin' },
'credentials' => { 'token' => 'tokin', 'secret' =>"not_so_much" }
}
}
@ -68,7 +68,7 @@ describe ServicesController do
it 'returns error if the service is connected with that uid' do
request.env['omniauth.auth'] = omniauth_auth
Services::Twitter.create!(:nickname => omniauth_auth["user_info"]['nickname'],
Services::Twitter.create!(:nickname => omniauth_auth["info"]['nickname'],
:access_token => omniauth_auth['credentials']['token'],
:access_secret => omniauth_auth['credentials']['secret'],
:uid => omniauth_auth['uid'],
@ -82,7 +82,7 @@ describe ServicesController do
context "photo fetching" do
before do
omniauth_auth
omniauth_auth["user_info"].merge!({"image" => "https://service.com/fallback_lowres.jpg"})
omniauth_auth["info"].merge!({"image" => "https://service.com/fallback_lowres.jpg"})
request.env['omniauth.auth'] = omniauth_auth
end