diff options
author | Kegsay <kegan@matrix.org> | 2020-06-10 13:28:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-10 13:28:32 +0100 |
commit | 90a0aa9b3e14dc5b6aa8a5be6b38112ec164502b (patch) | |
tree | 6885fc37afbf23c86f9698d0b70489e01f38167b /appservice | |
parent | b7187a9a354530c1846c2a97be701ea484f91c2c (diff) |
Remove public appservice routes (#1112)
Diffstat (limited to 'appservice')
-rw-r--r-- | appservice/appservice.go | 13 | ||||
-rw-r--r-- | appservice/routing/routing.go | 65 |
2 files changed, 0 insertions, 78 deletions
diff --git a/appservice/appservice.go b/appservice/appservice.go index dca600bf..b7adf755 100644 --- a/appservice/appservice.go +++ b/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) diff --git a/appservice/routing/routing.go b/appservice/routing/routing.go deleted file mode 100644 index e5ed7ab4..00000000 --- a/appservice/routing/routing.go +++ /dev/null @@ -1,65 +0,0 @@ -// 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) -} |