Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sample_app
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Đường Sỹ Hoàng
sample_app
Commits
f16c7517
Commit
f16c7517
authored
Nov 20, 2019
by
Đường Sỹ Hoàng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Combine unless operator
parent
56bf99a9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
app/controllers/password_resets_controller.rb
+5
-7
No files found.
app/controllers/password_resets_controller.rb
View file @
f16c7517
class
PasswordResetsController
<
ApplicationController
class
PasswordResetsController
<
ApplicationController
before_action
:get_user
,
only:
[
:edit
,
:update
]
before_action
:get_user
,
only:
[
:edit
,
:update
]
before_action
:valid_user
,
only:
[
:edit
,
:update
]
before_action
:valid_user
,
only:
[
:edit
,
:update
]
before_action
:check_expiration
,
only:
[
:edit
,
:update
]
# Case (1)
before_action
:check_expiration
,
only:
[
:edit
,
:update
]
def
create
def
create
@user
=
User
.
find_by
(
email:
params
[
:password_reset
][
:email
].
downcase
)
@user
=
User
.
find_by
(
email:
params
[
:password_reset
][
:email
].
downcase
)
...
@@ -20,16 +20,16 @@ class PasswordResetsController < ApplicationController
...
@@ -20,16 +20,16 @@ class PasswordResetsController < ApplicationController
end
end
def
update
def
update
if
params
[
:user
][
:password
].
empty?
# Case (3)
if
params
[
:user
][
:password
].
empty?
@user
.
errors
.
add
(
:password
,
"can't be empty"
)
@user
.
errors
.
add
(
:password
,
"can't be empty"
)
render
"edit"
render
"edit"
elsif
@user
.
update_attributes
(
user_params
)
# Case (4)
elsif
@user
.
update_attributes
(
user_params
)
log_in
@user
log_in
@user
@user
.
update_attribute
(
:reset_digest
,
nil
)
@user
.
update_attribute
(
:reset_digest
,
nil
)
flash
[
:success
]
=
"Password has been reset."
flash
[
:success
]
=
"Password has been reset."
redirect_to
@user
redirect_to
@user
else
else
render
"edit"
# Case (2)
render
"edit"
end
end
end
end
...
@@ -45,9 +45,7 @@ class PasswordResetsController < ApplicationController
...
@@ -45,9 +45,7 @@ class PasswordResetsController < ApplicationController
# Confirms a valid user.
# Confirms a valid user.
def
valid_user
def
valid_user
unless
(
@user
&&
@user
.
activated?
&&
@user
.
authenticated?
(
:reset
,
params
[
:id
]))
return
redirect_to
root_url
unless
(
@user
&&
@user
.
activated?
&&
@user
.
authenticated?
(
:reset
,
params
[
:id
]))
redirect_to
root_url
end
end
end
# Checks expiration of reset token.
# Checks expiration of reset token.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment