Merge branch 'release-3.0'

2 files changed, 4 insertions, 21 deletions

diff --git a/api/admin.go b/api/admin.go
index 7ab2c9cfc..8f66f60c1 100644
--- a/api/admin.go
+++ b/api/admin.go
@@ -33,7 +33,7 @@ func InitAdmin() {
 	BaseRoutes.Admin.Handle("/analytics/{name:[A-Za-z0-9_]+}", ApiUserRequired(getAnalytics)).Methods("GET")
 	BaseRoutes.Admin.Handle("/save_compliance_report", ApiUserRequired(saveComplianceReport)).Methods("POST")
 	BaseRoutes.Admin.Handle("/compliance_reports", ApiUserRequired(getComplianceReports)).Methods("GET")
-	BaseRoutes.Admin.Handle("/download_compliance_report/{id:[A-Za-z0-9]+}", ApiUserRequired(downloadComplianceReport)).Methods("GET")
+	BaseRoutes.Admin.Handle("/download_compliance_report/{id:[A-Za-z0-9]+}", ApiUserRequiredTrustRequester(downloadComplianceReport)).Methods("GET")
 	BaseRoutes.Admin.Handle("/upload_brand_image", ApiAdminSystemRequired(uploadBrandImage)).Methods("POST")
 	BaseRoutes.Admin.Handle("/get_brand_image", ApiAppHandlerTrustRequester(getBrandImage)).Methods("GET")
 	BaseRoutes.Admin.Handle("/reset_mfa", ApiAdminSystemRequired(adminResetMfa)).Methods("POST")
diff --git a/api/team.go b/api/team.go
index 6db8bc245..f9b718e06 100644
--- a/api/team.go
+++ b/api/team.go
@@ -41,7 +41,6 @@ func InitTeam() {
 
 	// These should be moved to the global admain console
 	BaseRoutes.NeedTeam.Handle("/import_team", ApiUserRequired(importTeam)).Methods("POST")
-	BaseRoutes.NeedTeam.Handle("/export_team", ApiUserRequired(exportTeam)).Methods("GET")
 	BaseRoutes.Teams.Handle("/add_user_to_team_from_invite", ApiUserRequired(addUserToTeamFromInvite)).Methods("POST")
 }
 
@@ -275,6 +274,9 @@ func JoinUserToTeam(team *model.Team, user *model.User) *model.AppError {
 	RemoveAllSessionsForUserId(user.Id)
 	InvalidateCacheForUser(user.Id)
 
+	// This message goes to every channel, so the channelId is irrelevant
+	PublishAndForget(model.NewMessage("", "", user.Id, model.ACTION_NEW_USER))
+
 	return nil
 }
 
@@ -750,25 +752,6 @@ func importTeam(c *Context, w http.ResponseWriter, r *http.Request) {
 	http.ServeContent(w, r, "MattermostImportLog.txt", time.Now(), bytes.NewReader(log.Bytes()))
 }
 
-func exportTeam(c *Context, w http.ResponseWriter, r *http.Request) {
-	if !c.HasPermissionsToTeam(c.TeamId, "export") || !c.IsTeamAdmin() {
-		c.Err = model.NewLocAppError("exportTeam", "api.team.export_team.admin.app_error", nil, "userId="+c.Session.UserId)
-		c.Err.StatusCode = http.StatusForbidden
-		return
-	}
-
-	options := ExportOptionsFromJson(r.Body)
-
-	if link, err := ExportToFile(options); err != nil {
-		c.Err = err
-		return
-	} else {
-		result := map[string]string{}
-		result["link"] = link
-		w.Write([]byte(model.MapToJson(result)))
-	}
-}
-
 func getInviteInfo(c *Context, w http.ResponseWriter, r *http.Request) {
 	m := model.MapFromJson(r.Body)
 	inviteId := m["invite_id"]