Skip to content

Commit

Permalink
Updated validate_password_token to correct name
Browse files Browse the repository at this point in the history
  • Loading branch information
colin-odowd committed Oct 25, 2022
1 parent 5429abd commit 3f9f63a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions app/controllers/password_retrieval_controller.rb
Expand Up @@ -16,7 +16,7 @@ def send_password
user = User.find_by(email: params[:user][:email])
if user
# formats password reset url to include a queryable token parameter
url_format = '/password_edit/validate_password_token?token='
url_format = '/password_edit/check_token_validity?token='
# generates a random URL-safe base64 token with default length of 16 characters
token = SecureRandom.urlsafe_base64
PasswordReset.save_token(user, token)
Expand All @@ -35,7 +35,7 @@ def send_password
end

# The token obtained from the reset url is first checked if it is valid ( if actually generated by the application), then checks if the token is active.
def validate_password_token
def check_token_validity
days_until_token_expiration = 1

if params[:token].nil?
Expand Down
2 changes: 1 addition & 1 deletion config/routes.rb
Expand Up @@ -645,7 +645,7 @@
get 'instructions/home'
get 'response/', to: 'response#saving'
# get ':controller/service.wsdl', action: 'wsdl'
get 'password_edit/validate_password_token', controller: :password_retrieval, action: :validate_password_token
get 'password_edit/check_token_validity', controller: :password_retrieval, action: :check_token_validity
# get ':controller(/:action(/:id))(.:format)'
unless Rails.env.development?
match '*path' => 'content_pages#view', :via => %i[get post]
Expand Down
6 changes: 3 additions & 3 deletions spec/controllers/password_retrieval_controller_spec.rb
Expand Up @@ -46,7 +46,7 @@
@password_retrival.save!
request_params = { token: local_token }
Timecop.freeze(Time.zone.today + 2.days) do
get :validate_password_token, params: request_params
get :check_token_validity, params: request_params
expect(response).to render_template 'password_retrieval/forgotten'
end
end
Expand All @@ -59,7 +59,7 @@
@password_retrival.user_email = 'example@example.edu'
@password_retrival.save!
request_params = { token: local_token_sent_as_parameter }
get :validate_password_token, params: request_params
get :check_token_validity, params: request_params
expect(response).to render_template 'password_retrieval/forgotten'
end

Expand All @@ -71,7 +71,7 @@
@password_retrival.save!
request_params = { token: local_token }
Timecop.freeze(@password_retrival.updated_at + 2.hours) do
get :validate_password_token, params: request_params
get :check_token_validity, params: request_params
expect(response).to render_template 'password_retrieval/reset_password'
end
end
Expand Down

0 comments on commit 3f9f63a

Please sign in to comment.