From a5e7fef642617dbd4780c7c5a6c488e2734397c0 Mon Sep 17 00:00:00 2001
From: Karol Selak <karol.selak@gmail.com>
Date: Sun, 21 Mar 2021 11:26:08 +0100
Subject: [PATCH] password recovery renaming

---
 app/controllers/users_controller.rb                         | 6 +++---
 app/mailers/user_mailer.rb                                  | 2 +-
 app/views/sessions/welcome.html.erb                         | 2 +-
 app/views/users/password_recovery_email.html.erb            | 4 ----
 ...ecovery_email.html.erb => password_recovery_request.erb} | 0
 app/views/users/password_recovery_request_form.erb          | 4 ++++
 ...ord_recovery.html.erb => recover_password_form.html.erb} | 0
 config/routes.rb                                            | 6 +++---
 8 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 app/views/users/password_recovery_email.html.erb
 rename app/views/users/{send_password_recovery_email.html.erb => password_recovery_request.erb} (100%)
 create mode 100644 app/views/users/password_recovery_request_form.erb
 rename app/views/users/{password_recovery.html.erb => recover_password_form.html.erb} (100%)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index af59336..f37956e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -9,15 +9,15 @@ class UsersController < ApplicationController
     redirect_to '/welcome'
   end
 
-  def send_password_recovery_email
+  def password_recovery_request
     @user = User.where(email: params['email']).first
     UserMailer.with(user: @user).password_recovery.deliver_now
   end
 
-  def password_recovery_email
+  def password_recovery_request_form
   end
 
-  def password_recovery
+  def recover_password_form
     @recovery_code = params[:recovery_code]
     @user_id = params[:id]
   end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 54cc9a9..6c23998 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -4,7 +4,7 @@ class UserMailer < ApplicationMailer
     recovery_password = ('a'..'z').to_a.shuffle[0,8].join
     @user.recovery_password = recovery_password
     @user.save
-    @url  = "http://localhost:18210/password_recovery/#{@user.id}/#{recovery_password}"
+    @url  = "http://localhost:18210/recover_password/#{@user.id}/#{recovery_password}"
     mail(to: @user.email, subject: 'Password recovery')
   end
 end
diff --git a/app/views/sessions/welcome.html.erb b/app/views/sessions/welcome.html.erb
index a7e9d6e..57e6dd2 100644
--- a/app/views/sessions/welcome.html.erb
+++ b/app/views/sessions/welcome.html.erb
@@ -5,5 +5,5 @@
 <%else%>
   <%= button_to "Login", '/login', method: :get%>
   <%= button_to "Sign Up", '/users/new', method: :get%>
-  <%= button_to "Password recovery", '/password_recovery', method: :get%>
+  <%= button_to "Password recovery", '/password_recovery_request', method: :get%>
 <%end%>
diff --git a/app/views/users/password_recovery_email.html.erb b/app/views/users/password_recovery_email.html.erb
deleted file mode 100644
index 60b2904..0000000
--- a/app/views/users/password_recovery_email.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= form_with url: "/password_recovery", method: :post do |form| %>
-  <%= form.text_field :email %>
-  <%= form.submit "Send email" %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/users/send_password_recovery_email.html.erb b/app/views/users/password_recovery_request.erb
similarity index 100%
rename from app/views/users/send_password_recovery_email.html.erb
rename to app/views/users/password_recovery_request.erb
diff --git a/app/views/users/password_recovery_request_form.erb b/app/views/users/password_recovery_request_form.erb
new file mode 100644
index 0000000..2e22108
--- /dev/null
+++ b/app/views/users/password_recovery_request_form.erb
@@ -0,0 +1,4 @@
+<%= form_with url: "/password_recovery_request", method: :post do |form| %>
+  <%= form.text_field :email %>
+  <%= form.submit "Send email" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/password_recovery.html.erb b/app/views/users/recover_password_form.html.erb
similarity index 100%
rename from app/views/users/password_recovery.html.erb
rename to app/views/users/recover_password_form.html.erb
diff --git a/config/routes.rb b/config/routes.rb
index e9dfcbe..b0a6324 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,9 +4,9 @@ Rails.application.routes.draw do
   get 'logout', to: 'sessions#delete'
   post 'login', to: 'sessions#create'
   get 'welcome', to: 'sessions#welcome'
-  get 'password_recovery/:id/:recovery_code', to: 'users#password_recovery'
-  get 'password_recovery', to: 'users#password_recovery_email'
-  post 'password_recovery', to: 'users#send_password_recovery_email'
+  get 'password_recovery_request', to: 'users#password_recovery_request_form'
+  post 'password_recovery_request', to: 'users#password_recovery_request'
+  get 'recover_password/:id/:recovery_code', to: 'users#recover_password_form'
   post 'recover_password', to: 'users#recover_password'
   resources :books
 end