IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(ldap): work on reading ldap config from toml file, #1450

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-07-15 10:08:23 +02:00
parent 262a09bb2d
commit 0b5ba55131
14 changed files with 167 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/login.go
View File

@@ -4,9 +4,9 @@ import (
"net/url"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/auth"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/login"
"github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
@@ -88,13 +88,13 @@ func LoginApiPing(c *middleware.Context) {
}
func LoginPost(c *middleware.Context, cmd dtos.LoginCommand) Response {
authQuery := auth.AuthenticateUserQuery{
authQuery := login.LoginUserQuery{
Username: cmd.User,
Password: cmd.Password,
}
if err := bus.Dispatch(&authQuery); err != nil {
if err == auth.ErrInvalidCredentials {
if err == login.ErrInvalidCredentials {
return ApiError(401, "Invalid username or password", err)
}