github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 07:07:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Convert account activation pages to use Ember (#28206)

Browse Source
This commit is contained in:
Jan Cernik
2024-08-12 16:02:00 -05:00
committed by GitHub
parent df18bcd029
commit 5b78bbd138
15 changed files with 313 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/users_controller.rb
View File

@ -1100,7 +1100,11 @@ class UsersController < ApplicationController
def activate_account
expires_now
render layout: "no_ember"
respond_to do |format|
format.html { render "default/empty" }
format.json { render json: success_json }
end
end
def perform_account_activation
@ -1130,21 +1134,22 @@ class UsersController < ApplicationController
end
if Wizard.user_requires_completion?(@user)
return redirect_to(wizard_path)
@redirect_to = wizard_path
elsif destination_url.present?
return redirect_to(destination_url, allow_other_host: true)
@redirect_to = destination_url
elsif SiteSetting.enable_discourse_connect_provider &&
payload = cookies.delete(:sso_payload)
return redirect_to(session_sso_provider_url + "?" + payload)
@redirect_to = session_sso_provider_url + "?" + payload
end
else
@needs_approval = true
end
else
flash.now[:error] = I18n.t("activation.already_done")
return render_json_error(I18n.t("activation.already_done"))
end
render layout: "no_ember"
render json:
success_json.merge(redirect_to: @redirect_to, needs_approval: @needs_approval || false)
end
def update_activation_email