Fix lint in Blender ID patch

Author: brechtvl

patches/0001-BLENDER-Blender-ID-goth-provider.patch

@@ -1,31 +1,13 @@
-From 15a25804e98da3c122082c62d16b2d1ce4374eb9 Mon Sep 17 00:00:00 2001
-From: Brecht Van Lommel <[email protected]>
-Date: Fri, 10 May 2024 13:28:51 +0200
-Subject: [PATCH 01/14] BLENDER: Blender ID goth provider
+commit d925957851e1ff12825e3f35db7b12f516f92cdf
+Author: Brecht Van Lommel <[email protected]>
+Date:   Fri May 10 13:28:51 2024 +0200
 
-Provider authored by Matti Ranta and Arnd Marijnissen.
----
- go.mod                                        |   1 +
- go.sum                                        |   3 +
- public/assets/img/blenderid.png               |   0
- .../auth/source/oauth2/blenderid/blenderid.go | 181 ++++++++++++++++++
- .../source/oauth2/blenderid/blenderid_test.go |  70 +++++++
- .../oauth2/blenderid/gitealize_usernames.go   |  65 +++++++
- .../blenderid/gitealize_usernames_test.go     |  43 +++++
- .../auth/source/oauth2/blenderid/session.go   |  66 +++++++
- .../source/oauth2/blenderid/session_test.go   |  51 +++++
- .../auth/source/oauth2/providers_custom.go    |  11 ++
- 10 files changed, 491 insertions(+)
- create mode 100644 public/assets/img/blenderid.png
- create mode 100644 services/auth/source/oauth2/blenderid/blenderid.go
- create mode 100644 services/auth/source/oauth2/blenderid/blenderid_test.go
- create mode 100644 services/auth/source/oauth2/blenderid/gitealize_usernames.go
- create mode 100644 services/auth/source/oauth2/blenderid/gitealize_usernames_test.go
- create mode 100644 services/auth/source/oauth2/blenderid/session.go
- create mode 100644 services/auth/source/oauth2/blenderid/session_test.go
+    BLENDER: Blender ID goth provider
+    
+    Provider authored by Matti Ranta and Arnd Marijnissen.
 
 diff --git a/go.mod b/go.mod
-index 422952af9e..98a7954b3c 100644
+index 3ea7c7becb..61040031a2 100644
 --- a/go.mod
 +++ b/go.mod
 @@ -257,6 +257,7 @@ require (
@@ -37,10 +19,10 @@ index 422952af9e..98a7954b3c 100644
  	github.com/mschoch/smat v0.2.0 // indirect
  	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 diff --git a/go.sum b/go.sum
-index e7f6b7c6d9..4b8b54d3fc 100644
+index 2b21528544..93adfcba78 100644
 --- a/go.sum
 +++ b/go.sum
-@@ -588,6 +588,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
+@@ -589,6 +589,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
  github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
  github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
@@ -242,7 +224,7 @@ index 0000000000..671e5e4f54
 +}
 diff --git a/services/auth/source/oauth2/blenderid/blenderid_test.go b/services/auth/source/oauth2/blenderid/blenderid_test.go
 new file mode 100644
-index 0000000000..2bf4c443d8
+index 0000000000..283ba0898a
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/blenderid_test.go
 @@ -0,0 +1,70 @@
@@ -267,7 +249,7 @@ index 0000000000..2bf4c443d8
 +
 +	a.Equal(p.ClientKey, os.Getenv("BLENDERID_KEY"))
 +	a.Equal(p.Secret, os.Getenv("BLENDERID_SECRET"))
-+	a.Equal(p.CallbackURL, "/foo")
++	a.Equal("/foo", p.CallbackURL)
 +}
 +
 +func Test_NewCustomisedURL(t *testing.T) {
@@ -305,8 +287,8 @@ index 0000000000..2bf4c443d8
 +	a.NoError(err)
 +
 +	s := session.(*blenderid.Session)
-+	a.Equal(s.AuthURL, "https://id.blender.org/oauth/authorize")
-+	a.Equal(s.AccessToken, "1234567890")
++	a.Equal("https://id.blender.org/oauth/authorize", s.AuthURL)
++	a.Equal("1234567890", s.AccessToken)
 +}
 +
 +func provider() *blenderid.Provider {
@@ -510,7 +492,7 @@ index 0000000000..52a2d21745
 +}
 diff --git a/services/auth/source/oauth2/blenderid/session_test.go b/services/auth/source/oauth2/blenderid/session_test.go
 new file mode 100644
-index 0000000000..ab7fb974a5
+index 0000000000..7f5b619873
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/session_test.go
 @@ -0,0 +1,51 @@
@@ -546,7 +528,7 @@ index 0000000000..ab7fb974a5
 +	s.AuthURL = "/foo"
 +
 +	url, _ := s.GetAuthURL()
-+	a.Equal(url, "/foo")
++	a.Equal("/foo", url)
 +}
 +
 +func Test_ToJSON(t *testing.T) {
@@ -555,7 +537,7 @@ index 0000000000..ab7fb974a5
 +	s := &blenderid.Session{}
 +
 +	data := s.Marshal()
-+	a.Equal(data, `{"AuthURL":"","AccessToken":"","RefreshToken":"","ExpiresAt":"0001-01-01T00:00:00Z"}`)
++	a.JSONEq(`{"AuthURL":"","AccessToken":"","RefreshToken":"","ExpiresAt":"0001-01-01T00:00:00Z"}`, data)
 +}
 +
 +func Test_String(t *testing.T) {
@@ -592,6 +574,3 @@ index 65cf538ad7..f6f49ada04 100644
 +			return blenderid.NewCustomisedURL(clientID, secret, callbackURL, custom.AuthURL, custom.TokenURL, custom.ProfileURL, scopes...), nil
 +		}))
  }
--- 
-2.47.1
-