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

GRN2-233: Made account activation & password reset links based on tokens only (#959)

Browse Source 
* GRN2-233: Hiding email in verification link and password reset link

* updating tests

* removing uid from email verificaiton link

* GRN2-233: modifying test cases

* GRN2-233: Removing uid from password reset link

* GRN2-233: Removed email_params and fixed "authenticated?" method

* GRN2-233: Fixed error when trying to sign in unverified

* GRN2-233: Changed how activation tokens are generated
This commit is contained in:
etiennevvv
2020-02-24 13:05:09 -05:00
committed by GitHub
parent b7aa5406ea
commit 03266730e8
10 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/sessions_controller.rb
View File

@ -88,7 +88,10 @@ class SessionsController < ApplicationController
# Check that the user is a Greenlight account
return redirect_to(root_path, alert: I18n.t("invalid_login_method")) unless user.greenlight_account?
# Check that the user has verified their account
return redirect_to(account_activation_path(email: user.email)) unless user.activated?
unless user.activated?
user.create_activation_token
return redirect_to(account_activation_path(token: user.activation_token))
end
end
login(user)