diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2018-03-12 10:21:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 10:21:20 -0400 |
| commit | 4e26594fcb03c378222d2316a004c291d48dd6c7 (patch) | |
| tree | 76aa6d8a8255c141ee04997d31cde84a70f7f807 /app/login.go | |
| parent | 81acb1a14b404941dcd79c3088f09ee310896690 (diff) | |
| download | chat-4e26594fcb03c378222d2316a004c291d48dd6c7.tar.gz chat-4e26594fcb03c378222d2316a004c291d48dd6c7.tar.bz2 chat-4e26594fcb03c378222d2316a004c291d48dd6c7.zip | |
Removed mssola/user_agent library (#8417)
* Removed mssola/user_agent library
* Changed user agent tests to use t.Run
Diffstat (limited to 'app/login.go')
| -rw-r--r-- | app/login.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/app/login.go b/app/login.go index e01566bcd..43b022749 100644 --- a/app/login.go +++ b/app/login.go @@ -9,8 +9,8 @@ import ( "strings" "time" + "github.com/avct/uasurfer" "github.com/mattermost/mattermost-server/model" - "github.com/mssola/user_agent" ) func (a *App) AuthenticateUserForLogin(id, loginId, password, mfaToken, deviceId string, ldapOnly bool) (*model.User, *model.AppError) { @@ -71,19 +71,19 @@ func (a *App) DoLogin(w http.ResponseWriter, r *http.Request, user *model.User, session.SetExpireInDays(*a.Config().ServiceSettings.SessionLengthWebInDays) } - ua := user_agent.New(r.UserAgent()) + ua := uasurfer.Parse(r.UserAgent()) - plat := ua.Platform() + plat := ua.OS.Platform.String() if plat == "" { plat = "unknown" } - os := ua.OS() + os := ua.OS.Name.String() if os == "" { os = "unknown" } - bname, bversion := ua.Browser() + bname := ua.Browser.Name.String() if bname == "" { bname = "unknown" } @@ -92,9 +92,7 @@ func (a *App) DoLogin(w http.ResponseWriter, r *http.Request, user *model.User, bname = "Desktop App" } - if bversion == "" { - bversion = "0.0" - } + bversion := ua.Browser.Version session.AddProp(model.SESSION_PROP_PLATFORM, plat) session.AddProp(model.SESSION_PROP_OS, os) |