Update dependencies, fix compatibility with Hydra 1.10
This commit is contained in:
parent
4d10c0e9c5
commit
8ebf81abe1
10 changed files with 318 additions and 134 deletions
|
@ -13,7 +13,7 @@
|
|||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
*/
|
||||
|
||||
package handlers
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
/*
|
||||
Copyright 2020, 2021 Jan Dittberner
|
||||
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
@ -89,11 +88,10 @@ func getRequestedClaims(logger *log.Logger) string {
|
|||
return buf.String()
|
||||
}
|
||||
|
||||
func ParseIdToken(token string, keySet *jwk.Set) (openid.Token, error) {
|
||||
if parsedIdToken, err := jwt.ParseString(token, jwt.WithKeySet(keySet), jwt.WithOpenIDClaims()); err != nil {
|
||||
func ParseIdToken(token string, keySet jwk.Set) (openid.Token, error) {
|
||||
if parsedIdToken, err := jwt.ParseString(token, jwt.WithKeySet(keySet), jwt.WithToken(openid.New())); err != nil {
|
||||
return nil, err
|
||||
} else {
|
||||
return parsedIdToken.(openid.Token), nil
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ import (
|
|||
type indexHandler struct {
|
||||
bundle *i18n.Bundle
|
||||
indexTemplate *template.Template
|
||||
keySet *jwk.Set
|
||||
keySet jwk.Set
|
||||
logoutUrl string
|
||||
messageCatalog *commonServices.MessageCatalog
|
||||
serverAddr string
|
||||
|
|
|
@ -39,7 +39,7 @@ const (
|
|||
)
|
||||
|
||||
type oidcCallbackHandler struct {
|
||||
keySet *jwk.Set
|
||||
keySet jwk.Set
|
||||
logger *log.Logger
|
||||
oauth2Config *oauth2.Config
|
||||
}
|
||||
|
|
Reference in a new issue