From 7df2ec5a904ee0580d6c4b55f1695b80bed24d65 Mon Sep 17 00:00:00 2001 From: Jan-Lukas Else Date: Fri, 18 Mar 2022 08:17:22 +0100 Subject: [PATCH] Update indieauth dependency to new major version --- app.go | 2 +- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- indieAuth.go | 2 +- indieAuthServer.go | 2 +- indieAuthServer_test.go | 10 +++++----- indieAuth_test.go | 2 +- markdown.go | 2 +- ui.go | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app.go b/app.go index 890a13f..6d71c5d 100644 --- a/app.go +++ b/app.go @@ -9,7 +9,7 @@ import ( ts "git.jlel.se/jlelse/template-strings" ct "github.com/elnormous/contenttype" "github.com/go-fed/httpsig" - "github.com/hacdias/indieauth" + "github.com/hacdias/indieauth/v2" rotatelogs "github.com/lestrrat-go/file-rotatelogs" "github.com/yuin/goldmark" "go.goblog.app/app/pkgs/minify" diff --git a/go.mod b/go.mod index ba64122..0dee4ad 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/gorilla/handlers v1.5.1 github.com/gorilla/sessions v1.2.1 github.com/gorilla/websocket v1.5.0 - github.com/hacdias/indieauth v1.7.1 + github.com/hacdias/indieauth/v2 v2.0.0 github.com/jlaffaye/ftp v0.0.0-20220310202011-d2c44e311e78 // master github.com/jlelse/feeds v1.2.1-0.20210704161900-189f94254ad4 @@ -61,7 +61,7 @@ require ( golang.org/x/text v0.3.7 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b nhooyr.io/websocket v1.8.7 - tailscale.com v1.22.1 + tailscale.com v1.22.2 // main willnorris.com/go/microformats v1.1.2-0.20210827044458-ff2a6ae41971 ) @@ -129,7 +129,7 @@ require ( go4.org/mem v0.0.0-20210711025021-927187094b94 // indirect go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect - golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect + golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect @@ -141,5 +141,5 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gvisor.dev/gvisor v0.0.0-20220126021142-d8aa030b2591 // indirect inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 // indirect - willnorris.com/go/webmention v0.0.0-20211028201829-b0044f1a24d0 // indirect + willnorris.com/go/webmention v0.0.0-20220108183051-4a23794272f0 // indirect ) diff --git a/go.sum b/go.sum index 15d8487..dc991e8 100644 --- a/go.sum +++ b/go.sum @@ -236,8 +236,8 @@ github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/z github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/hacdias/indieauth v1.7.1 h1:gIIVrUozSTbTEOpqSYs884y37UWeFnVwX3KVT3sm/94= -github.com/hacdias/indieauth v1.7.1/go.mod h1:NHpFIYe4d5vl+hZY+16XsneVmD6usNcZdrSIpP5blqM= +github.com/hacdias/indieauth/v2 v2.0.0 h1:0ePEwI4sC1D5qds/r4zCBUzOiamhRSN2FyHP6YsO3Zg= +github.com/hacdias/indieauth/v2 v2.0.0/go.mod h1:OHEsGRgWcZgbzzT84yxX0V0qYAWOuNZ9Iy+rIDvHC1s= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -577,8 +577,8 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a h1:qfl7ob3DIEs3Ml9oLuPwY2N04gymzAW04WsUQHIClgM= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -842,9 +842,9 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= software.sslmate.com/src/go-pkcs12 v0.0.0-20210415151418-c5206de65a78 h1:SqYE5+A2qvRhErbsXFfUEUmpWEKxxRSMgGLkvRAFOV4= -tailscale.com v1.22.1 h1:ttEGAst31AwzcG/G+rfr+0oKIYVD314DKB3Lig4HsbM= -tailscale.com v1.22.1/go.mod h1:D2zuDnjHT7v4aCt71c4+ytQUUAGpnypW+DoubYLaHjg= +tailscale.com v1.22.2 h1:bK0Fhu9tWcNH0qhi0Wbt+U4eHwemh2rXdTw6koa3jqI= +tailscale.com v1.22.2/go.mod h1:D2zuDnjHT7v4aCt71c4+ytQUUAGpnypW+DoubYLaHjg= willnorris.com/go/microformats v1.1.2-0.20210827044458-ff2a6ae41971 h1:b4juh5znIpBA1KnzHMP0UB4Cs+3/0b0XfchkWE81FXw= willnorris.com/go/microformats v1.1.2-0.20210827044458-ff2a6ae41971/go.mod h1:kvVnWrkkEscVAIITCEoiTX66Hcyg59C7q0E49mb9TJ0= -willnorris.com/go/webmention v0.0.0-20211028201829-b0044f1a24d0 h1:3/ozQ2qGZat82ON3AYMTot3gCg/vU7tgn/LYSJbkVPM= -willnorris.com/go/webmention v0.0.0-20211028201829-b0044f1a24d0/go.mod h1:DgeruqKIsZtcDXVXNbBHa0YYEm88oAnK7PahkDtuCvw= +willnorris.com/go/webmention v0.0.0-20220108183051-4a23794272f0 h1:V5+O+YZHchEwu6ZmPcqT1dQ+mHgE356Q+w9SVOQ+QZg= +willnorris.com/go/webmention v0.0.0-20220108183051-4a23794272f0/go.mod h1:DgeruqKIsZtcDXVXNbBHa0YYEm88oAnK7PahkDtuCvw= diff --git a/indieAuth.go b/indieAuth.go index a84ee35..26a8e8b 100644 --- a/indieAuth.go +++ b/indieAuth.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/hacdias/indieauth" + "github.com/hacdias/indieauth/v2" ) const indieAuthScope contextKey = "scope" diff --git a/indieAuthServer.go b/indieAuthServer.go index 73c4593..fffff1d 100644 --- a/indieAuthServer.go +++ b/indieAuthServer.go @@ -10,7 +10,7 @@ import ( "time" "github.com/google/uuid" - "github.com/hacdias/indieauth" + "github.com/hacdias/indieauth/v2" "go.goblog.app/app/pkgs/contenttype" ) diff --git a/indieAuthServer_test.go b/indieAuthServer_test.go index 2243923..fd21b21 100644 --- a/indieAuthServer_test.go +++ b/indieAuthServer_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/PuerkitoBio/goquery" - "github.com/hacdias/indieauth" + "github.com/hacdias/indieauth/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -62,11 +62,11 @@ func Test_indieAuthServer(t *testing.T) { ) require.NotNil(t, iac) - endpoints, err := iac.DiscoverEndpoints("https://example.org/") + metadata, err := iac.DiscoverMetadata("https://example.org/") require.NoError(t, err) - if assert.NotNil(t, endpoints) { - assert.Equal(t, "https://example.org/indieauth", endpoints.Authorization) - assert.Equal(t, "https://example.org/indieauth/token", endpoints.Token) + if assert.NotNil(t, metadata) { + assert.Equal(t, "https://example.org/indieauth", metadata.AuthorizationEndpoint) + assert.Equal(t, "https://example.org/indieauth/token", metadata.TokenEndpoint) } for _, test := range []int{1, 2} { diff --git a/indieAuth_test.go b/indieAuth_test.go index c78ee92..5a8a335 100644 --- a/indieAuth_test.go +++ b/indieAuth_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/hacdias/indieauth" + "github.com/hacdias/indieauth/v2" "github.com/stretchr/testify/assert" ) diff --git a/markdown.go b/markdown.go index 5560cb8..39456b1 100644 --- a/markdown.go +++ b/markdown.go @@ -145,7 +145,7 @@ func (c *customRenderer) renderLink(w util.BufWriter, _ []byte, node ast.Node, e _, _ = w.WriteString("