From b96fbb0676442df2f0d953925480d3f1dd341232 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Tue, 30 Oct 2012 23:09:24 +0200 Subject: [PATCH] Fix empty page after callback from service by redirecting to origin. Also make settings/services page use the same window when authenticating with other services instead of launching a popup. --- Changelog.md | 1 + app/controllers/services_controller.rb | 8 ++++++-- app/views/shared/_add_remove_services.haml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index 91e9711be..baf62dbf2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -30,6 +30,7 @@ * Fix error with open/close registrations. [#3649](https://github.com/diaspora/diaspora/pull/3649) * Fix javascripts error in invitations facebox. [#3638](https://github.com/diaspora/diaspora/pull/3638) * Fix css overflow problem in aspect dropdown on welcome page. [#3637](https://github.com/diaspora/diaspora/pull/3637) +* Fix empty page after authenticating with other services. [#3693](https://github.com/diaspora/diaspora/pull/3693) # 0.0.1.2 diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 6257e0455..2ff6c3717 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -48,8 +48,12 @@ class ServicesController < ApplicationController :service_name => provider.camelize ) end end - - render :text => ("") + + if request.env['omniauth.origin'].nil? + render :text => ("") + else + redirect_to request.env['omniauth.origin'] + end end def failure diff --git a/app/views/shared/_add_remove_services.haml b/app/views/shared/_add_remove_services.haml index 4c3c97577..d44d892ca 100644 --- a/app/views/shared/_add_remove_services.haml +++ b/app/views/shared/_add_remove_services.haml @@ -16,4 +16,4 @@ - AppConfig.configured_services.each do |service| - unless @services.any?{|x| x.provider == service} - %h4= link_to t("services.index.connect_to_#{service}"), "#", :onclick => "window.open('/auth/#{service}', 'popup', 'height=400,width=500')" + %h4= link_to(t("services.index.connect_to_#{service}"), "/auth/#{service}")