Skip to content

Commit 950cf71

Browse files
roman-vanesyanroman-vanesyan
committed
fix: fix references after renames; update to a new conduit API
1 parent 3a0b5be commit 950cf71

File tree

9 files changed

+67
-43
lines changed

9 files changed

+67
-43
lines changed

‎go.mod

+8-9
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ module go.inout.gg/shield
33
go 1.23.1
44

55
require (
6-
github.com/a-h/templ v0.2.747
6+
github.com/a-h/templ v0.2.778
77
github.com/coreos/go-oidc/v3 v3.11.0
88
github.com/go-playground/mold/v4 v4.5.0
9-
github.com/go-playground/validator/v10 v10.22.0
9+
github.com/go-playground/validator/v10 v10.22.1
1010
github.com/go-webauthn/webauthn v0.11.2
1111
github.com/google/uuid v1.6.0
1212
github.com/jackc/pgx/v5 v5.7.1
1313
github.com/joho/godotenv v1.5.1
1414
github.com/stretchr/testify v1.9.0
15-
go.inout.gg/conduit v0.0.0-20241005222024-59593f2d1c1c
15+
go.inout.gg/conduit v0.0.0-20241011174716-52bc52d23ab9
1616
go.inout.gg/foundations v0.0.0-20240922153347-0be999149d7c
17-
golang.org/x/crypto v0.27.0
18-
golang.org/x/oauth2 v0.22.0
19-
golang.org/x/text v0.18.0
17+
golang.org/x/crypto v0.28.0
18+
golang.org/x/oauth2 v0.23.0
19+
golang.org/x/text v0.19.0
2020
)
2121

2222
require (
@@ -39,16 +39,15 @@ require (
3939
github.com/leodido/go-urn v1.4.0 // indirect
4040
github.com/mitchellh/mapstructure v1.5.0 // indirect
4141
github.com/pmezard/go-difflib v1.0.0 // indirect
42-
github.com/rogpeppe/go-internal v1.13.1 // indirect
4342
github.com/russross/blackfriday/v2 v2.1.0 // indirect
4443
github.com/samber/lo v1.47.0 // indirect
4544
github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734 // indirect
4645
github.com/segmentio/go-snakecase v1.2.0 // indirect
4746
github.com/urfave/cli/v2 v2.27.4 // indirect
4847
github.com/x448/float16 v0.8.4 // indirect
4948
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
50-
golang.org/x/net v0.27.0 // indirect
49+
golang.org/x/net v0.28.0 // indirect
5150
golang.org/x/sync v0.8.0 // indirect
52-
golang.org/x/sys v0.25.0 // indirect
51+
golang.org/x/sys v0.26.0 // indirect
5352
gopkg.in/yaml.v3 v3.0.1 // indirect
5453
)

‎go.sum

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/a-h/templ v0.2.747 h1:D0dQ2lxC3W7Dxl6fxQ/1zZHBQslSkTSvl5FxP/CfdKg=
2-
github.com/a-h/templ v0.2.747/go.mod h1:69ObQIbrcuwPCU32ohNaWce3Cb7qM5GMiqN1K+2yop4=
1+
github.com/a-h/templ v0.2.778 h1:VzhOuvWECrwOec4790lcLlZpP4Iptt5Q4K9aFxQmtaM=
2+
github.com/a-h/templ v0.2.778/go.mod h1:lq48JXoUvuQrU0VThrK31yFwdRjTCnIE5bcPCM9IP1w=
33
github.com/caarlos0/env/v11 v11.1.0 h1:a5qZqieE9ZfzdvbbdhTalRrHT5vu/4V1/ad1Ka6frhI=
44
github.com/caarlos0/env/v11 v11.1.0/go.mod h1:LwgkYk1kDvfGpHthrWWLof3Ny7PezzFwS4QrsJdHTMo=
55
github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
@@ -23,8 +23,8 @@ github.com/go-playground/mold/v4 v4.5.0 h1:ZXwf0uZWWxIahglRigOeuFpIuPZxvEGQJ4FxS
2323
github.com/go-playground/mold/v4 v4.5.0/go.mod h1:qUluiWEozHr7EVk1vJzJgW/kWsPwMdpTjx8LV0NEulA=
2424
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
2525
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
26-
github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
27-
github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
26+
github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
27+
github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
2828
github.com/go-webauthn/webauthn v0.11.2 h1:Fgx0/wlmkClTKlnOsdOQ+K5HcHDsDcYIvtYmfhEOSUc=
2929
github.com/go-webauthn/webauthn v0.11.2/go.mod h1:aOtudaF94pM71g3jRwTYYwQTG1KyTILTcZqN1srkmD0=
3030
github.com/go-webauthn/x v0.1.14 h1:1wrB8jzXAofojJPAaRxnZhRgagvLGnLjhCAwg3kTpT0=
@@ -61,8 +61,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
6161
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
6262
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
6363
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
64-
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
65-
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
64+
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
65+
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
6666
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
6767
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
6868
github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
@@ -82,22 +82,22 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
8282
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
8383
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
8484
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
85-
go.inout.gg/conduit v0.0.0-20241005222024-59593f2d1c1c h1:oGSiGChsI/gVGI/optS68IPRe55OsOefyPeq6ALTccQ=
86-
go.inout.gg/conduit v0.0.0-20241005222024-59593f2d1c1c/go.mod h1:WKBNQOuiROnR9hJ0oJpLkI7k4+gXS7tnk8Ma+8RRaWQ=
85+
go.inout.gg/conduit v0.0.0-20241011174716-52bc52d23ab9 h1:nYmfjoOrKiCUGAIDWLiyu+RrdN9TQ9WRwK5KUAH0n5Y=
86+
go.inout.gg/conduit v0.0.0-20241011174716-52bc52d23ab9/go.mod h1:qEwpFTi4ynxp2ad6/bFfWdyiZmWcO7+m+XVm+hO/+oI=
8787
go.inout.gg/foundations v0.0.0-20240922153347-0be999149d7c h1:xkhJcJgpXchg5mL4xxzxlmMtFepJLewCUVa81bv03Q4=
8888
go.inout.gg/foundations v0.0.0-20240922153347-0be999149d7c/go.mod h1:/6QZOnj4l6OJz8iogY0uArlkPeUsxz1PTA2EHWotD7Q=
89-
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
90-
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
91-
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
92-
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
93-
golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
94-
golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
89+
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
90+
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
91+
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
92+
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
93+
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
94+
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
9595
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
9696
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
97-
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
98-
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
99-
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
100-
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
97+
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
98+
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
99+
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
100+
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
101101
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
102102
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
103103
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎shieldmigrate/migrator.go

+30-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,25 @@ import (
88
"go.inout.gg/shield/internal/migrations"
99
)
1010

11+
// Migrator is a database migration utility to roll up and down shield's
12+
// migrations in order.
1113
type Migrator struct {
12-
base conduit.Migrator
14+
base *conduit.Migrator
1315
}
1416

17+
// MigrateOptions specifies options for migration operation.
18+
type MigrateOptions struct {
19+
Steps int
20+
}
21+
22+
// toConduit converts these options to a conduit migration options.
23+
func (opts *MigrateOptions) toConduit() *conduit.MigrateOptions {
24+
return &conduit.MigrateOptions{
25+
Steps: opts.Steps,
26+
}
27+
}
28+
29+
// New creates a new conduit migrator.
1530
func New() *Migrator {
1631
base := conduit.NewMigrator(conduit.NewConfig(func(c *conduit.Config) {
1732
c.Registry = migrations.Registry
@@ -20,12 +35,22 @@ func New() *Migrator {
2035
return &Migrator{base}
2136
}
2237

23-
func (m *Migrator) Up(ctx context.Context, conn *pgx.Conn) error {
24-
_, err := m.base.Migrate(ctx, conduit.DirectionUp, conn)
38+
func (m *Migrator) Up(ctx context.Context, conn *pgx.Conn, opts *MigrateOptions) error {
39+
var migrateOpts *conduit.MigrateOptions
40+
if opts != nil {
41+
migrateOpts = opts.toConduit()
42+
}
43+
44+
_, err := m.base.Migrate(ctx, conduit.DirectionUp, conn, migrateOpts)
2545
return err
2646
}
2747

28-
func (m *Migrator) Down(ctx context.Context, conn *pgx.Conn) error {
29-
_, err := m.base.Migrate(ctx, conduit.DirectionDown, conn)
48+
func (m *Migrator) Down(ctx context.Context, conn *pgx.Conn, opts *MigrateOptions) error {
49+
var migrateOpts *conduit.MigrateOptions
50+
if opts != nil {
51+
migrateOpts = opts.toConduit()
52+
}
53+
54+
_, err := m.base.Migrate(ctx, conduit.DirectionDown, conn, migrateOpts)
3055
return err
3156
}

‎shieldpasskey/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (h *Handler) HandleStartUserLogin(ctx context.Context, email string) error
3737
}
3838

3939
user := &user{row}
40-
opts, sd, err := h.wa.BeginLogin(user, nil)
40+
_, _, err = h.wa.BeginLogin(user, nil)
4141
if err != nil {
4242
return fmt.Errorf("shield/passkey: unable to initialize passkey login flow: %w", err)
4343
}

‎shieldpasswordreset/form_handler.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import (
66
"net/http"
77

88
"go.inout.gg/foundations/http/httperror"
9+
"go.inout.gg/shield"
910
"go.inout.gg/shield/db/driver"
10-
"go.inout.gg/shield/shieldsender"
1111
"go.inout.gg/shield/shieldpassword"
12+
"go.inout.gg/shield/shieldsender"
1213
)
1314

1415
const (

‎shieldsso/google/google.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ import (
99
"golang.org/x/oauth2"
1010
)
1111

12-
var _ sso.Provider[any] = (*provider[any])(nil)
12+
var _ shieldsso.Provider[any] = (*provider[any])(nil)
1313

14-
var (
15-
Issuer = "https://accounts.google.com"
16-
)
14+
var Issuer = "https://accounts.google.com"
1715

1816
var (
1917
AuthorizePath = "/sso/google"
@@ -34,7 +32,7 @@ type provider[T any] struct {
3432
}
3533

3634
// NewProvider creates a new OpenID OAuth2 provider.
37-
func NewProvider[T any](ctx context.Context, cfg *Config) (sso.Provider[T], error) {
35+
func NewProvider[T any](ctx context.Context, cfg *Config) (shieldsso.Provider[T], error) {
3836
oidcProvider, err := oidc.NewProvider(ctx, Issuer)
3937
if err != nil {
4038
return nil, err
@@ -54,7 +52,7 @@ func NewProvider[T any](ctx context.Context, cfg *Config) (sso.Provider[T], erro
5452
}, nil
5553
}
5654

57-
func (p *provider[T]) UserInfo(ctx context.Context, token *oauth2.Token) (sso.UserInfo[T], error) {
55+
func (p *provider[T]) UserInfo(ctx context.Context, token *oauth2.Token) (shieldsso.UserInfo[T], error) {
5856
// TODO([email protected]): use userInfo.
5957
_, err := p.provider.UserInfo(ctx, p.config.TokenSource(ctx, token))
6058
if err != nil {

‎shieldsso/sso.go ‎shieldsso/shieldsso.go

File renamed without changes.

‎shieldstrategy/token/token.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import (
77
"net/http"
88

99
"go.inout.gg/shield"
10-
"go.inout.gg/shield/shieldstrategy"
10+
"go.inout.gg/shield/shieldstrategy"
11+
"go.inout.gg/shield/shieldtoken"
1112
)
1213

1314
var _ shieldstrategy.Authenticator[any] = (*tokenStrategy[any])(nil)
@@ -32,7 +33,7 @@ type Token struct {
3233
}
3334

3435
type Issuer[T any] interface {
35-
Issue(ctx context.Context, user *shieldstrategy.User[T]) (*Token, error)
36+
Issue(ctx context.Context, user *shield.User[T]) (*Token, error)
3637
}
3738

3839
type tokenStrategy[T any] struct {

‎shieldtoken/token.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package token
1+
package shieldtoken
22

33
import (
44
"errors"

0 commit comments

Comments
 (0)