diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-05-11 10:17:59 -0400 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-05-11 10:17:59 -0400 |
| commit | e3ea27c30124791ca44bb314496e819ae11b01b7 (patch) | |
| tree | 5063ee059ff1e5a6d443ad3063ac41dcaed3cfba /app/login.go | |
| parent | 2b27e12445ba51e1fa1ab2aceac5fcb3de66845d (diff) | |
| parent | 21d3b247d9645efa9471877cc36b46de92dc1d09 (diff) | |
| download | chat-e3ea27c30124791ca44bb314496e819ae11b01b7.tar.gz chat-e3ea27c30124791ca44bb314496e819ae11b01b7.tar.bz2 chat-e3ea27c30124791ca44bb314496e819ae11b01b7.zip | |
Merge release-4.10 with master
Diffstat (limited to 'app/login.go')
| -rw-r--r-- | app/login.go | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/app/login.go b/app/login.go index 529e4cb21..a07056c1e 100644 --- a/app/login.go +++ b/app/login.go @@ -6,7 +6,6 @@ package app import ( "fmt" "net/http" - "strings" "time" "github.com/avct/uasurfer" @@ -95,26 +94,10 @@ func (a *App) DoLogin(w http.ResponseWriter, r *http.Request, user *model.User, ua := uasurfer.Parse(r.UserAgent()) - plat := ua.OS.Platform.String() - if plat == "" { - plat = "unknown" - } - - os := ua.OS.Name.String() - if os == "" { - os = "unknown" - } - - bname := ua.Browser.Name.String() - if bname == "" { - bname = "unknown" - } - - if strings.Contains(r.UserAgent(), "Mattermost") { - bname = "Desktop App" - } - - bversion := ua.Browser.Version + plat := getPlatformName(ua) + os := getOSName(ua) + bname := getBrowserName(ua, r.UserAgent()) + bversion := getBrowserVersion(ua, r.UserAgent()) session.AddProp(model.SESSION_PROP_PLATFORM, plat) session.AddProp(model.SESSION_PROP_OS, os) |