diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 0ccb00bb80d369124f11b93fe9b33cf4e127dd5c..8dee8d961bbf97e645a594a9e04fe8089a4d6424 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -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, diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb index e361ab8c7681e0082726a820399447571be15ecb..cb0fe3b901b469f1f00f45a7bae1cf924cf3c591 100644 --- a/spec/controllers/services_controller_spec.rb +++ b/spec/controllers/services_controller_spec.rb @@ -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