summaryrefslogtreecommitdiffstats
path: root/app/login.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2018-05-09 12:25:03 -0400
committerDerrick Anderson <derrick@andersonwebstudio.com>2018-05-09 12:25:03 -0400
commita752d7de5a0a1aa1679790f76f2f8dc35e322c41 (patch)
treeaacbf5e855a49c7f876c1f67c0d2d7a919f33a6e /app/login.go
parent09c67708853199c015d659ed2526107ad4c10772 (diff)
downloadchat-a752d7de5a0a1aa1679790f76f2f8dc35e322c41.tar.gz
chat-a752d7de5a0a1aa1679790f76f2f8dc35e322c41.tar.bz2
chat-a752d7de5a0a1aa1679790f76f2f8dc35e322c41.zip
MM-10495 Updated user agent detection to match output of previous library (#8748)
* MM-10495 Updated user agent detection to match output of previous library * Fixed missing license header
Diffstat (limited to 'app/login.go')
-rw-r--r--app/login.go25
1 files changed, 4 insertions, 21 deletions
diff --git a/app/login.go b/app/login.go
index 43b022749..a2f06dbc3 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"
@@ -73,26 +72,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)