Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
ThaiMinhPhuc_training
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
phuctmZigexn
ThaiMinhPhuc_training
Commits
bf54660e
Commit
bf54660e
authored
Aug 07, 2018
by
phuctmZigexn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement advanced login
parent
78e39a12
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
128 additions
and
3 deletions
+128
-3
app/assets/stylesheets/custom.scss
+16
-0
app/controllers/sessions_controller.rb
+2
-1
app/helpers/sessions_helper.rb
+25
-1
app/models/user.rb
+22
-0
app/views/sessions/new.html.erb
+5
-0
db/migrate/20180806093756_add_remember_digest_to_users.rb
+5
-0
db/schema.rb
+2
-1
test/helpers/sessions_helper_test.rb
+19
-0
test/integration/users_login_test.rb
+15
-0
test/models/user_test.rb
+4
-0
test/test_helper.rb
+13
-0
No files found.
app/assets/stylesheets/custom.scss
View file @
bf54660e
...
...
@@ -170,3 +170,18 @@ input {
color
:
$state-danger-text
;
}
}
.checkbox
{
margin-top
:
-10px
;
margin-bottom
:
10px
;
span
{
margin-left
:
20px
;
font-weight
:
normal
;
}
}
#session_remember_me
{
width
:
auto
;
margin-left
:
0
;
}
\ No newline at end of file
app/controllers/sessions_controller.rb
View file @
bf54660e
...
...
@@ -6,6 +6,7 @@ class SessionsController < ApplicationController
user
=
User
.
find_by
(
email:
params
[
:session
][
:email
].
downcase
)
if
user
&&
user
.
authenticate
(
params
[
:session
][
:password
])
log_in
user
params
[
:session
][
:remember_me
]
==
'1'
?
remember
(
user
)
:
forget
(
user
)
redirect_to
user
else
flash
.
now
[
:danger
]
=
"Invalid email/password combination"
...
...
@@ -14,7 +15,7 @@ class SessionsController < ApplicationController
end
def
destroy
log_out
log_out
if
logged_in?
redirect_to
root_url
end
end
app/helpers/sessions_helper.rb
View file @
bf54660e
...
...
@@ -3,15 +3,39 @@ module SessionsHelper
session
[
:user_id
]
=
user
.
id
end
# remember a user in a persistent session
def
remember
(
user
)
user
.
remember
cookies
.
permanent
.
signed
[
:user_id
]
=
user
.
id
cookies
.
permanent
[
:remember_token
]
=
user
.
remember_token
end
# return the user corresponding to the remember token cookie
def
current_user
@current_user
||=
User
.
find_by
(
id:
session
[
:user_id
])
if
user_id
=
session
[
:user_id
]
@current_user
||=
User
.
find_by
(
id:
user_id
)
elsif
user_id
=
cookies
.
signed
[
:user_id
]
user
=
User
.
find_by
(
id:
user_id
)
if
user
&&
user
.
authenticated?
(
cookies
[
:remember_token
])
log_in
user
@current_user
=
user
end
end
end
def
logged_in?
!
current_user
.
nil?
end
#forgets a persistent session
def
forget
(
user
)
user
.
forget
cookies
.
delete
(
:user_id
)
cookies
.
delete
(
:remember_token
)
end
def
log_out
forget
(
current_user
)
session
.
delete
(
:user_id
)
@current_user
=
nil
end
...
...
app/models/user.rb
View file @
bf54660e
class
User
<
ApplicationRecord
attr_accessor
:remember_token
before_save
{
email
.
downcase!
}
validates
:name
,
presence:
true
,
length:
{
maximum:
50
}
VALID_EMAIL_REGEX
=
/\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
...
...
@@ -14,4 +17,23 @@ class User < ApplicationRecord
BCrypt
::
Engine
.
cost
BCrypt
::
Password
.
create
(
string
,
cost:
cost
)
end
# return a random token
def
User
.
new_token
SecureRandom
.
urlsafe_base64
end
def
remember
self
.
remember_token
=
User
.
new_token
update_attribute
:remember_digest
,
User
.
digest
(
remember_token
)
end
def
authenticated?
(
remember_token
)
return
false
if
remember_digest
.
nil?
BCrypt
::
Password
.
new
(
remember_digest
).
is_password?
(
remember_token
)
end
def
forget
update_attribute
(
:remember_digest
,
nil
)
end
end
app/views/sessions/new.html.erb
View file @
bf54660e
...
...
@@ -10,6 +10,11 @@
<%=
f
.
label
:password
%>
<%=
f
.
password_field
:password
,
class:
'form-control'
%>
<%=
f
.
label
:remember_me
,
class:
"checkbox inline"
do
%>
<%=
f
.
check_box
:remember_me
%>
<span>
Remember me on this computer
</span>
<%
end
%>
<%=
f
.
submit
'Log in'
,
class:
"btn btn-primary"
%>
<%
end
%>
...
...
db/migrate/20180806093756_add_remember_digest_to_users.rb
0 → 100644
View file @
bf54660e
class
AddRememberDigestToUsers
<
ActiveRecord
::
Migration
[
5.2
]
def
change
add_column
:users
,
:remember_digest
,
:string
end
end
db/schema.rb
View file @
bf54660e
...
...
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2018_08_0
2_015202
)
do
ActiveRecord
::
Schema
.
define
(
version:
2018_08_0
6_093756
)
do
create_table
"users"
,
force: :cascade
do
|
t
|
t
.
string
"name"
...
...
@@ -18,6 +18,7 @@ ActiveRecord::Schema.define(version: 2018_08_02_015202) do
t
.
datetime
"created_at"
,
null:
false
t
.
datetime
"updated_at"
,
null:
false
t
.
string
"password_digest"
t
.
string
"remember_digest"
t
.
index
[
"email"
],
name:
"index_users_on_email"
,
unique:
true
end
...
...
test/helpers/sessions_helper_test.rb
0 → 100644
View file @
bf54660e
require
"test_helper"
class
SessionsHelperTest
<
ActionView
::
TestCase
def
setup
@user
=
users
(
:michael
)
remember
@user
end
test
"current_user returns right user when session is nil"
do
assert_equal
@user
,
current_user
assert
is_logged_in?
end
test
"current_user returns nil when remember digest is wrong"
do
@user
.
update_attribute
:remember_digest
,
User
.
digest
(
User
.
new_token
)
assert_nil
current_user
end
end
\ No newline at end of file
test/integration/users_login_test.rb
View file @
bf54660e
...
...
@@ -29,9 +29,24 @@ class UsersLoginTest < ActionDispatch::IntegrationTest
delete
logout_path
assert_not
is_logged_in?
assert_redirected_to
root_url
# simulate a user clicking logout in a second window
delete
logout_path
follow_redirect!
assert_select
"a[href=?]"
,
login_path
assert_select
"a[href=?]"
,
logout_path
,
count:
0
assert_select
"a[href=?]"
,
user_path
(
@user
),
count:
0
end
test
"login with remembering"
do
log_in_as
@user
,
remember_me:
'1'
assert_not_empty
cookies
[
'remember_token'
]
end
test
'login without remembering'
do
# log in to set the cookie
log_in_as
@user
,
remember_me:
'1'
# log in again and verify that the cookie is deleted.
log_in_as
@user
,
remember_me:
'0'
assert_empty
cookies
[
'remember_token'
]
end
end
test/models/user_test.rb
View file @
bf54660e
...
...
@@ -71,4 +71,8 @@ class UserTest < ActiveSupport::TestCase
@user
.
password
=
@user
.
password_confirmation
=
"a"
*
5
assert_not
@user
.
valid?
end
test
"authenticated? should return false for a user with nil digest"
do
assert_not
@user
.
authenticated?
(
''
)
end
end
test/test_helper.rb
View file @
bf54660e
...
...
@@ -11,4 +11,17 @@ class ActiveSupport::TestCase
def
is_logged_in?
!
session
[
:user_id
].
nil?
end
#log in as a particular user
def
log_in_as
(
user
)
session
[
:user_id
]
=
user
.
id
end
end
class
ActionDispatch
::
IntegrationTest
#log in as a particular user
def
log_in_as
(
user
,
password:
'password'
,
remember_me:
'1'
)
post
login_path
,
params:
{
session:
{
email:
user
.
email
,
password:
password
,
remember_me:
remember_me
}
}
end
end
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