cmd: use go-util and mautrix functions

Signed-off-by: Sumner Evans <[email protected]>
mautrix · Jan 20, 2025 · 4c8e061 · 4c8e061
1 parent 908cefa
commit 4c8e061
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 34 deletions.
diff --git a/cmd/linkedin-matrix/legacyprovision.go b/cmd/linkedin-matrix/legacyprovision.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 
 	"github.com/rs/zerolog"
+	"go.mau.fi/util/exhttp"
 	"maunium.net/go/mautrix"
 	"maunium.net/go/mautrix/bridge/status"
 	"maunium.net/go/mautrix/bridgev2"
@@ -15,23 +16,6 @@ import (
 	"github.com/beeper/linkedin/pkg/connector"
 )
 
-func jsonResponse(w http.ResponseWriter, status int, response any) {
-	w.Header().Add("Content-Type", "application/json")
-	w.WriteHeader(status)
-	_ = json.NewEncoder(w).Encode(response)
-}
-
-type Error struct {
-	Success bool   `json:"success"`
-	Error   string `json:"error"`
-	ErrCode string `json:"errcode"`
-}
-
-type Response struct {
-	Success bool   `json:"success"`
-	Status  string `json:"status"`
-}
-
 var levelsToNames = map[bridgeconfig.Permissions]string{
 	bridgeconfig.PermissionLevelBlock:    "block",
 	bridgeconfig.PermissionLevelRelay:    "relay",
@@ -49,15 +33,15 @@ func legacyProvStatus(w http.ResponseWriter, r *http.Request) {
 
 	ul := user.GetDefaultLogin()
 	if ul.ID != "" { // if logged in
-		linClient := connector.NewLinkedInClient(r.Context(), c, ul)
+		linClient := connector.NewLinkedInClient(r.Context(), m.Connector.(*connector.LinkedInConnector), ul)
 
 		currentUser, err := linClient.GetCurrentUser()
 		if err == nil {
 			response["linkedin"] = currentUser
 		}
 	}
 
-	jsonResponse(w, http.StatusOK, response)
+	exhttp.WriteJSONResponse(w, http.StatusOK, response)
 }
 
 func legacyProvLogin(w http.ResponseWriter, r *http.Request) {
@@ -66,36 +50,36 @@ func legacyProvLogin(w http.ResponseWriter, r *http.Request) {
 	var body map[string]map[string]string
 	err := json.NewDecoder(r.Body).Decode(&body)
 	if err != nil {
-		jsonResponse(w, http.StatusBadRequest, Error{ErrCode: mautrix.MBadJSON.ErrCode, Error: err.Error()})
+		exhttp.WriteJSONResponse(w, http.StatusBadRequest, mautrix.MBadJSON.WithMessage(err.Error()))
 		return
 	}
 	cookieString := body["all_headers"]["Cookie"]
 
-	lp, err := c.CreateLogin(ctx, user, "cookies")
+	lp, err := m.Connector.CreateLogin(ctx, user, "cookies")
 	if err != nil {
 		zerolog.Ctx(ctx).Err(err).Msg("Failed to create login")
-		jsonResponse(w, http.StatusInternalServerError, Error{ErrCode: "M_UNKNOWN", Error: "Internal error creating login"})
+		exhttp.WriteJSONResponse(w, http.StatusInternalServerError, mautrix.MUnknown.WithMessage("Internal error creating login"))
 	} else if firstStep, err := lp.Start(ctx); err != nil {
 		zerolog.Ctx(ctx).Err(err).Msg("Failed to start login")
-		jsonResponse(w, http.StatusInternalServerError, Error{ErrCode: "M_UNKNOWN", Error: "Internal error starting login"})
+		exhttp.WriteJSONResponse(w, http.StatusInternalServerError, mautrix.MUnknown.WithMessage("Internal error starting login"))
 	} else if firstStep.StepID != connector.LoginStepIDCookies {
-		jsonResponse(w, http.StatusInternalServerError, Error{ErrCode: "M_UNKNOWN", Error: "Unexpected login step"})
+		exhttp.WriteJSONResponse(w, http.StatusInternalServerError, mautrix.MUnknown.WithMessage("Unexpected login step"))
 	} else if !connector.ValidCookieRegex.MatchString(cookieString) {
-		jsonResponse(w, http.StatusOK, nil)
+		exhttp.WriteJSONResponse(w, http.StatusOK, nil)
 	} else if finalStep, err := lp.(bridgev2.LoginProcessCookies).SubmitCookies(ctx, map[string]string{
 		"cookie": cookieString,
 	}); err != nil {
 		zerolog.Ctx(ctx).Err(err).Msg("Failed to log in")
 		var respErr bridgev2.RespError
 		if errors.As(err, &respErr) {
-			jsonResponse(w, respErr.StatusCode, &respErr)
+			exhttp.WriteJSONResponse(w, respErr.StatusCode, &respErr)
 		} else {
-			jsonResponse(w, http.StatusInternalServerError, Error{ErrCode: "M_UNKNOWN", Error: "Internal error logging in"})
+			exhttp.WriteJSONResponse(w, http.StatusInternalServerError, mautrix.MUnknown.WithMessage("Internal error logging in"))
 		}
 	} else if finalStep.StepID != connector.LoginStepIDComplete {
-		jsonResponse(w, http.StatusInternalServerError, Error{ErrCode: "M_UNKNOWN", Error: "Unexpected login step"})
+		exhttp.WriteJSONResponse(w, http.StatusInternalServerError, mautrix.MUnknown.WithMessage("Unexpected login step"))
 	} else {
-		jsonResponse(w, http.StatusOK, map[string]any{})
+		exhttp.WriteJSONResponse(w, http.StatusOK, map[string]any{})
 		go handleLoginComplete(context.WithoutCancel(ctx), user, finalStep.CompleteParams.UserLogin)
 	}
 }
@@ -116,8 +100,8 @@ func legacyProvLogout(w http.ResponseWriter, r *http.Request) {
 		// Intentionally don't delete the user login, only disconnect the client
 		login.Client.(*connector.LinkedInClient).LogoutRemote(r.Context())
 	}
-	jsonResponse(w, http.StatusOK, Response{
-		Success: true,
-		Status:  "logged_out",
+	exhttp.WriteJSONResponse(w, http.StatusOK, map[string]any{
+		"success": true,
+		"status":  "logged_out",
 	})
 }
diff --git a/cmd/linkedin-matrix/main.go b/cmd/linkedin-matrix/main.go
@@ -17,13 +17,12 @@ var (
 	BuildTime = "unknown"
 )
 
-var c = &connector.LinkedInConnector{}
 var m = mxmain.BridgeMain{
 	Name:        "linkedin-matrix",
 	URL:         "https://github.com/beeper/linkedin",
 	Description: "A Matrix-LinkedIn puppeting bridge.",
 	Version:     "0.6.0",
-	Connector:   c,
+	Connector:   &connector.LinkedInConnector{},
 }
 
 func main() {