diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-01-19 09:00:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-19 09:00:13 -0500 |
commit | d3a285e64d051aa8d5c4c9854597dfbcce107675 (patch) | |
tree | e16ca3d52b6347a754e506aa8cac7457c62d3639 /cmd/platform/oldcommands.go | |
parent | 61b7226533568f3261fc233538ce998bb71a5345 (diff) | |
download | chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.tar.gz chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.tar.bz2 chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.zip |
Migrate functions to app package (#5106)
* Refactor and move session logic into app package
* Refactor email functions into the app package
* Refactor password update into app package
* Migrate user functions to app package
* Move team functions into app package
* Migrate channel functions into app package
* Pass SiteURL through to app functions
* Update based on feedback
Diffstat (limited to 'cmd/platform/oldcommands.go')
-rw-r--r-- | cmd/platform/oldcommands.go | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cmd/platform/oldcommands.go b/cmd/platform/oldcommands.go index faf086cb7..1ff65130c 100644 --- a/cmd/platform/oldcommands.go +++ b/cmd/platform/oldcommands.go @@ -319,8 +319,7 @@ func cmdInviteUser() { } invites := []string{flagEmail} - c := getMockContext() - api.InviteMembers(team, user.GetDisplayName(), invites, c.GetSiteURL()) + app.SendInviteEmails(team, user.GetDisplayName(), invites, *utils.Cfg.ServiceSettings.SiteURL) os.Exit(0) } @@ -369,7 +368,7 @@ func cmdAssignRole() { } if !user.IsInRole(flagRole) { - api.UpdateUserRoles(user, flagRole) + app.UpdateUserRoles(user.Id, flagRole) } os.Exit(0) @@ -547,7 +546,7 @@ func cmdLeaveChannel() { channel = result.Data.(*model.Channel) } - err := api.RemoveUserFromChannel(user.Id, user.Id, channel) + err := app.RemoveUserFromChannel(user.Id, user.Id, channel) if err != nil { l4g.Error("%v", err) flushLogAndExit(1) @@ -712,7 +711,7 @@ func cmdLeaveTeam() { user = result.Data.(*model.User) } - err := api.LeaveTeam(team, user) + err := app.LeaveTeam(team, user) if err != nil { l4g.Error("%v", err) @@ -823,7 +822,7 @@ func cmdPermDeleteUser() { flushLogAndExit(1) } - if err := api.PermanentDeleteUser(user); err != nil { + if err := app.PermanentDeleteUser(user); err != nil { l4g.Error("%v", err) flushLogAndExit(1) } else { @@ -866,7 +865,7 @@ func cmdPermDeleteTeam() { flushLogAndExit(1) } - if err := api.PermanentDeleteTeam(team); err != nil { + if err := app.PermanentDeleteTeam(team); err != nil { l4g.Error("%v", err) flushLogAndExit(1) } else { @@ -896,7 +895,7 @@ func cmdPermDeleteAllUsers() { flushLogAndExit(1) } - if err := api.PermanentDeleteAllUsers(); err != nil { + if err := app.PermanentDeleteAllUsers(); err != nil { l4g.Error("%v", err) flushLogAndExit(1) } else { @@ -1033,7 +1032,7 @@ func cmdActivateUser() { l4g.Error("%v", utils.T("api.user.update_active.no_deactivate_ldap.app_error")) } - if _, err := api.UpdateActive(user, !flagUserSetInactive); err != nil { + if _, err := app.UpdateActive(user, !flagUserSetInactive); err != nil { l4g.Error("%v", err) } |