Skip to content

Commit b932d39

Browse files
author
Anders Qvist
committed
Use new oidcecho and remove old package oidcechojwt.
1 parent e122359 commit b932d39

File tree

20 files changed

+53
-427
lines changed

20 files changed

+53
-427
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,13 @@ func newClaimsHandler() fiber.Handler {
206206

207207
**Import**
208208

209-
`"github.com/xenitab/go-oidc-middleware/oidcechojwt"`
209+
`"github.com/xenitab/go-oidc-middleware/oidcecho"`
210210

211211
**Middleware**
212212

213213
```go
214214
e.Use(middleware.JWTWithConfig(middleware.JWTConfig{
215-
ParseTokenFunc: oidcechojwt.New(
215+
ParseTokenFunc: oidcecho.New(
216216
GetAzureADClaimsValidationFn(cfg.TenantID),
217217
options.WithIssuer(cfg.Issuer),
218218
options.WithRequiredTokenType("JWT"),

‎examples/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ There's a CLI utility that makes it easy to use the different OpenID Providers (
1414

1515
## Providers
1616

17-
When starting the api for one of the providers, change `[server]` to one of: `http`, `echojwt`, `gin` or `fiber`
17+
When starting the api for one of the providers, change `[server]` to one of: `http`, `echo`, `gin` or `fiber`
1818

1919
### Azure AD
2020

‎examples/api/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"os"
77

8-
"github.com/xenitab/go-oidc-middleware/oidcechojwt"
8+
"github.com/xenitab/go-oidc-middleware/oidcecho"
99
"github.com/xenitab/go-oidc-middleware/oidcfiber"
1010
"github.com/xenitab/go-oidc-middleware/oidcgin"
1111
"github.com/xenitab/go-oidc-middleware/oidchttp"
@@ -142,8 +142,8 @@ func getHandler[T any](cfg shared.RuntimeConfig, claimsValidationFn options.Clai
142142
oidcHandler := oidcgin.New(claimsValidationFn, opts...)
143143

144144
return shared.RunGin[T](oidcHandler, cfg.Address, cfg.Port)
145-
case shared.EchoJwtServer:
146-
oidcMiddleware := oidcechojwt.New(claimsValidationFn, opts...)
145+
case shared.EchoServer:
146+
oidcMiddleware := oidcecho.New(claimsValidationFn, opts...)
147147

148148
return shared.RunEcho[T](oidcMiddleware, cfg.Address, cfg.Port)
149149
case shared.FiberServer:

‎examples/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module examples
33
go 1.20
44

55
require (
6-
github.com/xenitab/go-oidc-middleware v0.0.40
7-
github.com/xenitab/go-oidc-middleware/oidcechojwt v0.0.40
8-
github.com/xenitab/go-oidc-middleware/oidcfiber v0.0.40
9-
github.com/xenitab/go-oidc-middleware/oidcgin v0.0.40
10-
github.com/xenitab/go-oidc-middleware/oidchttp v0.0.40
6+
github.com/xenitab/go-oidc-middleware v0.0.41
7+
github.com/xenitab/go-oidc-middleware/oidcecho v0.0.41
8+
github.com/xenitab/go-oidc-middleware/oidcfiber v0.0.41
9+
github.com/xenitab/go-oidc-middleware/oidcgin v0.0.41
10+
github.com/xenitab/go-oidc-middleware/oidchttp v0.0.41
1111
)
1212

1313
require (

‎examples/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,16 +137,16 @@ github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
137137
github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
138138
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
139139
github.com/xenitab/dispans v0.0.10 h1:S+gSUM14rDJWK7MYNrjb8JbjeQPip6mlNJyLX+g7Agc=
140-
github.com/xenitab/go-oidc-middleware v0.0.40 h1:9VvTv5Gxqlhl3Ltkr5tNEm64rQzZ2qgS/Qsty9BQRos=
141-
github.com/xenitab/go-oidc-middleware v0.0.40/go.mod h1:ir5fF6tpCQSHauFEfLaHbmND9pHEEaXHQqpjiOK+PY0=
142-
github.com/xenitab/go-oidc-middleware/oidcechojwt v0.0.40 h1:WuckYOQLhBBE82pyW46VTs/nrjsTF6rnNAGbGQVLWI0=
143-
github.com/xenitab/go-oidc-middleware/oidcechojwt v0.0.40/go.mod h1:QxbHd00onC7VW/omCr349G3csMT/ZoM3l3aA9H3SX5U=
144-
github.com/xenitab/go-oidc-middleware/oidcfiber v0.0.40 h1:dadtglqQORdriQ2XoD1tKMzf85qEwRID1hvanbUohy0=
145-
github.com/xenitab/go-oidc-middleware/oidcfiber v0.0.40/go.mod h1:24S2V8nVaIRIcwysMBhO39zagXQlx3zXF1aqrKk65qQ=
146-
github.com/xenitab/go-oidc-middleware/oidcgin v0.0.40 h1:31eDSFGXZeG5JIRKLfr2CniJZC6rNHsLjFKos3u9+Lc=
147-
github.com/xenitab/go-oidc-middleware/oidcgin v0.0.40/go.mod h1:wuTWzXwEgdL3HyIn2R78WcEnbDCO4H/w6yGukj1K1Vg=
148-
github.com/xenitab/go-oidc-middleware/oidchttp v0.0.40 h1:Abney1IoiRmiip0gyZU/R1vRUGuZ1cz+kUa6VKeMgyA=
149-
github.com/xenitab/go-oidc-middleware/oidchttp v0.0.40/go.mod h1:CA0TBPlEOWdyGyMZN0NRHAIVpvy+dN20rNVp+Fyx3Jo=
140+
github.com/xenitab/go-oidc-middleware v0.0.41 h1:k37zfu3fyRKlrD+B+abcgbIUOU2cSjPE7xaFpgA8TJM=
141+
github.com/xenitab/go-oidc-middleware v0.0.41/go.mod h1:+menF2rCe5yqS4jpVEtR0JgQS3dPZHuwty+4PQ4BbrE=
142+
github.com/xenitab/go-oidc-middleware/oidcecho v0.0.41 h1:KPLBAYKNtrMoc5wEu9+RAF1Wh165/8UsNSRl6Nf/zDo=
143+
github.com/xenitab/go-oidc-middleware/oidcecho v0.0.41/go.mod h1:AysP3bzlLWvnTF14MD8/O/ruwAisCr/da+BVhMwXuww=
144+
github.com/xenitab/go-oidc-middleware/oidcfiber v0.0.41 h1:VPZ4vMX8I4Yp0SyiV5MfhcYW1JcPvvO1X67A/E5DlBQ=
145+
github.com/xenitab/go-oidc-middleware/oidcfiber v0.0.41/go.mod h1:Vz754/FVFb2WLaMzFbqijZryHOlR+RF0v42Wb5/6amo=
146+
github.com/xenitab/go-oidc-middleware/oidcgin v0.0.41 h1:GVXQFNqS2YvXhG0XoSFbx4Y1WHd9Gn2hA1LiEAsdcxk=
147+
github.com/xenitab/go-oidc-middleware/oidcgin v0.0.41/go.mod h1:CAYeVCveJtDtreDBoYy4Rr/t00i5/knF18reUVS7uRE=
148+
github.com/xenitab/go-oidc-middleware/oidchttp v0.0.41 h1:K/x3LWOAs9NBq8XUpfSHmZzCFXvdyFvws6+DRT6Hx04=
149+
github.com/xenitab/go-oidc-middleware/oidchttp v0.0.41/go.mod h1:yc5BNJMcUiGNkNieA+o6vn0dypahn1t2XztjUXkC15Y=
150150
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
151151
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
152152
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=

‎examples/shared/runtime.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ import (
1111
type Server string
1212

1313
const (
14-
HttpServer Server = "http"
15-
GinServer Server = "gin"
16-
EchoJwtServer Server = "echojwt"
17-
FiberServer Server = "fiber"
14+
HttpServer Server = "http"
15+
GinServer Server = "gin"
16+
EchoServer Server = "echo"
17+
FiberServer Server = "fiber"
1818
)
1919

2020
func (s Server) Validate() error {
2121
switch s {
22-
case HttpServer, GinServer, EchoJwtServer, FiberServer:
22+
case HttpServer, GinServer, EchoServer, FiberServer:
2323
return nil
2424
default:
25-
return fmt.Errorf("not a supported server (%s), use one of: http, gin, echojwt, fiber", s)
25+
return fmt.Errorf("not a supported server (%s), use one of: http, gin, echo, fiber", s)
2626
}
2727
}
2828

‎examples/shared/server_echo_jwt.go‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎go.work‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use (
55
./examples
66
./internal/coverage
77
./oidcecho
8-
./oidcechojwt
98
./oidcfiber
109
./oidcgin
1110
./oidchttp

‎go.work.sum‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=
77
github.com/valyala/fasthttp v1.41.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seBFc2uWtgiY=
88
github.com/xenitab/go-oidc-middleware v0.0.28/go.mod h1:TSn3/nWnymRRFTLJ5GVJ88001QgqTRFr5wcd8kOJ/kY=
99
github.com/xenitab/go-oidc-middleware v0.0.33/go.mod h1:0TK8rKoVii+Z7iRdDvL1s2aN2EL7rZ3S7veae1vJzK8=
10+
github.com/xenitab/go-oidc-middleware v0.0.41/go.mod h1:+menF2rCe5yqS4jpVEtR0JgQS3dPZHuwty+4PQ4BbrE=
1011
github.com/xenitab/go-oidc-middleware/oidcechojwt v0.0.28/go.mod h1:SzCZBr0zP5VJGt2AgHyYtdgQdN+rce0ImUIUgwCx2gk=
1112
github.com/xenitab/go-oidc-middleware/oidcfiber v0.0.28/go.mod h1:gAZ4aymsh5I/A+vkapv5G3fnHyy51DKmOPZplFHWSw0=
1213
github.com/xenitab/go-oidc-middleware/oidcgin v0.0.28/go.mod h1:N9aQNc16SAdLpb20MjzXzgo9TNuuyCuTUKXGkD1kXBI=
@@ -23,4 +24,3 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
2324
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
2425
golang.org/x/time v0.0.0-20220411224347-583f2d630306 h1:+gHMid33q6pen7kv9xvT+JRinntgeXO2AeZVd0AWD3w=
2526
golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
26-
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=

‎internal/coverage/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module coverage
33
go 1.20
44

55
require (
6-
github.com/xenitab/go-oidc-middleware v0.0.40
7-
github.com/xenitab/go-oidc-middleware/oidcechojwt v0.0.40
8-
github.com/xenitab/go-oidc-middleware/oidcfiber v0.0.40
9-
github.com/xenitab/go-oidc-middleware/oidcgin v0.0.40
10-
github.com/xenitab/go-oidc-middleware/oidchttp v0.0.40
6+
github.com/xenitab/go-oidc-middleware v0.0.41
7+
github.com/xenitab/go-oidc-middleware/oidcecho v0.0.41
8+
github.com/xenitab/go-oidc-middleware/oidcfiber v0.0.41
9+
github.com/xenitab/go-oidc-middleware/oidcgin v0.0.41
10+
github.com/xenitab/go-oidc-middleware/oidchttp v0.0.41
1111
)
1212

1313
require (

0 commit comments

Comments
 (0)