Remove PerformError from EvacuateUser

clientapi/routing/admin.go

@@ -40,7 +40,7 @@ func AdminEvacuateRoom(req *http.Request, rsAPI roomserverAPI.ClientRoomserverAP
 		}
 	default:
 		logrus.WithError(err).WithField("roomID", vars["roomID"]).Error("Failed to evacuate room")
-		return jsonerror.InternalServerError()
+		return util.ErrorResponse(err)
 	}
 	return util.JSONResponse{
 		Code: 200,
@@ -50,40 +50,22 @@ func AdminEvacuateRoom(req *http.Request, rsAPI roomserverAPI.ClientRoomserverAP
 	}
 }
 
-func AdminEvacuateUser(req *http.Request, cfg *config.ClientAPI, rsAPI roomserverAPI.ClientRoomserverAPI) util.JSONResponse {
+func AdminEvacuateUser(req *http.Request, rsAPI roomserverAPI.ClientRoomserverAPI) util.JSONResponse {
 	vars, err := httputil.URLDecodeMapValues(mux.Vars(req))
 	if err != nil {
 		return util.ErrorResponse(err)
 	}
-	userID := vars["userID"]
 
-	_, domain, err := gomatrixserverlib.SplitID('@', userID)
+	affected, err := rsAPI.PerformAdminEvacuateUser(req.Context(), vars["userID"])
 	if err != nil {
-		return util.MessageResponse(http.StatusBadRequest, err.Error())
+		logrus.WithError(err).WithField("userID", vars["userID"]).Error("Failed to evacuate user")
-	}
+		return util.ErrorResponse(err)
-	if !cfg.Matrix.IsLocalServerName(domain) {
-		return util.JSONResponse{
-			Code: http.StatusBadRequest,
-			JSON: jsonerror.MissingArgument("User ID must belong to this server."),
-		}
-	}
-	res := &roomserverAPI.PerformAdminEvacuateUserResponse{}
-	if err := rsAPI.PerformAdminEvacuateUser(
-		req.Context(),
-		&roomserverAPI.PerformAdminEvacuateUserRequest{
-			UserID: userID,
-		},
-		res,
-	); err != nil {
-		return jsonerror.InternalAPIError(req.Context(), err)
-	}
-	if err := res.Error; err != nil {
-		return err.JSONResponse()
 	}
+
 	return util.JSONResponse{
 		Code: 200,
 		JSON: map[string]interface{}{
-			"affected": res.Affected,
+			"affected": affected,
 		},
 	}
 }

clientapi/routing/routing.go

@@ -162,7 +162,7 @@ func Setup(
 
 	dendriteAdminRouter.Handle("/admin/evacuateUser/{userID}",
 		httputil.MakeAdminAPI("admin_evacuate_user", userAPI, func(req *http.Request, device *userapi.Device) util.JSONResponse {
-			return AdminEvacuateUser(req, cfg, rsAPI)
+			return AdminEvacuateUser(req, rsAPI)
 		}),
 	).Methods(http.MethodPost, http.MethodOptions)
 

roomserver/api/api.go

@@ -152,7 +152,7 @@ type ClientRoomserverAPI interface {
 	// PerformRoomUpgrade upgrades a room to a newer version
 	PerformRoomUpgrade(ctx context.Context, req *PerformRoomUpgradeRequest, resp *PerformRoomUpgradeResponse) error
 	PerformAdminEvacuateRoom(ctx context.Context, roomID string) (affected []string, err error)
-	PerformAdminEvacuateUser(ctx context.Context, req *PerformAdminEvacuateUserRequest, res *PerformAdminEvacuateUserResponse) error
+	PerformAdminEvacuateUser(ctx context.Context, userID string) (affected []string, err error)
 	PerformAdminPurgeRoom(ctx context.Context, req *PerformAdminPurgeRoomRequest, res *PerformAdminPurgeRoomResponse) error
 	PerformAdminDownloadState(ctx context.Context, req *PerformAdminDownloadStateRequest, res *PerformAdminDownloadStateResponse) error
 	PerformPeek(ctx context.Context, req *PerformPeekRequest, res *PerformPeekResponse) error
@@ -172,7 +172,7 @@ type UserRoomserverAPI interface {
 	KeyserverRoomserverAPI
 	QueryCurrentState(ctx context.Context, req *QueryCurrentStateRequest, res *QueryCurrentStateResponse) error
 	QueryMembershipsForRoom(ctx context.Context, req *QueryMembershipsForRoomRequest, res *QueryMembershipsForRoomResponse) error
-	PerformAdminEvacuateUser(ctx context.Context, req *PerformAdminEvacuateUserRequest, res *PerformAdminEvacuateUserResponse) error
+	PerformAdminEvacuateUser(ctx context.Context, userID string) (affected []string, err error)
 	PerformJoin(ctx context.Context, req *PerformJoinRequest, res *PerformJoinResponse) error
 }
 

roomserver/internal/perform/perform_admin.go

@@ -141,70 +141,47 @@ func (r *Admin) PerformAdminEvacuateRoom(
 
 func (r *Admin) PerformAdminEvacuateUser(
 	ctx context.Context,
-	req *api.PerformAdminEvacuateUserRequest,
+	userID string,
-	res *api.PerformAdminEvacuateUserResponse,
+) (affected []string, err error) {
-) error {
+	_, domain, err := gomatrixserverlib.SplitID('@', userID)
-	_, domain, err := gomatrixserverlib.SplitID('@', req.UserID)
 	if err != nil {
-		res.Error = &api.PerformError{
+		return nil, err
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("Malformed user ID: %s", err),
-		}
-		return nil
 	}
 	if !r.Cfg.Matrix.IsLocalServerName(domain) {
-		res.Error = &api.PerformError{
+		return nil, fmt.Errorf("can only evacuate local users using this endpoint")
-			Code: api.PerformErrorBadRequest,
-			Msg:  "Can only evacuate local users using this endpoint",
-		}
-		return nil
 	}
 
-	roomIDs, err := r.DB.GetRoomsByMembership(ctx, req.UserID, spec.Join)
+	roomIDs, err := r.DB.GetRoomsByMembership(ctx, userID, spec.Join)
+	if err != nil {
+		return nil, err
+	}
+
+	inviteRoomIDs, err := r.DB.GetRoomsByMembership(ctx, userID, spec.Invite)
 	if err != nil && err != sql.ErrNoRows {
-		res.Error = &api.PerformError{
+		return nil, err
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("r.DB.GetRoomsByMembership: %s", err),
-		}
-		return nil
 	}
 
-	inviteRoomIDs, err := r.DB.GetRoomsByMembership(ctx, req.UserID, spec.Invite)
+	allRooms := append(roomIDs, inviteRoomIDs...)
-	if err != nil && err != sql.ErrNoRows {
+	affected = make([]string, 0, len(allRooms))
-		res.Error = &api.PerformError{
+	for _, roomID := range allRooms {
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("r.DB.GetRoomsByMembership: %s", err),
-		}
-		return nil
-	}
-
-	for _, roomID := range append(roomIDs, inviteRoomIDs...) {
 		leaveReq := &api.PerformLeaveRequest{
 			RoomID: roomID,
-			UserID: req.UserID,
+			UserID: userID,
 		}
 		leaveRes := &api.PerformLeaveResponse{}
 		outputEvents, err := r.Leaver.PerformLeave(ctx, leaveReq, leaveRes)
 		if err != nil {
-			res.Error = &api.PerformError{
+			return nil, err
-				Code: api.PerformErrorBadRequest,
-				Msg:  fmt.Sprintf("r.Leaver.PerformLeave: %s", err),
-			}
-			return nil
 		}
-		res.Affected = append(res.Affected, roomID)
+		affected = append(affected, roomID)
 		if len(outputEvents) == 0 {
 			continue
 		}
 		if err := r.Inputer.OutputProducer.ProduceRoomEvents(roomID, outputEvents); err != nil {
-			res.Error = &api.PerformError{
+			return nil, err
-				Code: api.PerformErrorBadRequest,
-				Msg:  fmt.Sprintf("r.Inputer.WriteOutputEvents: %s", err),
-			}
-			return nil
 		}
 	}
-	return nil
+	return affected, nil
 }
 
 func (r *Admin) PerformAdminPurgeRoom(

userapi/internal/user_api.go

@@ -624,15 +624,10 @@ func (a *UserInternalAPI) PerformAccountDeactivation(ctx context.Context, req *a
 		return fmt.Errorf("server name %q not locally configured", serverName)
 	}
 
-	evacuateReq := &rsapi.PerformAdminEvacuateUserRequest{
+	userID := fmt.Sprintf("@%s:%s", req.Localpart, serverName)
-		UserID: fmt.Sprintf("@%s:%s", req.Localpart, serverName),
+	_, err := a.RSAPI.PerformAdminEvacuateUser(ctx, userID)
-	}
+	if err != nil {
-	evacuateRes := &rsapi.PerformAdminEvacuateUserResponse{}
+		logrus.WithError(err).WithField("userID", userID).Errorf("Failed to evacuate user after account deactivation")
-	if err := a.RSAPI.PerformAdminEvacuateUser(ctx, evacuateReq, evacuateRes); err != nil {
-		return err
-	}
-	if err := evacuateRes.Error; err != nil {
-		logrus.WithError(err).Errorf("Failed to evacuate user after account deactivation")
 	}
 
 	deviceReq := &api.PerformDeviceDeletionRequest{
@@ -650,7 +645,7 @@ func (a *UserInternalAPI) PerformAccountDeactivation(ctx context.Context, req *a
 		return err
 	}
 
-	err := a.DB.DeactivateAccount(ctx, req.Localpart, serverName)
+	err = a.DB.DeactivateAccount(ctx, req.Localpart, serverName)
 	res.AccountDeactivated = err == nil
 	return err
 }