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 /api/file_test.go | |
| 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 'api/file_test.go')
| -rw-r--r-- | api/file_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/file_test.go b/api/file_test.go index dd4a8520b..015048ec4 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -217,7 +217,7 @@ func TestGetFile(t *testing.T) { data := model.MapToJson(newProps) hash := model.HashPassword(fmt.Sprintf("%v:%v", data, utils.Cfg.FileSettings.PublicLinkSalt)) - Client.LoginByEmail(team2.Name, user2.Email, "pwd") + Client.Login(user2.Email, "pwd") Client.SetTeamId(team2.Id) if _, downErr := Client.GetFile(filenames[0]+"?d="+url.QueryEscape(data)+"&h="+url.QueryEscape(hash)+"&t="+team.Id, false); downErr != nil { |