Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
b08d33f6
Commit
b08d33f6
authored
Sep 20, 2012
by
Nihad Abbasov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
API: return 401 for invalid session
parent
3dd940d4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
lib/api/session.rb
lib/api/session.rb
+2
-3
spec/requests/api/session_spec.rb
spec/requests/api/session_spec.rb
+2
-2
No files found.
lib/api/session.rb
View file @
b08d33f6
...
@@ -8,14 +8,13 @@ module Gitlab
...
@@ -8,14 +8,13 @@ module Gitlab
post
"/session"
do
post
"/session"
do
resource
=
User
.
find_for_database_authentication
(
email:
params
[
:email
])
resource
=
User
.
find_for_database_authentication
(
email:
params
[
:email
])
return
forbidden
!
unless
resource
return
unauthorized
!
unless
resource
if
resource
.
valid_password?
(
params
[
:password
])
if
resource
.
valid_password?
(
params
[
:password
])
present
resource
,
with:
Entities
::
UserLogin
present
resource
,
with:
Entities
::
UserLogin
else
else
forbidden
!
unauthorized
!
end
end
end
end
end
end
end
end
spec/requests/api/session_spec.rb
View file @
b08d33f6
...
@@ -19,7 +19,7 @@ describe Gitlab::API do
...
@@ -19,7 +19,7 @@ describe Gitlab::API do
context
"when invalid password"
do
context
"when invalid password"
do
it
"should return authentication error"
do
it
"should return authentication error"
do
post
api
(
"/session"
),
email:
user
.
email
,
password:
'123'
post
api
(
"/session"
),
email:
user
.
email
,
password:
'123'
response
.
status
.
should
==
40
3
response
.
status
.
should
==
40
1
json_response
[
'email'
].
should
be_nil
json_response
[
'email'
].
should
be_nil
json_response
[
'private_token'
].
should
be_nil
json_response
[
'private_token'
].
should
be_nil
...
@@ -29,7 +29,7 @@ describe Gitlab::API do
...
@@ -29,7 +29,7 @@ describe Gitlab::API do
context
"when empty password"
do
context
"when empty password"
do
it
"should return authentication error"
do
it
"should return authentication error"
do
post
api
(
"/session"
),
email:
user
.
email
post
api
(
"/session"
),
email:
user
.
email
response
.
status
.
should
==
40
3
response
.
status
.
should
==
40
1
json_response
[
'email'
].
should
be_nil
json_response
[
'email'
].
should
be_nil
json_response
[
'private_token'
].
should
be_nil
json_response
[
'private_token'
].
should
be_nil
...
...
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