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

30
spec/controllers/account_activations_controller_spec.rb
View File

@ -27,7 +27,7 @@ describe AccountActivationsController, type: :controller do
user = create(:user, provider: "greenlight")
@request.session[:user_id] = user.id
get :show, params: { email: user.email }
get :show, params: { uid: user.uid }
expect(response).to redirect_to(user.main_room)
end
@ -35,7 +35,8 @@ describe AccountActivationsController, type: :controller do
it "renders the verify view if the user is not signed in and is not verified" do
user = create(:user, email_verified: false, provider: "greenlight")
get :show, params: { email: user.email }
user.create_activation_token
get :show, params: { token: user.activation_token }
expect(response).to render_template(:show)
end
@ -45,7 +46,8 @@ describe AccountActivationsController, type: :controller do
it "activates a user if they have the correct activation token" do
@user = create(:user, email_verified: false, provider: "greenlight")
get :edit, params: { email: @user.email, token: @user.activation_token }
@user.create_activation_token
get :edit, params: { token: @user.activation_token }
@user.reload
expect(@user.email_verified).to eq(true)
@ -53,22 +55,17 @@ describe AccountActivationsController, type: :controller do
expect(response).to redirect_to(signin_path)
end
it "does not activate a user if they have the correct activation token" do
it "should not find user when given fake activation token" do
@user = create(:user, email_verified: false, provider: "greenlight")
get :edit, params: { email: @user.email, token: "fake_token" }
@user.reload
expect(@user.email_verified).to eq(false)
expect(flash[:alert]).to be_present
expect(response).to redirect_to(root_path)
expect { get :edit, params: { token: "fake_token" } }.to raise_error(ActiveRecord::RecordNotFound)
end
it "does not allow the user to click the verify link again" do
@user = create(:user, provider: "greenlight")
get :edit, params: { email: @user.email, token: @user.activation_token }
@user.create_activation_token
get :edit, params: { token: @user.activation_token }
expect(flash[:alert]).to be_present
expect(response).to redirect_to(root_path)
end
@ -78,7 +75,8 @@ describe AccountActivationsController, type: :controller do
@user.add_role :pending
get :edit, params: { email: @user.email, token: @user.activation_token }
@user.create_activation_token
get :edit, params: { token: @user.activation_token }
expect(flash[:success]).to be_present
expect(response).to redirect_to(root_path)
@ -89,7 +87,8 @@ describe AccountActivationsController, type: :controller do
it "resends the email to the current user if the resend button is clicked" do
user = create(:user, email_verified: false, provider: "greenlight")
expect { get :resend, params: { email: user.email } }.to change { ActionMailer::Base.deliveries.count }.by(1)
user.create_activation_token
expect { get :resend, params: { token: user.activation_token } }.to change { ActionMailer::Base.deliveries.count }.by(1)
expect(flash[:success]).to be_present
expect(response).to redirect_to(root_path)
end
@ -97,7 +96,8 @@ describe AccountActivationsController, type: :controller do
it "redirects a verified user to the root path" do
user = create(:user, provider: "greenlight")
get :resend, params: { email: user.email }
user.create_activation_token
get :resend, params: { token: user.activation_token }
expect(flash[:alert]).to be_present
expect(response).to redirect_to(root_path)