Reply with which cookies are missing (ref #2)

[skip cd]

commands.go

@@ -26,6 +26,7 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/exp/maps"
 	"maunium.net/go/mautrix"
 	"maunium.net/go/mautrix/bridge/commands"
 	"maunium.net/go/mautrix/id"
@@ -269,8 +270,12 @@ func fnLoginEnterCookies(ce *WrappedCommandEvent) {
 			return
 		}
 	}
-	if !newCookies.AllCookiesPresent() {
-		ce.Reply("Missing some cookies")
+	missingRequiredCookies := newCookies.RequiredCookies()
+	maps.DeleteFunc(missingRequiredCookies, func(key, value string) bool {
+		return len(value) > 0
+	})
+	if len(missingRequiredCookies) > 0 {
+		ce.Reply("Missing some cookies: %v", maps.Keys(missingRequiredCookies))
 		return
 	}
 	err := ce.User.Login(ce.Ctx, newCookies)

messagix/cookies/cookies.go

@@ -22,7 +22,7 @@ type Cookies interface {
 	IsLoggedIn() bool
 	ToJSON() ([]byte, error)
 	GetUserID() int64
-	AllCookiesPresent() bool
+	RequiredCookies() map[string]string
 }
 
 func UpdateValue(cookieStruct Cookies, name, val string) {

messagix/cookies/facebook.go

@@ -41,6 +41,11 @@ func (fb *FacebookCookies) GetUserID() int64 {
 	return userID
 }
 
-func (fb *FacebookCookies) AllCookiesPresent() bool {
-	return fb.Datr != "" && fb.Sb != "" && fb.AccountId != "" && fb.Xs != ""
+func (fb *FacebookCookies) RequiredCookies() map[string]string {
+	return map[string]string{
+		"datr":   fb.Datr,
+		"sb":     fb.Sb,
+		"c_user": fb.AccountId,
+		"xs":     fb.Xs,
+	}
 }

messagix/cookies/instagram.go

@@ -38,6 +38,12 @@ func (ig *InstagramCookies) GetUserID() int64 {
 	return userID
 }
 
-func (ig *InstagramCookies) AllCookiesPresent() bool {
-	return ig.SessionId != "" && ig.CsrfToken != "" && ig.MachineId != "" && ig.IgDeviceId != "" && ig.UserId != ""
+func (ig *InstagramCookies) RequiredCookies() map[string]string {
+	return map[string]string{
+		"sessionid":  ig.SessionId,
+		"csrftoken":  ig.CsrfToken,
+		"mid":        ig.MachineId,
+		"ig_did":     ig.IgDeviceId,
+		"ds_user_id": ig.UserId,
+	}
 }

provisioning.go

@@ -26,6 +26,7 @@ import (
 	"github.com/beeper/libserv/pkg/requestlog"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/hlog"
+	"golang.org/x/exp/maps"
 	"maunium.net/go/mautrix"
 	"maunium.net/go/mautrix/id"
 
@@ -106,7 +107,13 @@ func (prov *ProvisioningAPI) Login(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		jsonResponse(w, http.StatusBadRequest, Error{ErrCode: mautrix.MBadJSON.ErrCode, Error: err.Error()})
 		return
-	} else if !cookies.AllCookiesPresent() {
+	}
+	missingRequiredCookies := cookies.RequiredCookies()
+	maps.DeleteFunc(missingRequiredCookies, func(key, value string) bool {
+		return len(value) > 0
+	})
+	if len(missingRequiredCookies) > 0 {
+		log.Debug().Strs("missing_cookies", maps.Keys(missingRequiredCookies)).Msg("Missing cookies in login request")
 		jsonResponse(w, http.StatusBadRequest, Error{ErrCode: mautrix.MBadJSON.ErrCode, Error: "Missing some cookies"})
 		return
 	}