summaryrefslogtreecommitdiffstats
path: root/cmd/platform
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-10-31 12:00:21 -0400
committerGeorge Goldberg <george@gberg.me>2017-10-31 16:00:21 +0000
commit06ec648cf30e3968c0fdb2514c8d59dff97c757c (patch)
treec801a9bbbdeca6704b91d5d093cb937db5cd9d00 /cmd/platform
parent6886de04d4215ea45ae535b64a604a79292bff77 (diff)
downloadchat-06ec648cf30e3968c0fdb2514c8d59dff97c757c.tar.gz
chat-06ec648cf30e3968c0fdb2514c8d59dff97c757c.tar.bz2
chat-06ec648cf30e3968c0fdb2514c8d59dff97c757c.zip
PLT-7978 Add websocket event for user role update (#7745)
* Add websocket event for user role update * Fix tests * More test fixes
Diffstat (limited to 'cmd/platform')
-rw-r--r--cmd/platform/roles.go4
-rw-r--r--cmd/platform/user.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/platform/roles.go b/cmd/platform/roles.go
index 7939dc5c7..e7a1c1a0e 100644
--- a/cmd/platform/roles.go
+++ b/cmd/platform/roles.go
@@ -52,7 +52,7 @@ func makeSystemAdminCmdF(cmd *cobra.Command, args []string) error {
return errors.New("Unable to find user '" + args[i] + "'")
}
- if _, err := a.UpdateUserRoles(user.Id, "system_admin system_user"); err != nil {
+ if _, err := a.UpdateUserRoles(user.Id, "system_admin system_user", true); err != nil {
return err
}
}
@@ -76,7 +76,7 @@ func makeMemberCmdF(cmd *cobra.Command, args []string) error {
return errors.New("Unable to find user '" + args[i] + "'")
}
- if _, err := a.UpdateUserRoles(user.Id, "system_user"); err != nil {
+ if _, err := a.UpdateUserRoles(user.Id, "system_user", true); err != nil {
return err
}
}
diff --git a/cmd/platform/user.go b/cmd/platform/user.go
index 66b0f2223..ea654f89f 100644
--- a/cmd/platform/user.go
+++ b/cmd/platform/user.go
@@ -246,7 +246,7 @@ func userCreateCmdF(cmd *cobra.Command, args []string) error {
if ruser, err := a.CreateUser(user); err != nil {
return errors.New("Unable to create user. Error: " + err.Error())
} else if systemAdmin {
- a.UpdateUserRoles(ruser.Id, "system_user system_admin")
+ a.UpdateUserRoles(ruser.Id, "system_user system_admin", false)
}
CommandPrettyPrintln("Created User")