IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FIX: redirect to sso_destination_url after account activation"

Browse Source 
This reverts commit 0402e97368.
This commit is contained in:
Régis Hanol
2018-05-11 22:55:45 +02:00
parent 0402e97368
commit abda21a41f
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/session_controller.rb
View File

@@ -77,7 +77,6 @@ class SessionController < ApplicationController
end end
else else
session[:sso_payload] = request.query_string session[:sso_payload] = request.query_string
cookies[:sso_destination_url] = sso.to_url(sso.return_sso_url)
redirect_to path('/login') redirect_to path('/login')
end end
else else

12
app/controllers/users_controller.rb
View File

@@ -667,10 +667,13 @@ class UsersController < ApplicationController
@custom_body_class = "static-account-created" @custom_body_class = "static-account-created"
@message = session['user_created_message'] || I18n.t('activation.missing_session') @message = session['user_created_message'] || I18n.t('activation.missing_session')
@account_created = { message: @message, show_controls: false } @account_created = {
message: @message,
show_controls: false
}
if session_user_id = session[SessionController::ACTIVATE_USER_KEY] if session_user_id = session[SessionController::ACTIVATE_USER_KEY]
if user = User.find_by(id: session_user_id.to_i) if user = User.where(id: session_user_id.to_i).first
@account_created[:username] = user.username @account_created[:username] = user.username
@account_created[:email] = user.email @account_created[:email] = user.email
@account_created[:show_controls] = !user.from_staged? @account_created[:show_controls] = !user.from_staged?
@@ -693,8 +696,8 @@ class UsersController < ApplicationController
def perform_account_activation def perform_account_activation
raise Discourse::InvalidAccess.new if honeypot_or_challenge_fails?(params) raise Discourse::InvalidAccess.new if honeypot_or_challenge_fails?(params)
if @user = EmailToken.confirm(params[:token]) if @user = EmailToken.confirm(params[:token])
# Log in the user unless they need to be approved # Log in the user unless they need to be approved
if Guardian.new(@user).can_access_forum? if Guardian.new(@user).can_access_forum?
@user.enqueue_welcome_message('welcome_user') if @user.send_welcome_message @user.enqueue_welcome_message('welcome_user') if @user.send_welcome_message
@@ -705,9 +708,6 @@ class UsersController < ApplicationController
elsif destination_url = cookies[:destination_url] elsif destination_url = cookies[:destination_url]
cookies[:destination_url] = nil cookies[:destination_url] = nil
return redirect_to(destination_url) return redirect_to(destination_url)
elsif sso_destination_url = cookies[:sso_destination_url]
cookies[:sso_destination_url] = nil
return redirect_to(sso_destination_url)
end end
else else
@needs_approval = true @needs_approval = true