From f3fa435a1b35c2ada4cd9a81744a41904fe97909 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 28 Apr 2016 16:29:13 -0400 Subject: Fixing slack import. (#2819) --- api/import.go | 10 +++++----- api/slackimport.go | 25 ++++++++++++++++++++++++- api/team.go | 4 ++-- i18n/en.json | 12 ++++++++++++ webapp/client/client.jsx | 5 ++--- webapp/components/team_import_tab.jsx | 6 +++--- 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/api/import.go b/api/import.go index c39ec5220..59d098d93 100644 --- a/api/import.go +++ b/api/import.go @@ -22,7 +22,7 @@ func ImportPost(post *model.Post) { } } -func ImportUser(teamId string, user *model.User) *model.User { +func ImportUser(team *model.Team, user *model.User) *model.User { user.MakeNonNil() if result := <-Srv.Store.User().Save(user); result.Err != nil { @@ -31,14 +31,14 @@ func ImportUser(teamId string, user *model.User) *model.User { } else { ruser := result.Data.(*model.User) - if err := JoinDefaultChannels(teamId, ruser, ""); err != nil { - l4g.Error(utils.T("api.import.import_user.joining_default.error"), ruser.Id, teamId, err) - } - if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil { l4g.Error(utils.T("api.import.import_user.set_email.error"), cresult.Err) } + if err := JoinUserToTeam(team, user); err != nil { + l4g.Error(utils.T("api.import.import_user.join_team.error"), err) + } + return ruser } } diff --git a/api/slackimport.go b/api/slackimport.go index 4319fe409..df43e1a8b 100644 --- a/api/slackimport.go +++ b/api/slackimport.go @@ -99,6 +99,16 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map log.WriteString("===============\r\n\r\n") addedUsers := make(map[string]*model.User) + + // Need the team + var team *model.Team + if result := <-Srv.Store.Team().Get(teamId); result.Err != nil { + log.WriteString(utils.T("api.slackimport.slack_import.team_fail")) + return addedUsers + } else { + team = result.Data.(*model.Team) + } + for _, sUser := range slackusers { firstName := "" lastName := "" @@ -119,7 +129,7 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map Password: password, } - if mUser := ImportUser(teamId, &newUser); mUser != nil { + if mUser := ImportUser(team, &newUser); mUser != nil { addedUsers[sUser.Id] = mUser log.WriteString(utils.T("api.slackimport.slack_add_users.email_pwd", map[string]interface{}{"Email": newUser.Email, "Password": password})) } else { @@ -173,6 +183,18 @@ func SlackAddPosts(channel *model.Channel, posts []SlackPost, users map[string]* } } +func addSlackUsersToChannel(members []string, users map[string]*model.User, channel *model.Channel, log *bytes.Buffer) { + for _, member := range members { + if user, ok := users[member]; !ok { + log.WriteString(utils.T("api.slackimport.slack_add_channels.failed_to_add_user", map[string]interface{}{"Username": "?"})) + } else { + if _, err := AddUserToChannel(user, channel); err != nil { + log.WriteString(utils.T("api.slackimport.slack_add_channels.failed_to_add_user", map[string]interface{}{"Username": user.Username})) + } + } + } +} + func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[string][]SlackPost, users map[string]*model.User, log *bytes.Buffer) map[string]*model.Channel { // Write Header log.WriteString(utils.T("api.slackimport.slack_add_channels.added")) @@ -199,6 +221,7 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str log.WriteString(utils.T("api.slackimport.slack_add_channels.merge", map[string]interface{}{"DisplayName": newChannel.DisplayName})) } } + addSlackUsersToChannel(sChannel.Members, users, mChannel, log) log.WriteString(newChannel.DisplayName + "\r\n") addedChannels[sChannel.Id] = mChannel SlackAddPosts(mChannel, posts[sChannel.Name], users) diff --git a/api/team.go b/api/team.go index eefdc3d85..6db8bc245 100644 --- a/api/team.go +++ b/api/team.go @@ -40,8 +40,8 @@ func InitTeam() { BaseRoutes.NeedTeam.Handle("/add_user_to_team", ApiUserRequired(addUserToTeam)).Methods("POST") // These should be moved to the global admain console - BaseRoutes.Teams.Handle("/import_team", ApiUserRequired(importTeam)).Methods("POST") - BaseRoutes.Teams.Handle("/export_team", ApiUserRequired(exportTeam)).Methods("GET") + 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") } diff --git a/i18n/en.json b/i18n/en.json index e8e20a12a..5cc2ec9f6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -667,6 +667,10 @@ "id": "api.import.import_user.set_email.error", "translation": "Failed to set email verified err=%v" }, + { + "id": "api.import.import_user.join_team.error", + "translation": "Failed to join team when importing err=%v" + }, { "id": "api.license.add_license.array.app_error", "translation": "Empty array under 'license' in request" @@ -995,6 +999,10 @@ "id": "api.slackimport.slack_add_channels.merge", "translation": "Merged with existing channel: {{.DisplayName}}\r\n" }, + { + "id": "api.slackimport.slack_add_channels.failed_to_add_user", + "translation": "Failed to add user to channel: {{.Username}}\r\n" + }, { "id": "api.slackimport.slack_add_posts.bot.warn", "translation": "Slack bot posts are not imported yet" @@ -1035,6 +1043,10 @@ "id": "api.slackimport.slack_import.log", "translation": "Mattermost Slack Import Log\r\n" }, + { + "id": "api.slackimport.slack_import.team_fail", + "translation": "Failed to get team to import into.\r\n" + }, { "id": "api.slackimport.slack_import.note1", "translation": "- Some posts may not have been imported because they where not supported by this importer.\r\n" diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index 53a514082..6a7c5de40 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -348,10 +348,9 @@ export default class Client { importSlack = (fileData, success, error) => { request. - post(`${this.getTeamsRoute()}/import_team`). + post(`${this.getTeamNeededRoute()}/import_team`). set(this.defaultHeaders). - type('application/json'). - accept('application/json'). + accept('application/octet-stream'). send(fileData). end(this.handleResponse.bind(this, 'importSlack', success, error)); } diff --git a/webapp/components/team_import_tab.jsx b/webapp/components/team_import_tab.jsx index 03d35bb3f..782273c5a 100644 --- a/webapp/components/team_import_tab.jsx +++ b/webapp/components/team_import_tab.jsx @@ -33,8 +33,8 @@ class TeamImportTab extends React.Component { this.setState({status: 'fail', link: ''}); } - onImportSuccess(data) { - this.setState({status: 'done', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(data)}); + onImportSuccess(data, res) { + this.setState({status: 'done', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(res.text)}); } doImportSlack(file) { @@ -167,4 +167,4 @@ TeamImportTab.propTypes = { intl: intlShape.isRequired }; -export default injectIntl(TeamImportTab); \ No newline at end of file +export default injectIntl(TeamImportTab); -- cgit v1.2.3-1-g7c22