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
Tatuya Kamada
gitlab-ce
Commits
d1f50195
Commit
d1f50195
authored
May 02, 2016
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use correct auth finder
parent
b1ffc9f0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
7 deletions
+2
-7
lib/api/session.rb
lib/api/session.rb
+1
-6
lib/gitlab/backend/grack_auth.rb
lib/gitlab/backend/grack_auth.rb
+1
-1
No files found.
lib/api/session.rb
View file @
d1f50195
...
@@ -11,12 +11,7 @@ module API
...
@@ -11,12 +11,7 @@ module API
# Example Request:
# Example Request:
# POST /session
# POST /session
post
"/session"
do
post
"/session"
do
user
,
_
=
Gitlab
::
Auth
.
find
(
user
=
Gitlab
::
Auth
.
find_by_master_or_ldap
(
params
[
:email
]
||
params
[
:login
],
params
[
:password
])
params
[
:email
]
||
params
[
:login
],
params
[
:password
],
project:
nil
,
ip:
request
.
ip
)
return
unauthorized!
unless
user
return
unauthorized!
unless
user
present
user
,
with:
Entities
::
UserLogin
present
user
,
with:
Entities
::
UserLogin
...
...
lib/gitlab/backend/grack_auth.rb
View file @
d1f50195
...
@@ -95,7 +95,7 @@ module Grack
...
@@ -95,7 +95,7 @@ module Grack
end
end
def
authenticate_user
(
login
,
password
)
def
authenticate_user
(
login
,
password
)
user
,
_
=
Gitlab
::
Auth
.
new
.
find_by_master_or_ldap
(
login
,
password
)
user
=
Gitlab
::
Auth
.
new
.
find_by_master_or_ldap
(
login
,
password
)
unless
user
unless
user
user
=
oauth_access_token_check
(
login
,
password
)
user
=
oauth_access_token_check
(
login
,
password
)
...
...
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