Move admin functions into their own file in the client API

clientapi/routing/admin.go

@@ -0,0 +1,49 @@
+package routing
+
+import (
+	"net/http"
+
+	"github.com/gorilla/mux"
+	"github.com/matrix-org/dendrite/clientapi/jsonerror"
+	"github.com/matrix-org/dendrite/internal/httputil"
+	roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
+	userapi "github.com/matrix-org/dendrite/userapi/api"
+	"github.com/matrix-org/util"
+)
+
+func AdminEvacuateRoom(req *http.Request, device *userapi.Device, rsAPI roomserverAPI.RoomserverInternalAPI) util.JSONResponse {
+	if device.AccountType != userapi.AccountTypeAdmin {
+		return util.JSONResponse{
+			Code: http.StatusForbidden,
+			JSON: jsonerror.Forbidden("This API can only be used by admin users."),
+		}
+	}
+	vars, err := httputil.URLDecodeMapValues(mux.Vars(req))
+	if err != nil {
+		return util.ErrorResponse(err)
+	}
+	roomID, ok := vars["roomID"]
+	if !ok {
+		return util.JSONResponse{
+			Code: http.StatusBadRequest,
+			JSON: jsonerror.MissingArgument("Expecting room ID."),
+		}
+	}
+	res := &roomserverAPI.PerformAdminEvacuateRoomResponse{}
+	rsAPI.PerformAdminEvacuateRoom(
+		req.Context(),
+		&roomserverAPI.PerformAdminEvacuateRoomRequest{
+			RoomID: roomID,
+		},
+		res,
+	)
+	if err := res.Error; err != nil {
+		return err.JSONResponse()
+	}
+	return util.JSONResponse{
+		Code: 200,
+		JSON: map[string]interface{}{
+			"affected": res.Affected,
+		},
+	}
+}

clientapi/routing/routing.go

@@ -122,40 +122,7 @@ func Setup(
 
 	dendriteAdminRouter.Handle("/admin/evacuateRoom/{roomID}",
 		httputil.MakeAuthAPI("admin_evacuate_room", userAPI, func(req *http.Request, device *userapi.Device) util.JSONResponse {
-			if device.AccountType != userapi.AccountTypeAdmin {
+			return AdminEvacuateRoom(req, device, rsAPI)
-				return util.JSONResponse{
-					Code: http.StatusForbidden,
-					JSON: jsonerror.Forbidden("This API can only be used by admin users."),
-				}
-			}
-			vars, err := httputil.URLDecodeMapValues(mux.Vars(req))
-			if err != nil {
-				return util.ErrorResponse(err)
-			}
-			roomID, ok := vars["roomID"]
-			if !ok {
-				return util.JSONResponse{
-					Code: http.StatusBadRequest,
-					JSON: jsonerror.MissingArgument("Expecting room ID."),
-				}
-			}
-			res := &roomserverAPI.PerformAdminEvacuateRoomResponse{}
-			rsAPI.PerformAdminEvacuateRoom(
-				req.Context(),
-				&roomserverAPI.PerformAdminEvacuateRoomRequest{
-					RoomID: roomID,
-				},
-				res,
-			)
-			if err := res.Error; err != nil {
-				return err.JSONResponse()
-			}
-			return util.JSONResponse{
-				Code: 200,
-				JSON: map[string]interface{}{
-					"affected": res.Affected,
-				},
-			}
 		}),
 	).Methods(http.MethodGet, http.MethodOptions)