From a7acfa5546e626735f4bb7200b73af1d36792fc7 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Mon, 22 May 2017 19:28:26 +0100 Subject: [PATCH] Fix build after #114 --- .../matrix-org/dendrite/clientapi/routing/routing.go | 4 ++-- .../matrix-org/dendrite/clientapi/writers/register.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go b/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go index 0e04dba8..a1921c0c 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go +++ b/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go @@ -19,7 +19,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/matrix-org/dendrite/clientapi/auth/storage" + "github.com/matrix-org/dendrite/clientapi/auth/storage/accounts" "github.com/matrix-org/dendrite/clientapi/config" "github.com/matrix-org/dendrite/clientapi/producers" "github.com/matrix-org/dendrite/clientapi/readers" @@ -33,7 +33,7 @@ const pathPrefixR0 = "/_matrix/client/r0" // Setup registers HTTP handlers with the given ServeMux. It also supplies the given http.Client // to clients which need to make outbound HTTP requests. -func Setup(servMux *http.ServeMux, httpClient *http.Client, cfg config.ClientAPI, producer *producers.RoomserverProducer, queryAPI api.RoomserverQueryAPI, accountDB *storage.AccountDatabase) { +func Setup(servMux *http.ServeMux, httpClient *http.Client, cfg config.ClientAPI, producer *producers.RoomserverProducer, queryAPI api.RoomserverQueryAPI, accountDB *accounts.Database) { apiMux := mux.NewRouter() r0mux := apiMux.PathPrefix(pathPrefixR0).Subrouter() r0mux.Handle("/createRoom", diff --git a/src/github.com/matrix-org/dendrite/clientapi/writers/register.go b/src/github.com/matrix-org/dendrite/clientapi/writers/register.go index c2a9760b..753fb1a0 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/writers/register.go +++ b/src/github.com/matrix-org/dendrite/clientapi/writers/register.go @@ -5,7 +5,7 @@ import ( "net/http" log "github.com/Sirupsen/logrus" - "github.com/matrix-org/dendrite/clientapi/auth/storage" + "github.com/matrix-org/dendrite/clientapi/auth/storage/accounts" "github.com/matrix-org/dendrite/clientapi/auth/types" "github.com/matrix-org/dendrite/clientapi/httputil" "github.com/matrix-org/dendrite/clientapi/jsonerror" @@ -90,7 +90,7 @@ func (r *registerRequest) Validate() *util.JSONResponse { } // Register processes a /register request. http://matrix.org/speculator/spec/HEAD/client_server/unstable.html#post-matrix-client-unstable-register -func Register(req *http.Request, accountDB *storage.AccountDatabase) util.JSONResponse { +func Register(req *http.Request, accountDB *accounts.Database) util.JSONResponse { var r registerRequest resErr := httputil.UnmarshalJSONRequest(req, &r) if resErr != nil { @@ -140,7 +140,7 @@ func Register(req *http.Request, accountDB *storage.AccountDatabase) util.JSONRe } } -func completeRegistration(accountDB *storage.AccountDatabase, username, password string) util.JSONResponse { +func completeRegistration(accountDB *accounts.Database, username, password string) util.JSONResponse { acc, err := accountDB.CreateAccount(username, password) if err != nil { return util.JSONResponse{