Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Userlist fixuserupdate (#1301)

Matt Robertse83d7fc5dc52
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb0c50b6d..455b39044 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: build
on:
release:
- types: [created]
+ types: [published]
push:
branches:
- main
diff --git a/app/services/userlist/userlist.go b/app/services/userlist/userlist.go
index 8e37e120b..8b0020aad 100644
--- a/app/services/userlist/userlist.go
+++ b/app/services/userlist/userlist.go
@@ -112,9 +112,21 @@ func addOrRemoveUserListUser(ctx context.Context, u *cmd.UserListHandleRoleChang
func updateUserListUser(ctx context.Context, u *cmd.UserListUpdateUser) error {
+ dbUser := &query.GetUserByID{
+ UserID: u.Id,
+ }
+ err := bus.Dispatch(ctx, dbUser)
+ if err != nil {
+ return err
+ }
+
+ if dbUser.Result.Role != enum.RoleAdministrator {
+ return nil
+ }
+
user := &UserListUser{
Identifier: strconv.Itoa(u.Id),
- Company: strconv.Itoa(u.TenantId),
+ Company: strconv.Itoa(dbUser.Result.Tenant.ID),
}
if len(u.Email) > 0 {
@@ -127,7 +139,7 @@ func updateUserListUser(ctx context.Context, u *cmd.UserListUpdateUser) error {
}
}
- err := pushUserListUpdate(user, ctx)
+ err = pushUserListUpdate(user, ctx)
if err != nil {
return err
}
diff --git a/app/services/userlist/userlist_test.go b/app/services/userlist/userlist_test.go
index 7875b7c12..d775c9f9c 100644
--- a/app/services/userlist/userlist_test.go
+++ b/app/services/userlist/userlist_test.go
@@ -11,6 +11,7 @@ import (
"github.com/getfider/fider/app/models/cmd"
"github.com/getfider/fider/app/models/entity"
"github.com/getfider/fider/app/models/enum"
+ "github.com/getfider/fider/app/models/query"
"github.com/getfider/fider/app/pkg/bus"
"github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/services/httpclient/httpclientmock"
@@ -202,6 +203,33 @@ func TestUpdateUser_EmailOnly(t *testing.T) {
Expect(containsEmail).IsTrue()
}
+func TestDoNothingIfUserNotAdmin(t *testing.T) {
+ RegisterT(t)
+ env.Config.HostMode = "multi"
+ reset()
+
+ // Change the DB hit to return a visitor
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByID) error {
+ q.Result = &entity.User{
+ ID: 1,
+ Name: "John Doe",
+ Email: "[email protected]",
+ Role: enum.RoleVisitor,
+ }
+ return nil
+ })
+
+ err := bus.Dispatch(ctx, &cmd.UserListUpdateUser{
+ Id: 1,
+ TenantId: 1,
+ Email: "[email protected]",
+ })
+ Expect(err).IsNil()
+
+ Expect(httpclientmock.RequestsHistory).HasLen(0)
+
+}
+
func TestMakeUserAdministrator(t *testing.T) {
RegisterT(t)
env.Config.HostMode = "multi"