Remove public appservice routes
MODIFY
appservice/appservice.go
appservice/appservice.go
@@ -26,7 +26,6 @@ import (
"github.com/matrix-org/dendrite/appservice/consumers"
"github.com/matrix-org/dendrite/appservice/inthttp"
"github.com/matrix-org/dendrite/appservice/query"
- "github.com/matrix-org/dendrite/appservice/routing"
"github.com/matrix-org/dendrite/appservice/storage"
"github.com/matrix-org/dendrite/appservice/types"
"github.com/matrix-org/dendrite/appservice/workers"
@@ -35,22 +34,10 @@ import (
"github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/internal/basecomponent"
"github.com/matrix-org/dendrite/internal/config"
- "github.com/matrix-org/dendrite/internal/transactions"
roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
- "github.com/matrix-org/gomatrixserverlib"
"github.com/sirupsen/logrus"
)
-// AddPublicRoutes registers HTTP handlers for CS API calls
-func AddPublicRoutes(router *mux.Router, cfg *config.Dendrite, rsAPI roomserverAPI.RoomserverInternalAPI,
- accountsDB accounts.Database, federation *gomatrixserverlib.FederationClient, txnCache *transactions.Cache) {
-
- routing.Setup(
- router, cfg, rsAPI,
- accountsDB, federation, txnCache,
- )
-}
-
// AddInternalRoutes registers HTTP handlers for internal API calls
func AddInternalRoutes(router *mux.Router, queryAPI appserviceAPI.AppServiceQueryAPI) {
inthttp.AddRoutes(queryAPI, router)

DELETE
appservice/routing/routing.go
-// Copyright 2018 Vector Creations Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package routing
-
-import (
- "net/http"
-
- "github.com/gorilla/mux"
- "github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
- "github.com/matrix-org/dendrite/internal"
- "github.com/matrix-org/dendrite/internal/config"
- "github.com/matrix-org/dendrite/internal/transactions"
- "github.com/matrix-org/dendrite/roomserver/api"
- "github.com/matrix-org/gomatrixserverlib"
- "github.com/matrix-org/util"
-)
-
-const pathPrefixApp = "/app/v1"
-
-// Setup registers HTTP handlers with the given ServeMux. It also supplies the given http.Client
-// to clients which need to make outbound HTTP requests.
-//
-// Due to Setup being used to call many other functions, a gocyclo nolint is
-// applied:
-// nolint: gocyclo
-func Setup(
- apiMux *mux.Router, cfg *config.Dendrite, // nolint: unparam
- rsAPI api.RoomserverInternalAPI, // nolint: unparam
- accountDB accounts.Database, // nolint: unparam
- federation *gomatrixserverlib.FederationClient, // nolint: unparam
- transactionsCache *transactions.Cache, // nolint: unparam
-) {
- appMux := apiMux.PathPrefix(pathPrefixApp).Subrouter()
-
- appMux.Handle("/alias",
- internal.MakeExternalAPI("alias", func(req *http.Request) util.JSONResponse {
- // TODO: Implement
- return util.JSONResponse{
- Code: http.StatusOK,
- JSON: nil,
- }
- }),
- ).Methods(http.MethodGet, http.MethodOptions)
- appMux.Handle("/user",
- internal.MakeExternalAPI("user", func(req *http.Request) util.JSONResponse {
- // TODO: Implement
- return util.JSONResponse{
- Code: http.StatusOK,
- JSON: nil,
- }
- }),
- ).Methods(http.MethodGet, http.MethodOptions)
-}

MODIFY
cmd/dendrite-appservice-server/main.go
cmd/dendrite-appservice-server/main.go
@@ -17,7 +17,6 @@ package main
import (
"github.com/matrix-org/dendrite/appservice"
"github.com/matrix-org/dendrite/internal/basecomponent"
- "github.com/matrix-org/dendrite/internal/transactions"
)
func main() {
@@ -27,13 +26,10 @@ func main() {
defer base.Close() // nolint: errcheck
accountDB := base.CreateAccountsDB()
deviceDB := base.CreateDeviceDB()
- federation := base.CreateFederationClient()
rsAPI := base.RoomserverHTTPClient()
- cache := transactions.New()
intAPI := appservice.NewInternalAPI(base, accountDB, deviceDB, rsAPI)
appservice.AddInternalRoutes(base.InternalAPIMux, intAPI)
- appservice.AddPublicRoutes(base.PublicAPIMux, base.Cfg, rsAPI, accountDB, federation, cache)
base.SetupAndServeHTTP(string(base.Cfg.Bind.AppServiceAPI), string(base.Cfg.Listen.AppServiceAPI))

Remove public appservice routes (#1112)