diff options
author | George Goldberg <george@gberg.me> | 2018-06-05 12:41:03 +0100 |
---|---|---|
committer | Martin Kraft <mkraft@users.noreply.github.com> | 2018-06-05 07:41:03 -0400 |
commit | 0c4078b6b05b4b436c459c4f58faa5302ace8e12 (patch) | |
tree | 031c363a10b730afcb33b36023f925f8993ced02 /model | |
parent | 2c75247c97d0277944975deb9595b5f82a80e91e (diff) | |
download | chat-0c4078b6b05b4b436c459c4f58faa5302ace8e12.tar.gz chat-0c4078b6b05b4b436c459c4f58faa5302ace8e12.tar.bz2 chat-0c4078b6b05b4b436c459c4f58faa5302ace8e12.zip |
MM-9730 & MM-9729: Missing Server PRs (#8908)
* MM-9730: API endpoint to update scheme-derived roles of TeamMembers.
* MM-9729: API to update scheme-derived roles of ChannelMembers.
Diffstat (limited to 'model')
-rw-r--r-- | model/client4.go | 20 | ||||
-rw-r--r-- | model/scheme.go | 16 |
2 files changed, 36 insertions, 0 deletions
diff --git a/model/client4.go b/model/client4.go index c2b6ba948..fb4d1375c 100644 --- a/model/client4.go +++ b/model/client4.go @@ -1320,6 +1320,16 @@ func (c *Client4) UpdateTeamMemberRoles(teamId, userId, newRoles string) (bool, } } +// UpdateTeamMemberSchemeRoles will update the scheme-derived roles on a team for a user. +func (c *Client4) UpdateTeamMemberSchemeRoles(teamId string, userId string, schemeRoles *SchemeRoles) (bool, *Response) { + if r, err := c.DoApiPut(c.GetTeamMemberRoute(teamId, userId)+"/schemeRoles", schemeRoles.ToJson()); err != nil { + return false, BuildErrorResponse(r, err) + } else { + defer closeBody(r) + return CheckStatusOK(r), BuildResponse(r) + } +} + // UpdateTeam will update a team. func (c *Client4) UpdateTeam(team *Team) (*Team, *Response) { if r, err := c.DoApiPut(c.GetTeamRoute(team.Id), team.ToJson()); err != nil { @@ -1849,6 +1859,16 @@ func (c *Client4) UpdateChannelRoles(channelId, userId, roles string) (bool, *Re } } +// UpdateChannelMemberSchemeRoles will update the scheme-derived roles on a channel for a user. +func (c *Client4) UpdateChannelMemberSchemeRoles(channelId string, userId string, schemeRoles *SchemeRoles) (bool, *Response) { + if r, err := c.DoApiPut(c.GetChannelMemberRoute(channelId, userId)+"/schemeRoles", schemeRoles.ToJson()); err != nil { + return false, BuildErrorResponse(r, err) + } else { + defer closeBody(r) + return CheckStatusOK(r), BuildResponse(r) + } +} + // UpdateChannelNotifyProps will update the notification properties on a channel for a user. func (c *Client4) UpdateChannelNotifyProps(channelId, userId string, props map[string]string) (bool, *Response) { if r, err := c.DoApiPut(c.GetChannelMemberRoute(channelId, userId)+"/notify_props", MapToJson(props)); err != nil { diff --git a/model/scheme.go b/model/scheme.go index 959b80c24..2247717eb 100644 --- a/model/scheme.go +++ b/model/scheme.go @@ -69,6 +69,11 @@ func (sc *SchemeConveyor) Scheme() *Scheme { } } +type SchemeRoles struct { + SchemeAdmin bool `json:"scheme_admin"` + SchemeUser bool `json:"scheme_user"` +} + func (scheme *Scheme) ToJson() string { b, _ := json.Marshal(scheme) return string(b) @@ -190,3 +195,14 @@ func IsValidSchemeName(name string) bool { re := regexp.MustCompile(fmt.Sprintf("^[a-z0-9_]{0,%d}$", SCHEME_NAME_MAX_LENGTH)) return re.MatchString(name) } + +func (schemeRoles *SchemeRoles) ToJson() string { + b, _ := json.Marshal(schemeRoles) + return string(b) +} + +func SchemeRolesFromJson(data io.Reader) *SchemeRoles { + var schemeRoles *SchemeRoles + json.NewDecoder(data).Decode(&schemeRoles) + return schemeRoles +} |