stringcookiejar: move into linkedingo

Signed-off-by: Sumner Evans <[email protected]>
mautrix · Feb 26, 2025 · 6e7d7d1 · 6e7d7d1
1 parent 47daf58
commit 6e7d7d1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 230 deletions.
diff --git a/pkg/connector/dbmeta.go b/pkg/connector/dbmeta.go
@@ -19,7 +19,7 @@ package connector
 import (
 	"maunium.net/go/mautrix/bridgev2/database"
 
-	"go.mau.fi/mautrix-linkedin/pkg/stringcookiejar"
+	"go.mau.fi/mautrix-linkedin/pkg/linkedingo"
 )
 
 func (lc *LinkedInConnector) GetDBMetaTypes() database.MetaTypes {
@@ -33,5 +33,5 @@ func (lc *LinkedInConnector) GetDBMetaTypes() database.MetaTypes {
 }
 
 type UserLoginMetadata struct {
-	Cookies *stringcookiejar.Jar `json:"cookies,omitempty"`
+	Cookies *linkedingo.Jar `json:"cookies,omitempty"`
 }
diff --git a/pkg/connector/login.go b/pkg/connector/login.go
@@ -26,7 +26,6 @@ import (
 	"maunium.net/go/mautrix/bridgev2/networkid"
 
 	"go.mau.fi/mautrix-linkedin/pkg/linkedingo"
-	"go.mau.fi/mautrix-linkedin/pkg/stringcookiejar"
 )
 
 const FlowIDCookies = "cookies"
@@ -90,7 +89,7 @@ func (c *CookieLogin) Start(ctx context.Context) (*bridgev2.LoginStep, error) {
 }
 
 func (c *CookieLogin) SubmitCookies(ctx context.Context, cookies map[string]string) (*bridgev2.LoginStep, error) {
-	jar, err := stringcookiejar.NewJarFromCookieHeader(cookies[CookieLoginCookieHeaderField])
+	jar, err := linkedingo.NewJarFromCookieHeader(cookies[CookieLoginCookieHeaderField])
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/linkedingo/client.go b/pkg/linkedingo/client.go
@@ -21,13 +21,11 @@ import (
 	"net/http"
 
 	"github.com/google/uuid"
-
-	"go.mau.fi/mautrix-linkedin/pkg/stringcookiejar"
 )
 
 type Client struct {
 	http          *http.Client
-	jar           *stringcookiejar.Jar
+	jar           *Jar
 	userEntityURN URN
 
 	realtimeSessionID uuid.UUID
@@ -43,7 +41,7 @@ type Client struct {
 	i18nLocale           string
 }
 
-func NewClient(ctx context.Context, userEntityURN URN, jar *stringcookiejar.Jar, handlers Handlers) *Client {
+func NewClient(ctx context.Context, userEntityURN URN, jar *Jar, handlers Handlers) *Client {
 	return &Client{
 		userEntityURN:     userEntityURN,
 		jar:               jar,

diff --git a/pkg/stringcookiejar/stringcookiejar.go b/pkg/stringcookiejar/stringcookiejar.go
diff --git a/pkg/stringcookiejar/stringcookiejar_test.go b/pkg/stringcookiejar/stringcookiejar_test.go