diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-05-03 14:10:36 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-03 14:10:36 -0400 |
| commit | 87989b8afd4666a72940389db716b6500d0a9ec3 (patch) | |
| tree | d4b0270eb4a9adbff0dd1b6f527ddcccbc9a83d9 /web | |
| parent | e76a30bca0690bad53a4cabd6c7c629e89c17268 (diff) | |
| download | chat-87989b8afd4666a72940389db716b6500d0a9ec3.tar.gz chat-87989b8afd4666a72940389db716b6500d0a9ec3.tar.bz2 chat-87989b8afd4666a72940389db716b6500d0a9ec3.zip | |
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
Diffstat (limited to 'web')
| -rw-r--r-- | web/web_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
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} |