Userlist fixuserupdate (#1301)

* published is a better choice than created for releases.

* Fix: Non-admin user updates were creating users erroneously

Author: mattwoberts

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: build
 
 on:
   release:
-    types: [created]
+    types: [published]
   push:
     branches:
       - main

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
 	}

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: "john.doe@example.com",
+			Role:  enum.RoleVisitor,
+		}
+		return nil
+	})
+
+	err := bus.Dispatch(ctx, &cmd.UserListUpdateUser{
+		Id:       1,
+		TenantId: 1,
+		Email:    "Freddy@example.com",
+	})
+	Expect(err).IsNil()
+
+	Expect(httpclientmock.RequestsHistory).HasLen(0)
+
+}
+
 func TestMakeUserAdministrator(t *testing.T) {
 	RegisterT(t)
 	env.Config.HostMode = "multi"