From fcb6e37c92b33c022523b3ad2dc54070ad3af995 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 10:09:07 +0100
Subject: [PATCH] Update module github.com/MicahParks/keyfunc/v2 to v3 (#61)

* Update module github.com/MicahParks/keyfunc/v2 to v3

* Migrated to v3

* Fixed order

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Christian Banse <oxisto@clouditor.io>
---
 .github/workflows/build.yml | 10 ++++------
 go.mod                      | 11 +++++++++--
 go.sum                      | 12 ++++++------
 sso.go                      | 10 +++++-----
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 74f1cc9..212cf5b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,14 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.20
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v4
+    - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.20"
+        go-version-file: go.mod
       id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v4
-
     - name: Build
       run: go build -v .
diff --git a/go.mod b/go.mod
index 0e4344b..98fc85f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,15 @@
 module github.com/oxisto/evesso
 
-go 1.20
+go 1.21
+
+toolchain go1.22.0
 
 require (
-	github.com/MicahParks/keyfunc/v2 v2.1.0
+	github.com/MicahParks/keyfunc/v3 v3.2.5
 	github.com/golang-jwt/jwt/v5 v5.2.0
 )
+
+require (
+	github.com/MicahParks/jwkset v0.5.12 // indirect
+	golang.org/x/time v0.5.0 // indirect
+)
diff --git a/go.sum b/go.sum
index c5898c1..8734874 100644
--- a/go.sum
+++ b/go.sum
@@ -1,8 +1,8 @@
-github.com/MicahParks/keyfunc/v2 v2.1.0 h1:6ZXKb9Rp6qp1bDbJefnG7cTH8yMN1IC/4nf+GVjO99k=
-github.com/MicahParks/keyfunc/v2 v2.1.0/go.mod h1:rW42fi+xgLJ2FRRXAfNx9ZA8WpD4OeE/yHVMteCkw9k=
-github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
-github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang-jwt/jwt/v5 v5.1.0 h1:UGKbA/IPjtS6zLcdB7i5TyACMgSbOTiR8qzXgw8HWQU=
-github.com/golang-jwt/jwt/v5 v5.1.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/MicahParks/jwkset v0.5.12 h1:wEwKZXB77yHFIHBtYoawNKIUwqC1X24S8tIhWutJHMA=
+github.com/MicahParks/jwkset v0.5.12/go.mod h1:q8ptTGn/Z9c4MwbcfeCDssADeVQb3Pk7PnVxrvi+2QY=
+github.com/MicahParks/keyfunc/v3 v3.2.5 h1:eg4s2zd2nfadnAzAsv9xvJCdCfLNy4s/aSiAxRn+aAk=
+github.com/MicahParks/keyfunc/v3 v3.2.5/go.mod h1:8hmM7h/hNerfF8uC8cFVnT+afxBgh6nKRTR/0vAm5So=
 github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
 github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
diff --git a/sso.go b/sso.go
index 5f09d27..76f0e00 100644
--- a/sso.go
+++ b/sso.go
@@ -28,11 +28,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/MicahParks/keyfunc/v2"
+	"github.com/MicahParks/keyfunc/v3"
 	"github.com/golang-jwt/jwt/v5"
 )
 
-var set *keyfunc.JWKS
+var kf keyfunc.Keyfunc
 
 const (
 	// LiveServer contains the url of the EVE live server.
@@ -98,8 +98,8 @@ func (sso *SingleSignOn) AccessToken(code string, refreshToken bool) (response T
 
 func parseJwt(s string) (expiryTime time.Time, characterID int, characterName string, err error) {
 	// retrieve JWKs
-	if set == nil {
-		set, err = keyfunc.Get("https://login.eveonline.com/oauth/jwks", keyfunc.Options{})
+	if kf == nil {
+		kf, err = keyfunc.NewDefault([]string{"https://login.eveonline.com/oauth/jwks"})
 		if err != nil {
 			return
 		}
@@ -107,7 +107,7 @@ func parseJwt(s string) (expiryTime time.Time, characterID int, characterName st
 
 	// parse token
 	var token *jwt.Token
-	token, err = jwt.Parse(s, set.Keyfunc)
+	token, err = jwt.Parse(s, kf.Keyfunc)
 	// parse will through an error, if there is a problem
 	if err != nil {
 		return