diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-01-23 08:12:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 08:12:05 -0500 |
| commit | e9c9688b343049c6d461260bd15fff3486238f92 (patch) | |
| tree | a112e51de0e7f9989b173b7dbc4ad89080cc0e34 /model | |
| parent | b064457c745ae6bf27e5e6933a0a7406f3f4921d (diff) | |
| download | chat-e9c9688b343049c6d461260bd15fff3486238f92.tar.gz chat-e9c9688b343049c6d461260bd15fff3486238f92.tar.bz2 chat-e9c9688b343049c6d461260bd15fff3486238f92.zip | |
Move permissions code into app package (#5146)
* Move permissions code into app package
* Revert getPosts permission
Diffstat (limited to 'model')
| -rw-r--r-- | model/authorization.go | 16 | ||||
| -rw-r--r-- | model/team.go | 8 |
2 files changed, 23 insertions, 1 deletions
diff --git a/model/authorization.go b/model/authorization.go index 78d7d3960..56bb58913 100644 --- a/model/authorization.go +++ b/model/authorization.go @@ -27,6 +27,7 @@ var PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS *Permission var PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS *Permission var PERMISSION_ASSIGN_SYSTEM_ADMIN_ROLE *Permission var PERMISSION_MANAGE_ROLES *Permission +var PERMISSION_MANAGE_TEAM_ROLES *Permission var PERMISSION_MANAGE_CHANNEL_ROLES *Permission var PERMISSION_CREATE_DIRECT_CHANNEL *Permission var PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES *Permission @@ -50,6 +51,7 @@ var PERMISSION_EDIT_OTHERS_POSTS *Permission var PERMISSION_DELETE_POST *Permission var PERMISSION_DELETE_OTHERS_POSTS *Permission var PERMISSION_REMOVE_USER_FROM_TEAM *Permission +var PERMISSION_CREATE_TEAM *Permission var PERMISSION_MANAGE_TEAM *Permission var PERMISSION_IMPORT_TEAM *Permission @@ -126,6 +128,11 @@ func InitalizePermissions() { "authentication.permissions.manage_roles.name", "authentication.permissions.manage_roles.description", } + PERMISSION_MANAGE_TEAM_ROLES = &Permission{ + "manage_team_roles", + "authentication.permissions.manage_team_roles.name", + "authentication.permissions.manage_team_roles.description", + } PERMISSION_MANAGE_CHANNEL_ROLES = &Permission{ "manage_channel_roles", "authentication.permissions.manage_channel_roles.name", @@ -246,6 +253,11 @@ func InitalizePermissions() { "authentication.permissions.remove_user_from_team.name", "authentication.permissions.remove_user_from_team.description", } + PERMISSION_CREATE_TEAM = &Permission{ + "create_team", + "authentication.permissions.create_team.name", + "authentication.permissions.create_team.description", + } PERMISSION_MANAGE_TEAM = &Permission{ "manage_team", "authentication.permissions.manage_team.name", @@ -315,7 +327,7 @@ func InitalizeRoles() { PERMISSION_REMOVE_USER_FROM_TEAM.Id, PERMISSION_MANAGE_TEAM.Id, PERMISSION_IMPORT_TEAM.Id, - PERMISSION_MANAGE_ROLES.Id, + PERMISSION_MANAGE_TEAM_ROLES.Id, PERMISSION_MANAGE_CHANNEL_ROLES.Id, PERMISSION_MANAGE_OTHERS_WEBHOOKS.Id, PERMISSION_MANAGE_SLASH_COMMANDS.Id, @@ -350,6 +362,7 @@ func InitalizeRoles() { []string{ PERMISSION_ASSIGN_SYSTEM_ADMIN_ROLE.Id, PERMISSION_MANAGE_SYSTEM.Id, + PERMISSION_MANAGE_ROLES.Id, PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id, PERMISSION_DELETE_PUBLIC_CHANNEL.Id, PERMISSION_CREATE_PUBLIC_CHANNEL.Id, @@ -363,6 +376,7 @@ func InitalizeRoles() { PERMISSION_INVITE_USER.Id, PERMISSION_DELETE_POST.Id, PERMISSION_DELETE_OTHERS_POSTS.Id, + PERMISSION_CREATE_TEAM.Id, }, ROLE_TEAM_USER.Permissions..., ), diff --git a/model/team.go b/model/team.go index 3f05ce83a..195bac571 100644 --- a/model/team.go +++ b/model/team.go @@ -48,6 +48,14 @@ func InvitesFromJson(data io.Reader) *Invites { } } +func (o *Invites) ToEmailList() []string { + emailList := make([]string, len(o.Invites)) + for _, invite := range o.Invites { + emailList = append(emailList, invite["email"]) + } + return emailList +} + func (o *Invites) ToJson() string { b, err := json.Marshal(o) if err != nil { |