From 88227a699ef7a72ea09353327c8258aba3fec7a3 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 17 Jun 2020 17:22:28 +0100
Subject: [PATCH] Linting

---
 clientapi/routing/login.go  | 73 ++++++++++++++++++-------------------
 syncapi/routing/messages.go |  9 ++++-
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/clientapi/routing/login.go b/clientapi/routing/login.go
index f3053d5b..dc0180da 100644
--- a/clientapi/routing/login.go
+++ b/clientapi/routing/login.go
@@ -82,6 +82,7 @@ func Login(
 	} else if req.Method == http.MethodPost {
 		var r passwordRequest
 		var acc *api.Account
+		var errJSON *util.JSONResponse
 		resErr := httputil.UnmarshalJSONRequest(req, &r)
 		if resErr != nil {
 			return *resErr
@@ -94,47 +95,16 @@ func Login(
 					JSON: jsonerror.BadJSON("'user' must be supplied."),
 				}
 			}
-
-			util.GetLogger(req.Context()).WithField("user", r.Identifier.User).Info("Processing login request")
-
-			localpart, err := userutil.ParseUsernameParam(r.Identifier.User, &cfg.Matrix.ServerName)
-			if err != nil {
-				return util.JSONResponse{
-					Code: http.StatusBadRequest,
-					JSON: jsonerror.InvalidUsername(err.Error()),
-				}
-			}
-
-			acc, err = accountDB.GetAccountByPassword(req.Context(), localpart, r.Password)
-			if err != nil {
-				// Technically we could tell them if the user does not exist by checking if err == sql.ErrNoRows
-				// but that would leak the existence of the user.
-				return util.JSONResponse{
-					Code: http.StatusForbidden,
-					JSON: jsonerror.Forbidden("username or password was incorrect, or the account does not exist"),
-				}
+			acc, errJSON = r.processUsernamePasswordLoginRequest(req, accountDB, cfg, r.Identifier.User)
+			if errJSON != nil {
+				return *errJSON
 			}
 		default:
 			// TODO: The below behaviour is deprecated but without it Riot iOS won't log in
 			if r.User != "" {
-				util.GetLogger(req.Context()).WithField("user", r.User).Info("Processing login request")
-
-				localpart, err := userutil.ParseUsernameParam(r.User, &cfg.Matrix.ServerName)
-				if err != nil {
-					return util.JSONResponse{
-						Code: http.StatusBadRequest,
-						JSON: jsonerror.InvalidUsername(err.Error()),
-					}
-				}
-
-				acc, err = accountDB.GetAccountByPassword(req.Context(), localpart, r.Password)
-				if err != nil {
-					// Technically we could tell them if the user does not exist by checking if err == sql.ErrNoRows
-					// but that would leak the existence of the user.
-					return util.JSONResponse{
-						Code: http.StatusForbidden,
-						JSON: jsonerror.Forbidden("username or password was incorrect, or the account does not exist"),
-					}
+				acc, errJSON = r.processUsernamePasswordLoginRequest(req, accountDB, cfg, r.User)
+				if errJSON != nil {
+					return *errJSON
 				}
 			} else {
 				return util.JSONResponse{
@@ -187,3 +157,32 @@ func getDevice(
 	)
 	return
 }
+
+func (r *passwordRequest) processUsernamePasswordLoginRequest(
+	req *http.Request, accountDB accounts.Database,
+	cfg *config.Dendrite, username string,
+) (acc *api.Account, errJSON *util.JSONResponse) {
+	util.GetLogger(req.Context()).WithField("user", username).Info("Processing login request")
+
+	localpart, err := userutil.ParseUsernameParam(username, &cfg.Matrix.ServerName)
+	if err != nil {
+		errJSON = &util.JSONResponse{
+			Code: http.StatusBadRequest,
+			JSON: jsonerror.InvalidUsername(err.Error()),
+		}
+		return
+	}
+
+	acc, err = accountDB.GetAccountByPassword(req.Context(), localpart, r.Password)
+	if err != nil {
+		// Technically we could tell them if the user does not exist by checking if err == sql.ErrNoRows
+		// but that would leak the existence of the user.
+		errJSON = &util.JSONResponse{
+			Code: http.StatusForbidden,
+			JSON: jsonerror.Forbidden("username or password was incorrect, or the account does not exist"),
+		}
+		return
+	}
+
+	return
+}
diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go
index 18963b83..15add1b4 100644
--- a/syncapi/routing/messages.go
+++ b/syncapi/routing/messages.go
@@ -247,6 +247,12 @@ func (r *messagesReq) retrieveEvents() (
 	// change the way topological positions are defined (as depth isn't the most
 	// reliable way to define it), it would be easier and less troublesome to
 	// only have to change it in one place, i.e. the database.
+	start, end, err = r.getStartEnd(events)
+
+	return clientEvents, start, end, err
+}
+
+func (r *messagesReq) getStartEnd(events []gomatrixserverlib.HeaderedEvent) (start, end types.TopologyToken, err error) {
 	start, err = r.db.EventPositionInTopology(
 		r.ctx, events[0].EventID(),
 	)
@@ -275,8 +281,7 @@ func (r *messagesReq) retrieveEvents() (
 			end.Decrement()
 		}
 	}
-
-	return clientEvents, start, end, err
+	return
 }
 
 // handleEmptyEventsSlice handles the case where the initial request to the