Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

FEATURE: Require Javascript to activate an account via email link

Browse source
This commit is contained in:
Robin Ward 2014-07-14 12:25:42 -04:00
parent c12780eb2b
commit cce7cf8c85
8 changed files with 54 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/users_controller.rb
View file

@ -5,7 +5,7 @@ require_dependency 'avatar_upload_service'
class UsersController < ApplicationController
skip_before_filter :authorize_mini_profiler, only: [:avatar]
skip_before_filter :check_xhr, only: [:show, :password_reset, :update, :activate_account, :authorize_email, :user_preferences_redirect, :avatar, :my_redirect]
skip_before_filter :check_xhr, only: [:show, :password_reset, :update, :activate_account, :perform_account_activation, :authorize_email, :user_preferences_redirect, :avatar, :my_redirect]
before_filter :ensure_logged_in, only: [:username, :update, :change_email, :user_preferences_redirect, :upload_user_image, :pick_avatar, :destroy_user_image, :destroy]
before_filter :respond_to_suspicious_request, only: [:create]
@ -273,6 +273,10 @@ class UsersController < ApplicationController
def activate_account
expires_now()
render layout: 'no_js'
end
def perform_account_activation
if @user = EmailToken.confirm(params[:token])
# Log in the user unless they need to be approved