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

regression: don't return from a block

Browse Source 
also clean up some warnings (shadowed var, unused var)
This commit is contained in:
Sam 2018-08-10 14:53:55 +10:00
parent ea8394b080
commit 6f6b4ff988
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/users_controller.rb
View File

@ -581,7 +581,6 @@ class UsersController < ApplicationController
email_token_user = EmailToken.confirmable(token)&.user email_token_user = EmailToken.confirmable(token)&.user
totp_enabled = email_token_user&.totp_enabled? totp_enabled = email_token_user&.totp_enabled?
backup_enabled = email_token_user&.backup_codes_enabled?
second_factor_token = params[:second_factor_token] second_factor_token = params[:second_factor_token]
second_factor_method = params[:second_factor_method].to_i second_factor_method = params[:second_factor_method].to_i
confirm_email = false confirm_email = false
@ -1079,7 +1078,7 @@ class UsersController < ApplicationController
# Using Discourse.authenticators rather than Discourse.enabled_authenticators so users can # Using Discourse.authenticators rather than Discourse.enabled_authenticators so users can
# revoke permissions even if the admin has temporarily disabled that type of login # revoke permissions even if the admin has temporarily disabled that type of login
authenticator = Discourse.authenticators.find { |authenticator| authenticator.name == provider_name } authenticator = Discourse.authenticators.find { |a| a.name == provider_name }
raise Discourse::NotFound if authenticator.nil? || !authenticator.can_revoke? raise Discourse::NotFound if authenticator.nil? || !authenticator.can_revoke?
skip_remote = params.permit(:skip_remote) skip_remote = params.permit(:skip_remote)
@ -1088,9 +1087,9 @@ class UsersController < ApplicationController
hijack do hijack do
result = authenticator.revoke(user, skip_remote: skip_remote) result = authenticator.revoke(user, skip_remote: skip_remote)
if result if result
return render json: success_json render json: success_json
else else
return render json: { render json: {
success: false, success: false,
message: I18n.t("associated_accounts.revoke_failed", provider_name: provider_name) message: I18n.t("associated_accounts.revoke_failed", provider_name: provider_name)
} }