diff options
-rw-r--r-- | api/user.go | 45 | ||||
-rw-r--r-- | api/user_test.go | 28 | ||||
-rw-r--r-- | i18n/en.json | 4 | ||||
-rw-r--r-- | model/client.go | 11 | ||||
-rw-r--r-- | store/sql_session_store.go | 18 | ||||
-rw-r--r-- | store/sql_session_store_test.go | 22 | ||||
-rw-r--r-- | store/store.go | 1 | ||||
-rw-r--r-- | web/react/components/activity_log_modal.jsx | 9 | ||||
-rw-r--r-- | web/react/components/login.jsx | 27 | ||||
-rw-r--r-- | web/templates/claim_account.html | 18 | ||||
-rw-r--r-- | web/templates/docs.html | 3 | ||||
-rw-r--r-- | web/templates/find_team.html | 3 | ||||
-rw-r--r-- | web/templates/login.html | 2 | ||||
-rw-r--r-- | web/templates/password_reset.html | 16 | ||||
-rw-r--r-- | web/templates/verify.html | 11 | ||||
-rw-r--r-- | web/templates/welcome.html | 37 |
16 files changed, 199 insertions, 56 deletions
diff --git a/api/user.go b/api/user.go index 473f0da54..ceaf1fc2d 100644 --- a/api/user.go +++ b/api/user.go @@ -48,6 +48,7 @@ func InitUser(r *mux.Router) { sr.Handle("/logout", ApiUserRequired(logout)).Methods("POST") sr.Handle("/login_ldap", ApiAppHandler(loginLdap)).Methods("POST") sr.Handle("/revoke_session", ApiUserRequired(revokeSession)).Methods("POST") + sr.Handle("/attach_device", ApiUserRequired(attachDeviceId)).Methods("POST") sr.Handle("/switch_to_sso", ApiAppHandler(switchToSSO)).Methods("POST") sr.Handle("/switch_to_email", ApiUserRequired(switchToEmail)).Methods("POST") @@ -546,7 +547,6 @@ func Login(c *Context, w http.ResponseWriter, r *http.Request, user *model.User, } } } - } else { session.SetExpireInDays(*utils.Cfg.ServiceSettings.SessionLengthWebInDays) } @@ -718,6 +718,49 @@ func revokeSession(c *Context, w http.ResponseWriter, r *http.Request) { w.Write([]byte(model.MapToJson(props))) } +func attachDeviceId(c *Context, w http.ResponseWriter, r *http.Request) { + props := model.MapFromJson(r.Body) + + deviceId := props["device_id"] + if len(deviceId) == 0 { + c.SetInvalidParam("attachDevice", "deviceId") + return + } + + if !(strings.HasPrefix(deviceId, model.PUSH_NOTIFY_APPLE+":") || strings.HasPrefix(deviceId, model.PUSH_NOTIFY_ANDROID+":")) { + c.SetInvalidParam("attachDevice", "deviceId") + return + } + + // A special case where we logout of all other sessions with the same Id + if result := <-Srv.Store.Session().GetSessions(c.Session.UserId); result.Err != nil { + c.Err = result.Err + c.Err.StatusCode = http.StatusForbidden + return + } else { + sessions := result.Data.([]*model.Session) + for _, session := range sessions { + if session.DeviceId == deviceId && session.Id != c.Session.Id { + l4g.Debug(utils.T("api.user.login.revoking.app_error"), session.Id, c.Session.UserId) + RevokeSessionById(c, session.Id) + if c.Err != nil { + c.LogError(c.Err) + c.Err = nil + } + } + } + } + + sessionCache.Remove(c.Session.Token) + + if result := <-Srv.Store.Session().UpdateDeviceId(c.Session.Id, deviceId); result.Err != nil { + c.Err = result.Err + return + } + + w.Write([]byte(deviceId)) +} + func RevokeSessionById(c *Context, sessionId string) { if result := <-Srv.Store.Session().Get(sessionId); result.Err != nil { c.Err = result.Err diff --git a/api/user_test.go b/api/user_test.go index 9a172805a..5f85bda0f 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -734,6 +734,34 @@ func TestUserUpdateRoles(t *testing.T) { } } +func TestUserUpdateDeviceId(t *testing.T) { + Setup() + + team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} + team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team) + + user := &model.User{TeamId: team.Id, Email: "test@nowhere.com", Nickname: "Corey Hulen", Password: "pwd"} + user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) + + Client.LoginByEmail(team.Name, user.Email, "pwd") + deviceId := model.PUSH_NOTIFY_APPLE + ":1234567890" + + if _, err := Client.AttachDeviceId(deviceId); err != nil { + t.Fatal(err) + } + + if result := <-Srv.Store.Session().GetSessions(user.Id); result.Err != nil { + t.Fatal(result.Err) + } else { + sessions := result.Data.([]*model.Session) + + if sessions[0].DeviceId != deviceId { + t.Fatal("Missing device Id") + } + } +} + func TestUserUpdateActive(t *testing.T) { Setup() diff --git a/i18n/en.json b/i18n/en.json index 72863acd9..14a2e3148 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2772,6 +2772,10 @@ "translation": "We couldn't update the roles" }, { + "id": "store.sql_session.update_device_id.app_error", + "translation": "We couldn't update the device id" + }, + { "id": "store.sql_system.get.app_error", "translation": "We encountered an error finding the system properties" }, diff --git a/model/client.go b/model/client.go index 8021c7039..d31ac1592 100644 --- a/model/client.go +++ b/model/client.go @@ -775,6 +775,17 @@ func (c *Client) UpdateUserRoles(data map[string]string) (*Result, *AppError) { } } +func (c *Client) AttachDeviceId(deviceId string) (*Result, *AppError) { + data := make(map[string]string) + data["device_id"] = deviceId + if r, err := c.DoApiPost("/users/attach_device", MapToJson(data)); err != nil { + return nil, err + } else { + return &Result{r.Header.Get(HEADER_REQUEST_ID), + r.Header.Get(HEADER_ETAG_SERVER), UserFromJson(r.Body)}, nil + } +} + func (c *Client) UpdateActive(userId string, active bool) (*Result, *AppError) { data := make(map[string]string) data["user_id"] = userId diff --git a/store/sql_session_store.go b/store/sql_session_store.go index 4762a1dfd..6532947f4 100644 --- a/store/sql_session_store.go +++ b/store/sql_session_store.go @@ -232,3 +232,21 @@ func (me SqlSessionStore) UpdateRoles(userId, roles string) StoreChannel { return storeChannel } + +func (me SqlSessionStore) UpdateDeviceId(id, deviceId string) StoreChannel { + storeChannel := make(StoreChannel) + + go func() { + result := StoreResult{} + if _, err := me.GetMaster().Exec("UPDATE Sessions SET DeviceId = :DeviceId WHERE Id = :Id", map[string]interface{}{"DeviceId": deviceId, "Id": id}); err != nil { + result.Err = model.NewLocAppError("SqlSessionStore.UpdateDeviceId", "store.sql_session.update_device_id.app_error", nil, "") + } else { + result.Data = deviceId + } + + storeChannel <- result + close(storeChannel) + }() + + return storeChannel +} diff --git a/store/sql_session_store_test.go b/store/sql_session_store_test.go index cec8e93b0..34d3128a6 100644 --- a/store/sql_session_store_test.go +++ b/store/sql_session_store_test.go @@ -157,6 +157,28 @@ func TestSessionRemoveToken(t *testing.T) { } } +func TestSessionUpdateDeviceId(t *testing.T) { + Setup() + + s1 := model.Session{} + s1.UserId = model.NewId() + s1.TeamId = model.NewId() + Must(store.Session().Save(&s1)) + + if rs1 := (<-store.Session().UpdateDeviceId(s1.Id, model.PUSH_NOTIFY_APPLE+":1234567890")); rs1.Err != nil { + t.Fatal(rs1.Err) + } + + s2 := model.Session{} + s2.UserId = model.NewId() + s2.TeamId = model.NewId() + Must(store.Session().Save(&s2)) + + if rs2 := (<-store.Session().UpdateDeviceId(s2.Id, model.PUSH_NOTIFY_APPLE+":1234567890")); rs2.Err != nil { + t.Fatal(rs2.Err) + } +} + func TestSessionStoreUpdateLastActivityAt(t *testing.T) { Setup() diff --git a/store/store.go b/store/store.go index b91b08f27..3988f0c6a 100644 --- a/store/store.go +++ b/store/store.go @@ -137,6 +137,7 @@ type SessionStore interface { PermanentDeleteSessionsByUser(teamId string) StoreChannel UpdateLastActivityAt(sessionId string, time int64) StoreChannel UpdateRoles(userId string, roles string) StoreChannel + UpdateDeviceId(id string, deviceId string) StoreChannel } type AuditStore interface { diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx index 6a880f0ee..eec4d8f8d 100644 --- a/web/react/components/activity_log_modal.jsx +++ b/web/react/components/activity_log_modal.jsx @@ -100,12 +100,15 @@ export default class ActivityLogModal extends React.Component { if (currentSession.props.platform === 'Windows') { devicePicture = 'fa fa-windows'; + } else if (currentSession.device_id.indexOf('apple:') === 0) { + devicePicture = 'fa fa-apple'; + devicePlatform = 'iPhone Native App'; + } else if (currentSession.device_id.indexOf('android:') === 0) { + devicePlatform = 'Android Native App'; + devicePicture = 'fa fa-android'; } else if (currentSession.props.platform === 'Macintosh' || currentSession.props.platform === 'iPhone') { devicePicture = 'fa fa-apple'; - } else if (currentSession.props.platform.browser.indexOf('Mattermost/') === 0) { - devicePicture = 'fa fa-apple'; - devicePlatform = 'iPhone'; } else if (currentSession.props.platform === 'Linux') { if (currentSession.props.os.indexOf('Android') >= 0) { devicePlatform = 'Android'; diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 6887489a7..3c1d66334 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -115,7 +115,7 @@ export default class Login extends React.Component { } let teamSignUp = null; - if (global.window.mm_config.EnableTeamCreation === 'true') { + if (global.window.mm_config.EnableTeamCreation === 'true' && !Utils.isMobileApp()) { teamSignUp = ( <div className='margin--extra'> <a @@ -137,6 +137,21 @@ export default class Login extends React.Component { ); } + let findTeams = null; + if (!Utils.isMobileApp()) { + findTeams = ( + <div className='form-group margin--extra form-group--small'> + <span> + <a href='/find_team'> + <FormattedMessage + id='login.find_teams' + defaultMessage='Find your other teams' + /> + </a></span> + </div> + ); + } + return ( <div className='signup-team__container'> <h5 className='margin--less'>{'Sign in to:'}</h5> @@ -147,15 +162,7 @@ export default class Login extends React.Component { {emailSignup} {ldapLogin} {userSignUp} - <div className='form-group margin--extra form-group--small'> - <span> - <a href='/find_team'> - <FormattedMessage - id='login.find_teams' - defaultMessage='Find your other teams' - /> - </a></span> - </div> + {findTeams} {forgotPassword} {teamSignUp} </div> diff --git a/web/templates/claim_account.html b/web/templates/claim_account.html index 6c9f36fa7..bcf63fd95 100644 --- a/web/templates/claim_account.html +++ b/web/templates/claim_account.html @@ -5,8 +5,22 @@ <body class="white"> <div class="container-fluid"> <div class="inner__wrap"> - <div class="row content" id="claim"></div> - </div> + <div class="row content"> + <div class="signup-header"> + <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a> + </div> + <div class="col-sm-12"> + <div class="signup-team__container"> + <img class="signup-team-logo" src="/static/images/logo.png" /> + <div id="claim"></div> + </div> + </div> + <div class="footer-push"></div> + </div> + <div class="row footer"> + {{template "footer" . }} + </div> + <div> </div> <script> window.setup_claim_account_page({{ .Props }}); diff --git a/web/templates/docs.html b/web/templates/docs.html index 0e0f51648..1a20580fb 100644 --- a/web/templates/docs.html +++ b/web/templates/docs.html @@ -6,6 +6,9 @@ <div class="container-fluid"> <div class="inner__wrap"> <div class="row content"> + <div class="signup-header"> + <a href="/">{{ .ClientCfg.SiteName }}</a> + </div> <div class="col-sm-12"> <div class="docs__page" id="docs"></div> </div> diff --git a/web/templates/find_team.html b/web/templates/find_team.html index 9acf3ac64..d32ea0dc8 100644 --- a/web/templates/find_team.html +++ b/web/templates/find_team.html @@ -6,6 +6,9 @@ <div class="container-fluid"> <div class="inner__wrap"> <div class="row content"> + <div class="signup-header"> + <a href="/">{{ .ClientCfg.SiteName }}</a> + </div> <div class="col-sm-12"> <div class="signup-team__container"> <img class="signup-team-logo" src="/static/images/logo.png" /> diff --git a/web/templates/login.html b/web/templates/login.html index f6a551220..be5e6bf4f 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -7,7 +7,7 @@ <div class="inner__wrap"> <div class="row content"> <div class="signup-header"> - {{.Props.TeamDisplayName}} + <a href="/">{{ .ClientCfg.SiteName }}</a> </div> <div class="col-sm-12"> <div id="login"></div> diff --git a/web/templates/password_reset.html b/web/templates/password_reset.html index 7f6335c92..df82285ef 100644 --- a/web/templates/password_reset.html +++ b/web/templates/password_reset.html @@ -5,7 +5,21 @@ <body class="white"> <div class="container-fluid"> <div class="inner__wrap"> - <div class="row content" id="reset"></div> + <div class="row content"> + <div class="signup-header"> + <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a> + </div> + <div class="col-sm-12"> + <div class="signup-team__container"> + <img class="signup-team-logo" src="/static/images/logo.png" /> + <div id="reset"></div> + </div> + </div> + <div class="footer-push"></div> + </div> + <div class="row footer"> + {{template "footer" . }} + </div> </div> </div> <script> diff --git a/web/templates/verify.html b/web/templates/verify.html index a49ba7930..bab329c7d 100644 --- a/web/templates/verify.html +++ b/web/templates/verify.html @@ -6,7 +6,16 @@ <div class="container-fluid"> <div class="inner__wrap"> <div class="row content"> - <div id="verify"></div> + <div class="signup-header"> + <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a> + </div> + <div class="col-sm-12"> + <div class="signup-team__container"> + <img class="signup-team-logo" src="/static/images/logo.png" /> + <div id="verify"></div> + </div> + </div> + <div class="footer-push"></div> </div> <div class="row footer"> {{template "footer" . }} diff --git a/web/templates/welcome.html b/web/templates/welcome.html deleted file mode 100644 index 15c072226..000000000 --- a/web/templates/welcome.html +++ /dev/null @@ -1,37 +0,0 @@ -{{define "welcome"}} -<!DOCTYPE html> -<html> -{{template "head" . }} -<body> - <div class="container-fluid"> - <div class="inner__wrap"> - <div class="row header"> - <div id="navbar"></div> - </div> - <div class="row main"> - <div class="app__content"> - <div class="welcome-info"> - <h1>Welcome to {{ .ClientCfg.SiteName }}!</h1> - <p> - You do not appear to be part of any teams. Please contact your - administrator to have him send you an invitation to a private team. - Or you can start a new private team. - </p> - <div class="alert alert-warning"> - If you where invited to a team that you do not see you must - confirm your email address first before gaining access to the - team. - </div> - <div id="new_channel"> - </div> - </div> - </div> - </div> - </div> - </div> - <script> - window.setup_welcome_page(); - </script> -</body> -</html> -{{end}} |