feat: assign messengers to list roles

Author: dragonwocky

cmd/roles.go

@@ -182,6 +182,11 @@ func (a *App) validateListRole(r auth.ListRole) error {
 	if !strHasLen(r.Name.String, 1, stdInputMaxLen) {
 		return echo.NewHTTPError(http.StatusBadRequest, a.i18n.Ts("globals.messages.invalidFields", "name", "name"))
 	}
+	for _, p := range r.Messengers {
+		if !strHasLen(p, 1, stdInputMaxLen) {
+			return echo.NewHTTPError(http.StatusBadRequest, a.i18n.Ts("globals.messages.invalidFields", "name", fmt.Sprintf("messenger: %s", p)))
+		}
+	}
 
 	for _, l := range r.Lists {
 		for _, p := range l.Permissions {

frontend/src/views/RoleForm.vue

@@ -72,6 +72,12 @@
               </a>
             </b-table-column>
           </b-table>
+
+          <b-table :data="allMessengers" :checked-rows.sync="form.messengers" checkbox-position="right" checkable>
+            <b-table-column v-slot="props" field="id" :label="$t('globals.terms.messengers')">
+              {{ props.row.id }}
+            </b-table-column>
+          </b-table>
         </div>
 
         <template v-if="type === 'user'">
@@ -142,8 +148,10 @@ export default Vue.extend({
         curList: null,
         lists: [],
         name: null,
+        messengers: [],
         permissions: {},
       },
+      allMessengers: [],
       hasToggle: false,
       disabled: false,
     };
@@ -195,6 +203,7 @@ export default Vue.extend({
         form.permissions = this.form.permissions;
       } else {
         fn = this.$api.createListRole;
+        form.messengers = this.form.messengers.map(({ id }) => id);
         form.lists = this.form.lists.reduce((acc, item) => {
           acc.push({ id: item.id, permissions: item.permissions });
           return acc;
@@ -217,6 +226,7 @@ export default Vue.extend({
         form.permissions = this.form.permissions;
       } else {
         fn = this.$api.updateListRole;
+        form.messengers = this.form.messengers.map(({ id }) => id);
         form.lists = this.form.lists.reduce((acc, item) => {
           acc.push({ id: item.id, permissions: item.permissions });
           return acc;
@@ -247,8 +257,14 @@ export default Vue.extend({
   },
 
   mounted() {
+    this.allMessengers.push(...this.serverConfig.messengers.map((id) => ({ id })));
     if (this.isEditing) {
       this.form = { ...this.form, ...this.$props.data };
+      this.form.messengers = [...this.allMessengers];
+      if (this.$props.data.messengers !== null) {
+        this.form.messengers = this.form.messengers
+          .filter(({ id }) => this.$props.data.messengers.includes(id));
+      }
 
       // It's the superadmin role. Disable the form.
       if (this.$props.data.id === 1 || !this.$can('roles:manage')) {
@@ -264,6 +280,7 @@ export default Vue.extend({
         'campaigns:get_all',
         'campaigns:manage_all',
       ];
+      this.form.messengers = [...this.allMessengers];
       this.form.permissions = this.serverConfig.permissions.reduce((acc, item) => {
         if (disabledGroups.includes(item.group)) return acc;
         item.permissions.forEach((p) => {

internal/auth/models.go

@@ -147,7 +147,8 @@ type Role struct {
 type ListRole struct {
 	Base
 
-	Name null.String `db:"name" json:"name"`
+	Name       null.String    `db:"name" json:"name"`
+	Messengers pq.StringArray `db:"permissions" json:"messengers"`
 
 	ListID   null.Int         `db:"list_id" json:"-"`
 	ParentID null.Int         `db:"parent_id" json:"-"`

internal/core/roles.go

@@ -75,7 +75,7 @@ func (c *Core) CreateRole(r auth.Role) (auth.Role, error) {
 func (c *Core) CreateListRole(r auth.ListRole) (auth.ListRole, error) {
 	var out auth.ListRole
 
-	if err := c.q.CreateRole.Get(&out, r.Name, auth.RoleTypeList, pq.Array([]string{})); err != nil {
+	if err := c.q.CreateRole.Get(&out, r.Name, auth.RoleTypeList, pq.Array(r.Messengers)); err != nil {
 		return out, echo.NewHTTPError(http.StatusInternalServerError,
 			c.i18n.Ts("globals.messages.errorCreating", "name", "{users.role}", "error", pqErrMsg(err)))
 	}
@@ -149,7 +149,7 @@ func (c *Core) UpdateUserRole(id int, r auth.Role) (auth.Role, error) {
 func (c *Core) UpdateListRole(id int, r auth.ListRole) (auth.ListRole, error) {
 	var out auth.ListRole
 
-	if err := c.q.UpdateRole.Get(&out, id, r.Name, pq.Array([]string{})); err != nil {
+	if err := c.q.UpdateRole.Get(&out, id, r.Name, pq.Array(r.Messengers)); err != nil {
 		return out, echo.NewHTTPError(http.StatusInternalServerError,
 			c.i18n.Ts("globals.messages.errorUpdating", "name", "{users.listRole}", "error", pqErrMsg(err)))
 	}