lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Added mapping roles through email to site settings (#2373)

Browse Source
This commit is contained in:
Ahmad Farhat
2020-12-16 19:31:32 -05:00
committed by GitHub
parent 14350c5f5d
commit 5a51f6d714
12 changed files with 202 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/account_activations_controller.rb
View File

@ -18,6 +18,7 @@
class AccountActivationsController < ApplicationController
include Emailer
include Authenticator
before_action :ensure_unauthenticated
before_action :find_user_by_token, only: :edit
@ -32,6 +33,7 @@ class AccountActivationsController < ApplicationController
# If the user exists and is not verified and provided the correct token
if @user && !@user.activated?
# Verify user
@user.set_role(initial_user_role(@user.email)) if @user.role.nil?
@user.activate
# Redirect user to root with account pending flash if account is still pending