cim/zitadel-oidc
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade this module to v3

Browse source
This commit is contained in:
Tim Möhlmann 2023-03-17 18:41:41 +02:00 • committed by Tim Möhlmann
parent 57fb9f77aa
commit c8cf15e266
81 changed files with 176 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -44,9 +44,9 @@ Check the `/example` folder where example code for different scenarios is locate
```bash ```bash
# start oidc op server # start oidc op server
# oidc discovery http://localhost:9998/.well-known/openid-configuration # oidc discovery http://localhost:9998/.well-known/openid-configuration
go run github.com/zitadel/oidc/v2/example/server go run github.com/zitadel/oidc/v3/example/server
# start oidc web client (in a new terminal) # start oidc web client (in a new terminal)
CLIENT_ID=web CLIENT_SECRET=secret ISSUER=http://localhost:9998/ SCOPES="openid profile" PORT=9999 go run github.com/zitadel/oidc/v2/example/client/app CLIENT_ID=web CLIENT_SECRET=secret ISSUER=http://localhost:9998/ SCOPES="openid profile" PORT=9999 go run github.com/zitadel/oidc/v3/example/client/app
``` ```
- open http://localhost:9999/login in your browser - open http://localhost:9999/login in your browser
@ -56,11 +56,11 @@ CLIENT_ID=web CLIENT_SECRET=secret ISSUER=http://localhost:9998/ SCOPES="openid
for the dynamic issuer, just start it with: for the dynamic issuer, just start it with:
```bash ```bash
go run github.com/zitadel/oidc/v2/example/server/dynamic go run github.com/zitadel/oidc/v3/example/server/dynamic
``` ```
the oidc web client above will still work, but if you add `oidc.local` (pointing to 127.0.0.1) in your hosts file you can also start it with: the oidc web client above will still work, but if you add `oidc.local` (pointing to 127.0.0.1) in your hosts file you can also start it with:
```bash ```bash
CLIENT_ID=web CLIENT_SECRET=secret ISSUER=http://oidc.local:9998/ SCOPES="openid profile" PORT=9999 go run github.com/zitadel/oidc/v2/example/client/app CLIENT_ID=web CLIENT_SECRET=secret ISSUER=http://oidc.local:9998/ SCOPES="openid profile" PORT=9999 go run github.com/zitadel/oidc/v3/example/client/app
``` ```
> Note: Usernames are suffixed with the hostname (`test-user@localhost` or `test-user@oidc.local`) > Note: Usernames are suffixed with the hostname (`test-user@localhost` or `test-user@oidc.local`)

4
example/client/api/api.go
View file

@ -12,8 +12,8 @@ import (
"github.com/go-chi/chi" "github.com/go-chi/chi"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/zitadel/oidc/v2/pkg/client/rs" "github.com/zitadel/oidc/v3/pkg/client/rs"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
const ( const (

6
example/client/app/app.go
View file

@ -11,9 +11,9 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/zitadel/oidc/v2/pkg/client/rp" "github.com/zitadel/oidc/v3/pkg/client/rp"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
var ( var (

4
example/client/device/device.go
View file

@ -11,8 +11,8 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/zitadel/oidc/v2/pkg/client/rp" "github.com/zitadel/oidc/v3/pkg/client/rp"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
) )
var ( var (

8
example/client/github/github.go
View file

@ -10,10 +10,10 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
githubOAuth "golang.org/x/oauth2/github" githubOAuth "golang.org/x/oauth2/github"
"github.com/zitadel/oidc/v2/pkg/client/rp" "github.com/zitadel/oidc/v3/pkg/client/rp"
"github.com/zitadel/oidc/v2/pkg/client/rp/cli" "github.com/zitadel/oidc/v3/pkg/client/rp/cli"
"github.com/zitadel/oidc/v2/pkg/http" "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
var ( var (

2
example/client/service/service.go
View file

@ -13,7 +13,7 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/zitadel/oidc/v2/pkg/client/profile" "github.com/zitadel/oidc/v3/pkg/client/profile"
) )
var client = http.DefaultClient var client = http.DefaultClient

2
example/server/dynamic/login.go
View file

@ -8,7 +8,7 @@ import (
"github.com/go-chi/chi" "github.com/go-chi/chi"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
const ( const (

4
example/server/dynamic/op.go
View file

@ -10,8 +10,8 @@ import (
"github.com/go-chi/chi" "github.com/go-chi/chi"
"golang.org/x/text/language" "golang.org/x/text/language"
"github.com/zitadel/oidc/v2/example/server/storage" "github.com/zitadel/oidc/v3/example/server/storage"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
const ( const (

2
example/server/exampleop/device.go
View file

@ -10,7 +10,7 @@ import (
"github.com/go-chi/chi" "github.com/go-chi/chi"
"github.com/gorilla/securecookie" "github.com/gorilla/securecookie"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
type deviceAuthenticate interface { type deviceAuthenticate interface {

4
example/server/exampleop/op.go
View file

@ -9,8 +9,8 @@ import (
"github.com/go-chi/chi" "github.com/go-chi/chi"
"golang.org/x/text/language" "golang.org/x/text/language"
"github.com/zitadel/oidc/v2/example/server/storage" "github.com/zitadel/oidc/v3/example/server/storage"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
const ( const (

4
example/server/main.go
View file

@ -5,8 +5,8 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/zitadel/oidc/v2/example/server/exampleop" "github.com/zitadel/oidc/v3/example/server/exampleop"
"github.com/zitadel/oidc/v2/example/server/storage" "github.com/zitadel/oidc/v3/example/server/storage"
) )
func main() { func main() {

4
example/server/storage/client.go
View file

@ -3,8 +3,8 @@ package storage
import ( import (
"time" "time"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
var ( var (

4
example/server/storage/oidc.go
View file

@ -5,8 +5,8 @@ import (
"golang.org/x/text/language" "golang.org/x/text/language"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
const ( const (

4
example/server/storage/storage.go
View file

@ -14,8 +14,8 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
// serviceKey1 is a public key which will be used for the JWT Profile Authorization Grant // serviceKey1 is a public key which will be used for the JWT Profile Authorization Grant

4
example/server/storage/storage_dynamic.go
View file

@ -6,8 +6,8 @@ import (
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
type multiStorage struct { type multiStorage struct {

2
go.mod
View file

@ -1,4 +1,4 @@
module github.com/zitadel/oidc/v2 module github.com/zitadel/oidc/v3
go 1.18 go 1.18

4
internal/testutil/gen/gen.go
View file

@ -8,8 +8,8 @@ import (
"fmt" "fmt"
"os" "os"
tu "github.com/zitadel/oidc/v2/internal/testutil" tu "github.com/zitadel/oidc/v3/internal/testutil"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
var custom = map[string]any{ var custom = map[string]any{

2
internal/testutil/token.go
View file

@ -8,7 +8,7 @@ import (
"errors" "errors"
"time" "time"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
) )

6
pkg/client/client.go
View file

@ -14,9 +14,9 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/crypto" "github.com/zitadel/oidc/v3/pkg/crypto"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
var Encoder = httphelper.Encoder(oidc.NewEncoder()) var Encoder = httphelper.Encoder(oidc.NewEncoder())

14
pkg/client/integration_test.go
View file

@ -18,13 +18,13 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/zitadel/oidc/v2/example/server/exampleop" "github.com/zitadel/oidc/v3/example/server/exampleop"
"github.com/zitadel/oidc/v2/example/server/storage" "github.com/zitadel/oidc/v3/example/server/storage"
"github.com/zitadel/oidc/v2/pkg/client/rp" "github.com/zitadel/oidc/v3/pkg/client/rp"
"github.com/zitadel/oidc/v2/pkg/client/rs" "github.com/zitadel/oidc/v3/pkg/client/rs"
"github.com/zitadel/oidc/v2/pkg/client/tokenexchange" "github.com/zitadel/oidc/v3/pkg/client/tokenexchange"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
func TestRelyingPartySession(t *testing.T) { func TestRelyingPartySession(t *testing.T) {

4
pkg/client/jwt_profile.go
View file

@ -5,8 +5,8 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/zitadel/oidc/v2/pkg/http" "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
// JWTProfileExchange handles the oauth2 jwt profile exchange // JWTProfileExchange handles the oauth2 jwt profile exchange

4
pkg/client/profile/jwt_profile.go
View file

@ -7,8 +7,8 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/client" "github.com/zitadel/oidc/v3/pkg/client"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
// jwtProfileTokenSource implement the oauth2.TokenSource // jwtProfileTokenSource implement the oauth2.TokenSource

6
pkg/client/rp/cli/cli.go
View file

@ -4,9 +4,9 @@ import (
"context" "context"
"net/http" "net/http"
"github.com/zitadel/oidc/v2/pkg/client/rp" "github.com/zitadel/oidc/v3/pkg/client/rp"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
const ( const (

2
pkg/client/rp/delegation.go
View file

@ -1,7 +1,7 @@
package rp package rp
import ( import (
"github.com/zitadel/oidc/v2/pkg/oidc/grants/tokenexchange" "github.com/zitadel/oidc/v3/pkg/oidc/grants/tokenexchange"
) )
// DelegationTokenRequest is an implementation of TokenExchangeRequest // DelegationTokenRequest is an implementation of TokenExchangeRequest

4
pkg/client/rp/device.go
View file

@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/zitadel/oidc/v2/pkg/client" "github.com/zitadel/oidc/v3/pkg/client"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
func newDeviceClientCredentialsRequest(scopes []string, rp RelyingParty) (*oidc.ClientCredentialsRequest, error) { func newDeviceClientCredentialsRequest(scopes []string, rp RelyingParty) (*oidc.ClientCredentialsRequest, error) {

4
pkg/client/rp/jwks.go
View file

@ -9,8 +9,8 @@ import (
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
func NewRemoteKeySet(client *http.Client, jwksURL string, opts ...func(*remoteKeySet)) oidc.KeySet { func NewRemoteKeySet(client *http.Client, jwksURL string, opts ...func(*remoteKeySet)) oidc.KeySet {

6
pkg/client/rp/relying_party.go
View file

@ -14,9 +14,9 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/client" "github.com/zitadel/oidc/v3/pkg/client"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
const ( const (

2
pkg/client/rp/tockenexchange.go
View file

@ -5,7 +5,7 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/zitadel/oidc/v2/pkg/oidc/grants/tokenexchange" "github.com/zitadel/oidc/v3/pkg/oidc/grants/tokenexchange"
) )
// TokenExchangeRP extends the `RelyingParty` interface for the *draft* oauth2 `Token Exchange` // TokenExchangeRP extends the `RelyingParty` interface for the *draft* oauth2 `Token Exchange`

2
pkg/client/rp/verifier.go
View file

@ -6,7 +6,7 @@ import (
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type IDTokenVerifier interface { type IDTokenVerifier interface {

4
pkg/client/rp/verifier_test.go
View file

@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
tu "github.com/zitadel/oidc/v2/internal/testutil" tu "github.com/zitadel/oidc/v3/internal/testutil"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
) )

6
pkg/client/rp/verifier_tokens_example_test.go
View file

@ -4,9 +4,9 @@ import (
"context" "context"
"fmt" "fmt"
tu "github.com/zitadel/oidc/v2/internal/testutil" tu "github.com/zitadel/oidc/v3/internal/testutil"
"github.com/zitadel/oidc/v2/pkg/client/rp" "github.com/zitadel/oidc/v3/pkg/client/rp"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
// MyCustomClaims extends the TokenClaims base, // MyCustomClaims extends the TokenClaims base,

6
pkg/client/rs/resource_server.go
View file

@ -6,9 +6,9 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/zitadel/oidc/v2/pkg/client" "github.com/zitadel/oidc/v3/pkg/client"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type ResourceServer interface { type ResourceServer interface {

6
pkg/client/tokenexchange/tokenexchange.go
View file

@ -4,9 +4,9 @@ import (
"errors" "errors"
"net/http" "net/http"
"github.com/zitadel/oidc/v2/pkg/client" "github.com/zitadel/oidc/v3/pkg/client"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type TokenExchanger interface { type TokenExchanger interface {

2
pkg/oidc/code_challenge.go
View file

@ -3,7 +3,7 @@ package oidc
import ( import (
"crypto/sha256" "crypto/sha256"
"github.com/zitadel/oidc/v2/pkg/crypto" "github.com/zitadel/oidc/v3/pkg/crypto"
) )
const ( const (

2
pkg/oidc/token.go
View file

@ -8,7 +8,7 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/crypto" "github.com/zitadel/oidc/v3/pkg/crypto"
) )
const ( const (

2
pkg/oidc/verifier.go
View file

@ -12,7 +12,7 @@ import (
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
str "github.com/zitadel/oidc/v2/pkg/strings" str "github.com/zitadel/oidc/v3/pkg/strings"
) )
type Claims interface { type Claims interface {

6
pkg/op/auth_request.go
View file

@ -11,9 +11,9 @@ import (
"strings" "strings"
"time" "time"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
str "github.com/zitadel/oidc/v2/pkg/strings" str "github.com/zitadel/oidc/v3/pkg/strings"
) )
type AuthRequest interface { type AuthRequest interface {

8
pkg/op/auth_request_test.go
View file

@ -12,10 +12,10 @@ import (
"github.com/gorilla/schema" "github.com/gorilla/schema"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
"github.com/zitadel/oidc/v2/pkg/op/mock" "github.com/zitadel/oidc/v3/pkg/op/mock"
) )
// //

4
pkg/op/client.go
View file

@ -7,8 +7,8 @@ import (
"net/url" "net/url"
"time" "time"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
//go:generate go get github.com/dmarkham/enumer //go:generate go get github.com/dmarkham/enumer

8
pkg/op/client_test.go
View file

@ -14,10 +14,10 @@ import (
"github.com/gorilla/schema" "github.com/gorilla/schema"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
"github.com/zitadel/oidc/v2/pkg/op/mock" "github.com/zitadel/oidc/v3/pkg/op/mock"
) )
type testClientJWTProfile struct{} type testClientJWTProfile struct{}

2
pkg/op/crypto.go
View file

@ -1,7 +1,7 @@
package op package op
import ( import (
"github.com/zitadel/oidc/v2/pkg/crypto" "github.com/zitadel/oidc/v3/pkg/crypto"
) )
type Crypto interface { type Crypto interface {

4
pkg/op/device.go
View file

@ -11,8 +11,8 @@ import (
"strings" "strings"
"time" "time"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type DeviceAuthorizationConfig struct { type DeviceAuthorizationConfig struct {

4
pkg/op/device_test.go
View file

@ -15,8 +15,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
func Test_deviceAuthorizationHandler(t *testing.T) { func Test_deviceAuthorizationHandler(t *testing.T) {

4
pkg/op/discovery.go
View file

@ -6,8 +6,8 @@ import (
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type DiscoverStorage interface { type DiscoverStorage interface {

6
pkg/op/discovery_test.go
View file

@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
"github.com/zitadel/oidc/v2/pkg/op/mock" "github.com/zitadel/oidc/v3/pkg/op/mock"
) )
func TestDiscover(t *testing.T) { func TestDiscover(t *testing.T) {

2
pkg/op/endpoint_test.go
View file

@ -3,7 +3,7 @@ package op_test
import ( import (
"testing" "testing"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
func TestEndpoint_Path(t *testing.T) { func TestEndpoint_Path(t *testing.T) {

4
pkg/op/error.go
View file

@ -3,8 +3,8 @@ package op
import ( import (
"net/http" "net/http"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type ErrAuthRequest interface { type ErrAuthRequest interface {

2
pkg/op/keys.go
View file

@ -6,7 +6,7 @@ import (
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
) )
type KeyProvider interface { type KeyProvider interface {

6
pkg/op/keys_test.go
View file

@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
"github.com/zitadel/oidc/v2/pkg/op/mock" "github.com/zitadel/oidc/v3/pkg/op/mock"
) )
func TestKeys(t *testing.T) { func TestKeys(t *testing.T) {

6
pkg/op/mock/authorizer.mock.go
View file

@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT. // Code generated by MockGen. DO NOT EDIT.
// Source: github.com/zitadel/oidc/v2/pkg/op (interfaces: Authorizer) // Source: github.com/zitadel/oidc/v3/pkg/op (interfaces: Authorizer)
// Package mock is a generated GoMock package. // Package mock is a generated GoMock package.
package mock package mock
@ -9,8 +9,8 @@ import (
reflect "reflect" reflect "reflect"
gomock "github.com/golang/mock/gomock" gomock "github.com/golang/mock/gomock"
http "github.com/zitadel/oidc/v2/pkg/http" http "github.com/zitadel/oidc/v3/pkg/http"
op "github.com/zitadel/oidc/v2/pkg/op" op "github.com/zitadel/oidc/v3/pkg/op"
) )
// MockAuthorizer is a mock of Authorizer interface. // MockAuthorizer is a mock of Authorizer interface.

4
pkg/op/mock/authorizer.mock.impl.go
View file

@ -8,8 +8,8 @@ import (
"github.com/gorilla/schema" "github.com/gorilla/schema"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
func NewAuthorizer(t *testing.T) op.Authorizer { func NewAuthorizer(t *testing.T) op.Authorizer {

4
pkg/op/mock/client.go
View file

@ -5,8 +5,8 @@ import (
"github.com/golang/mock/gomock" "github.com/golang/mock/gomock"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
func NewClient(t *testing.T) op.Client { func NewClient(t *testing.T) op.Client {

6
pkg/op/mock/client.mock.go
View file

@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT. // Code generated by MockGen. DO NOT EDIT.
// Source: github.com/zitadel/oidc/v2/pkg/op (interfaces: Client) // Source: github.com/zitadel/oidc/v3/pkg/op (interfaces: Client)
// Package mock is a generated GoMock package. // Package mock is a generated GoMock package.
package mock package mock
@ -9,8 +9,8 @@ import (
time "time" time "time"
gomock "github.com/golang/mock/gomock" gomock "github.com/golang/mock/gomock"
oidc "github.com/zitadel/oidc/v2/pkg/oidc" oidc "github.com/zitadel/oidc/v3/pkg/oidc"
op "github.com/zitadel/oidc/v2/pkg/op" op "github.com/zitadel/oidc/v3/pkg/op"
) )
// MockClient is a mock of Client interface. // MockClient is a mock of Client interface.

4
pkg/op/mock/configuration.mock.go
View file

@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT. // Code generated by MockGen. DO NOT EDIT.
// Source: github.com/zitadel/oidc/v2/pkg/op (interfaces: Configuration) // Source: github.com/zitadel/oidc/v3/pkg/op (interfaces: Configuration)
// Package mock is a generated GoMock package. // Package mock is a generated GoMock package.
package mock package mock
@ -9,7 +9,7 @@ import (
reflect "reflect" reflect "reflect"
gomock "github.com/golang/mock/gomock" gomock "github.com/golang/mock/gomock"
op "github.com/zitadel/oidc/v2/pkg/op" op "github.com/zitadel/oidc/v3/pkg/op"
language "golang.org/x/text/language" language "golang.org/x/text/language"
) )

2
pkg/op/mock/discovery.mock.go
View file

@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT. // Code generated by MockGen. DO NOT EDIT.
// Source: github.com/zitadel/oidc/v2/pkg/op (interfaces: DiscoverStorage) // Source: github.com/zitadel/oidc/v3/pkg/op (interfaces: DiscoverStorage)
// Package mock is a generated GoMock package. // Package mock is a generated GoMock package.
package mock package mock

14
pkg/op/mock/generate.go
View file

@ -1,10 +1,10 @@
package mock package mock
//go:generate go install github.com/golang/mock/mockgen@v1.6.0 //go:generate go install github.com/golang/mock/mockgen@v1.6.0
//go:generate mockgen -package mock -destination ./storage.mock.go github.com/zitadel/oidc/v2/pkg/op Storage //go:generate mockgen -package mock -destination ./storage.mock.go github.com/zitadel/oidc/v3/pkg/op Storage
//go:generate mockgen -package mock -destination ./authorizer.mock.go github.com/zitadel/oidc/v2/pkg/op Authorizer //go:generate mockgen -package mock -destination ./authorizer.mock.go github.com/zitadel/oidc/v3/pkg/op Authorizer
//go:generate mockgen -package mock -destination ./client.mock.go github.com/zitadel/oidc/v2/pkg/op Client //go:generate mockgen -package mock -destination ./client.mock.go github.com/zitadel/oidc/v3/pkg/op Client
//go:generate mockgen -package mock -destination ./configuration.mock.go github.com/zitadel/oidc/v2/pkg/op Configuration //go:generate mockgen -package mock -destination ./configuration.mock.go github.com/zitadel/oidc/v3/pkg/op Configuration
//go:generate mockgen -package mock -destination ./discovery.mock.go github.com/zitadel/oidc/v2/pkg/op DiscoverStorage //go:generate mockgen -package mock -destination ./discovery.mock.go github.com/zitadel/oidc/v3/pkg/op DiscoverStorage
//go:generate mockgen -package mock -destination ./signer.mock.go github.com/zitadel/oidc/v2/pkg/op SigningKey,Key //go:generate mockgen -package mock -destination ./signer.mock.go github.com/zitadel/oidc/v3/pkg/op SigningKey,Key
//go:generate mockgen -package mock -destination ./key.mock.go github.com/zitadel/oidc/v2/pkg/op KeyProvider //go:generate mockgen -package mock -destination ./key.mock.go github.com/zitadel/oidc/v3/pkg/op KeyProvider

4
pkg/op/mock/key.mock.go
View file

@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT. // Code generated by MockGen. DO NOT EDIT.
// Source: github.com/zitadel/oidc/v2/pkg/op (interfaces: KeyProvider) // Source: github.com/zitadel/oidc/v3/pkg/op (interfaces: KeyProvider)
// Package mock is a generated GoMock package. // Package mock is a generated GoMock package.
package mock package mock
@ -9,7 +9,7 @@ import (
reflect "reflect" reflect "reflect"
gomock "github.com/golang/mock/gomock" gomock "github.com/golang/mock/gomock"
op "github.com/zitadel/oidc/v2/pkg/op" op "github.com/zitadel/oidc/v3/pkg/op"
) )
// MockKeyProvider is a mock of KeyProvider interface. // MockKeyProvider is a mock of KeyProvider interface.

2
pkg/op/mock/signer.mock.go
View file

@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT. // Code generated by MockGen. DO NOT EDIT.
// Source: github.com/zitadel/oidc/v2/pkg/op (interfaces: SigningKey,Key) // Source: github.com/zitadel/oidc/v3/pkg/op (interfaces: SigningKey,Key)
// Package mock is a generated GoMock package. // Package mock is a generated GoMock package.
package mock package mock

6
pkg/op/mock/storage.mock.go
View file

@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT. // Code generated by MockGen. DO NOT EDIT.
// Source: github.com/zitadel/oidc/v2/pkg/op (interfaces: Storage) // Source: github.com/zitadel/oidc/v3/pkg/op (interfaces: Storage)
// Package mock is a generated GoMock package. // Package mock is a generated GoMock package.
package mock package mock
@ -10,8 +10,8 @@ import (
time "time" time "time"
gomock "github.com/golang/mock/gomock" gomock "github.com/golang/mock/gomock"
oidc "github.com/zitadel/oidc/v2/pkg/oidc" oidc "github.com/zitadel/oidc/v3/pkg/oidc"
op "github.com/zitadel/oidc/v2/pkg/op" op "github.com/zitadel/oidc/v3/pkg/op"
jose "gopkg.in/square/go-jose.v2" jose "gopkg.in/square/go-jose.v2"
) )

4
pkg/op/mock/storage.mock.impl.go
View file

@ -8,8 +8,8 @@ import (
"github.com/golang/mock/gomock" "github.com/golang/mock/gomock"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
func NewStorage(t *testing.T) op.Storage { func NewStorage(t *testing.T) op.Storage {

4
pkg/op/op.go
View file

@ -12,8 +12,8 @@ import (
"golang.org/x/text/language" "golang.org/x/text/language"
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
const ( const (

6
pkg/op/op_test.go
View file

@ -14,9 +14,9 @@ import (
"github.com/muhlemmer/gu" "github.com/muhlemmer/gu"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/zitadel/oidc/v2/example/server/storage" "github.com/zitadel/oidc/v3/example/server/storage"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
"golang.org/x/text/language" "golang.org/x/text/language"
) )

2
pkg/op/probes.go
View file

@ -5,7 +5,7 @@ import (
"errors" "errors"
"net/http" "net/http"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
) )
type ProbesFn func(context.Context) error type ProbesFn func(context.Context) error

4
pkg/op/session.go
View file

@ -6,8 +6,8 @@ import (
"net/url" "net/url"
"path" "path"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type SessionEnder interface { type SessionEnder interface {

2
pkg/op/storage.go
View file

@ -7,7 +7,7 @@ import (
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type AuthStorage interface { type AuthStorage interface {

6
pkg/op/token.go
View file

@ -4,9 +4,9 @@ import (
"context" "context"
"time" "time"
"github.com/zitadel/oidc/v2/pkg/crypto" "github.com/zitadel/oidc/v3/pkg/crypto"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/strings" "github.com/zitadel/oidc/v3/pkg/strings"
) )
type TokenCreator interface { type TokenCreator interface {

4
pkg/op/token_client_credentials.go
View file

@ -5,8 +5,8 @@ import (
"net/http" "net/http"
"net/url" "net/url"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
// ClientCredentialsExchange handles the OAuth 2.0 client_credentials grant, including // ClientCredentialsExchange handles the OAuth 2.0 client_credentials grant, including

4
pkg/op/token_code.go
View file

@ -4,8 +4,8 @@ import (
"context" "context"
"net/http" "net/http"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
// CodeExchange handles the OAuth 2.0 authorization_code grant, including // CodeExchange handles the OAuth 2.0 authorization_code grant, including

4
pkg/op/token_exchange.go
View file

@ -7,8 +7,8 @@ import (
"strings" "strings"
"time" "time"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type TokenExchangeRequest interface { type TokenExchangeRequest interface {

4
pkg/op/token_intospection.go
View file

@ -5,8 +5,8 @@ import (
"errors" "errors"
"net/http" "net/http"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type Introspector interface { type Introspector interface {

4
pkg/op/token_jwt_profile.go
View file

@ -5,8 +5,8 @@ import (
"net/http" "net/http"
"time" "time"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type JWTAuthorizationGrantExchanger interface { type JWTAuthorizationGrantExchanger interface {

6
pkg/op/token_refresh.go
View file

@ -6,9 +6,9 @@ import (
"net/http" "net/http"
"time" "time"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/strings" "github.com/zitadel/oidc/v3/pkg/strings"
) )
type RefreshTokenRequest interface { type RefreshTokenRequest interface {

4
pkg/op/token_request.go
View file

@ -5,8 +5,8 @@ import (
"net/http" "net/http"
"net/url" "net/url"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type Exchanger interface { type Exchanger interface {

4
pkg/op/token_revocation.go
View file

@ -7,8 +7,8 @@ import (
"net/url" "net/url"
"strings" "strings"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type Revoker interface { type Revoker interface {

4
pkg/op/userinfo.go
View file

@ -6,8 +6,8 @@ import (
"net/http" "net/http"
"strings" "strings"
httphelper "github.com/zitadel/oidc/v2/pkg/http" httphelper "github.com/zitadel/oidc/v3/pkg/http"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type UserinfoProvider interface { type UserinfoProvider interface {

2
pkg/op/verifier_access_token.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type AccessTokenVerifier interface { type AccessTokenVerifier interface {

6
pkg/op/verifier_access_token_example_test.go
View file

@ -4,9 +4,9 @@ import (
"context" "context"
"fmt" "fmt"
tu "github.com/zitadel/oidc/v2/internal/testutil" tu "github.com/zitadel/oidc/v3/internal/testutil"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/zitadel/oidc/v2/pkg/op" "github.com/zitadel/oidc/v3/pkg/op"
) )
// MyCustomClaims extends the TokenClaims base, // MyCustomClaims extends the TokenClaims base,

4
pkg/op/verifier_access_token_test.go
View file

@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
tu "github.com/zitadel/oidc/v2/internal/testutil" tu "github.com/zitadel/oidc/v3/internal/testutil"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
func TestNewAccessTokenVerifier(t *testing.T) { func TestNewAccessTokenVerifier(t *testing.T) {

2
pkg/op/verifier_id_token_hint.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type IDTokenHintVerifier interface { type IDTokenHintVerifier interface {

4
pkg/op/verifier_id_token_hint_test.go
View file

@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
tu "github.com/zitadel/oidc/v2/internal/testutil" tu "github.com/zitadel/oidc/v3/internal/testutil"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
func TestNewIDTokenHintVerifier(t *testing.T) { func TestNewIDTokenHintVerifier(t *testing.T) {

2
pkg/op/verifier_jwt_profile.go
View file

@ -8,7 +8,7 @@ import (
"gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2"
"github.com/zitadel/oidc/v2/pkg/oidc" "github.com/zitadel/oidc/v3/pkg/oidc"
) )
type JWTProfileVerifier interface { type JWTProfileVerifier interface {