From 87989b8afd4666a72940389db716b6500d0a9ec3 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 3 May 2016 14:10:36 -0400
Subject: PLT-2258 Unified login screen and related APIs (#2820)

* Unified login screen and related APIs

* Refactored login API call to be less convoluted

* Removed LDAP login prompt from invite process

* Fixed existing LDAP users being able to log in if LDAP was configured, but disabled

* Gofmt

* Future proofed login API

* Updated login APIs based on feedback

* Added additional auditing to login API

* Actually removed loginById
---
 web/web_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/web_test.go b/web/web_test.go
index 9d7a84c5c..7a0485215 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -204,7 +204,7 @@ func TestIncomingWebhook(t *testing.T) {
 	c.RequestId = model.NewId()
 	c.IpAddress = "cmd_line"
 	api.UpdateRoles(c, user, model.ROLE_SYSTEM_ADMIN)
-	ApiClient.LoginByEmail(team.Name, user.Email, "pwd")
+	ApiClient.Login(user.Email, "pwd")
 	ApiClient.SetTeamId(team.Id)
 
 	channel1 := &model.Channel{DisplayName: "Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id}
-- 
cgit v1.2.3-1-g7c22