feat: leverage go's mod replace sanely

major0 · major0 · commit 04a533aec932 · 2025-01-16T05:38:50.000-08:00
The Proton-API-Bridge should not be attempting to take over, nor
re-define, the existing proton-go-api interfaces. This is known has an
"unfriendly fork" and increases the overall complexity of maintaining
the Proton-API-Bridge.

All changes to the proton-go-api should be done as "friendly" as
possible, and should be submitted back upstream for inclusion. This
improves the functionality of the proton-go-api for more than just 1
project, and it reduces the long-term maintenance required for
Proton-API-Bridge.

To this end, Proton-API-Bridge should be written to always assume it is
using github.com/ProtonMail/proton-go-api and leverage the `replace`
operation in go.mod in order to leverage our "friendly fork" of
proton-go-api. I.e. the long-term goal should be to _not_ maintain a
fork of proton-go-api.

&gt; Anything else would be uncivilized.
diff --git a/cache.go b/cache.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 type cacheEntry struct {
diff --git a/common/keyring.go b/common/keyring.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 /*
diff --git a/common/proton_manager.go b/common/proton_manager.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 func getProtonManager(appVersion string, userAgent string) *proton.Manager {
diff --git a/common/user.go b/common/user.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 type ProtonDriveCredential struct {
diff --git a/delete.go b/delete.go
@@ -3,7 +3,7 @@ package proton_api_bridge
 import (
 	"context"
 
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 func (protonDrive *ProtonDrive) moveToTrash(ctx context.Context, parentLinkID string, linkIDs ...string) error {
diff --git a/drive.go b/drive.go
@@ -8,7 +8,7 @@ import (
 	"golang.org/x/sync/semaphore"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 type ProtonDrive struct {
diff --git a/drive_test.go b/drive_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 func TestCreateAndDeleteFolder(t *testing.T) {
diff --git a/drive_test_helper.go b/drive_test_helper.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/henrybear327/Proton-API-Bridge/common"
 	"github.com/henrybear327/Proton-API-Bridge/utility"
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 
 	mathrand "math/rand"
 )
diff --git a/file.go b/file.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 	"github.com/relvacode/iso8601"
 )
 
diff --git a/file_download.go b/file_download.go
@@ -7,7 +7,7 @@ import (
 	"log"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 type FileDownloadReader struct {
diff --git a/file_upload.go b/file_upload.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 func (protonDrive *ProtonDrive) handleRevisionConflict(ctx context.Context, link *proton.Link, createFileResp *proton.CreateFileRes) (string, bool, error) {
diff --git a/folder.go b/folder.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 type ProtonDirectoryData struct {
diff --git a/folder_recursive.go b/folder_recursive.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/henrybear327/go-proton-api"
+	"github.com/ProtonMail/go-proton-api"
 )
 
 func (protonDrive *ProtonDrive) listDirectoriesRecursively(
diff --git a/go.mod b/go.mod
@@ -1,35 +1,39 @@
 module github.com/henrybear327/Proton-API-Bridge
 
-go 1.18
+go 1.23
+
+toolchain go1.23.4
 
 require (
 	github.com/ProtonMail/gluon v0.17.1-0.20230724134000-308be39be96e
-	github.com/ProtonMail/gopenpgp/v2 v2.7.3
-	github.com/henrybear327/go-proton-api v0.0.0-20230907193451-e563407504ce
-	github.com/relvacode/iso8601 v1.3.0
-	golang.org/x/sync v0.3.0
+	github.com/ProtonMail/go-proton-api v0.4.1-0.20241202144358-98a73ffe6d20
+	github.com/ProtonMail/gopenpgp/v2 v2.8.2
+	github.com/relvacode/iso8601 v1.6.0
+	golang.org/x/sync v0.10.0
 )
 
 require (
 	github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
+	github.com/ProtonMail/go-crypto v1.1.5 // indirect
 	github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
 	github.com/ProtonMail/go-srp v0.0.7 // indirect
-	github.com/PuerkitoBio/goquery v1.8.1 // indirect
-	github.com/andybalholm/cascadia v1.3.2 // indirect
-	github.com/bradenaw/juniper v0.13.1 // indirect
-	github.com/cloudflare/circl v1.3.3 // indirect
+	github.com/PuerkitoBio/goquery v1.10.1 // indirect
+	github.com/andybalholm/cascadia v1.3.3 // indirect
+	github.com/bradenaw/juniper v0.15.3 // indirect
+	github.com/cloudflare/circl v1.5.0 // indirect
 	github.com/cronokirby/saferith v0.33.0 // indirect
-	github.com/emersion/go-message v0.17.0 // indirect
-	github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 // indirect
-	github.com/emersion/go-vcard v0.0.0-20230815062825-8fda7d206ec9 // indirect
-	github.com/go-resty/resty/v2 v2.7.0 // indirect
-	github.com/google/uuid v1.3.1 // indirect
+	github.com/emersion/go-message v0.18.2 // indirect
+	github.com/emersion/go-vcard v0.0.0-20241024213814-c9703dde27ff // indirect
+	github.com/go-resty/resty/v2 v2.16.3 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/net v0.15.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	gitlab.com/c0b/go-ordered-json v0.0.0-20201030195603-febf46534d5a // indirect
+	golang.org/x/crypto v0.32.0 // indirect
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 )
+
+replace github.com/ProtonMail/go-proton-api => github.com/henrybear327/go-proton-api v0.0.0-20240605152832-2f693dee7b13
diff --git a/go.sum b/go.sum
diff --git a/mail.go b/mail.go
diff --git a/search.go b/search.go
diff --git a/search_recursive.go b/search_recursive.go
diff --git a/shares.go b/shares.go
diff --git a/volumes.go b/volumes.go

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"sync"`
`7`	`7`
`8`	`8`	`"github.com/ProtonMail/gopenpgp/v2/crypto"`
`9`		`- "github.com/henrybear327/go-proton-api"`
	`9`	`+ "github.com/ProtonMail/go-proton-api"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type cacheEntry struct {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`
`6`	`6`	`"github.com/ProtonMail/gopenpgp/v2/crypto"`
`7`		`- "github.com/henrybear327/go-proton-api"`
	`7`	`+ "github.com/ProtonMail/go-proton-api"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package common`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/henrybear327/go-proton-api"`
	`4`	`+ "github.com/ProtonMail/go-proton-api"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func getProtonManager(appVersion string, userAgent string) *proton.Manager {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"os"`
`9`	`9`
`10`	`10`	`"github.com/ProtonMail/gopenpgp/v2/crypto"`
`11`		`- "github.com/henrybear327/go-proton-api"`
	`11`	`+ "github.com/ProtonMail/go-proton-api"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type ProtonDriveCredential struct {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package proton_api_bridge`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "github.com/henrybear327/go-proton-api"`
	`6`	`+ "github.com/ProtonMail/go-proton-api"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func (protonDrive *ProtonDrive) moveToTrash(ctx context.Context, parentLinkID string, linkIDs ...string) error {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"golang.org/x/sync/semaphore"`
`9`	`9`
`10`	`10`	`"github.com/ProtonMail/gopenpgp/v2/crypto"`
`11`		`- "github.com/henrybear327/go-proton-api"`
	`11`	`+ "github.com/ProtonMail/go-proton-api"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type ProtonDrive struct {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"strings"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "github.com/henrybear327/go-proton-api"`
	`8`	`+ "github.com/ProtonMail/go-proton-api"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func TestCreateAndDeleteFolder(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/henrybear327/Proton-API-Bridge/common"`
`13`	`13`	`"github.com/henrybear327/Proton-API-Bridge/utility"`
`14`		`- "github.com/henrybear327/go-proton-api"`
	`14`	`+ "github.com/ProtonMail/go-proton-api"`
`15`	`15`
`16`	`16`	`mathrand "math/rand"`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"strings"`
`6`	`6`	`"time"`
`7`	`7`
`8`		`- "github.com/henrybear327/go-proton-api"`
	`8`	`+ "github.com/ProtonMail/go-proton-api"`
`9`	`9`	`"github.com/relvacode/iso8601"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"log"`
`8`	`8`
`9`	`9`	`"github.com/ProtonMail/gopenpgp/v2/crypto"`
`10`		`- "github.com/henrybear327/go-proton-api"`
	`10`	`+ "github.com/ProtonMail/go-proton-api"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type FileDownloadReader struct {`