Skip to content

Commit

Permalink
Replace local deps with remote ones
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr committed Nov 23, 2019
1 parent f291365 commit 90b25b3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
8 changes: 2 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ module github.com/ory/kratos

go 1.13

replace github.com/ory/x => ../x

replace github.com/santhosh-tekuri/jsonschema/v2 => ../jsonschema

replace github.com/ory/gojsonschema => ../gojsonschema
replace github.com/santhosh-tekuri/jsonschema/v2 => github.com/ory/jsonschema/v2 v2.1.1-0.20191123130340-1c20114d2c04

require (
github.com/bxcodec/faker v2.0.1+incompatible
Expand Down Expand Up @@ -53,7 +49,7 @@ require (
github.com/ory/graceful v0.1.1
github.com/ory/herodot v0.6.2
github.com/ory/viper v1.5.6
github.com/ory/x v0.0.82
github.com/ory/x v0.0.83
github.com/pelletier/go-toml v1.6.0 // indirect
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
github.com/pkg/errors v0.8.1
Expand Down
7 changes: 7 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -517,12 +517,19 @@ github.com/ory/go-convenience v0.1.0 h1:zouLKfF2GoSGnJwGq+PE/nJAE6dj2Zj5QlTgmMTs
github.com/ory/go-convenience v0.1.0/go.mod h1:uEY/a60PL5c12nYz4V5cHY03IBmwIAEm8TWB0yn9KNs=
github.com/ory/gojsonreference v0.0.0-20190720135523-6b606c2d8ee8 h1:e2S2FmxqSbhFyVNP24HncpRY+X1qAZmtE3nZ0gJKR4Q=
github.com/ory/gojsonreference v0.0.0-20190720135523-6b606c2d8ee8/go.mod h1:wsH1C4nIeeQClDtD5AH7kF1uTS6zWyqfjVDTmB0Em7A=
github.com/ory/gojsonschema v1.1.1-0.20190919112458-f254ca73d5e9/go.mod h1:BNZpdJgB74KOLSsWFvzw6roXg1I6O51WO8roMmW+T7Y=
github.com/ory/gojsonschema v1.2.0 h1:ePsM9vnsxVHrEHW9/bE2DyU4s34B/YdDtT4LoPnGNso=
github.com/ory/gojsonschema v1.2.0/go.mod h1:BNZpdJgB74KOLSsWFvzw6roXg1I6O51WO8roMmW+T7Y=
github.com/ory/graceful v0.1.1 h1:zx+8tDObLPrG+7Tc8jKYlXsqWnLtOQA1IZ/FAAKHMXU=
github.com/ory/graceful v0.1.1/go.mod h1:zqu70l95WrKHF4AZ6tXHvAqAvpY6M7g6ttaAVcMm7KU=
github.com/ory/herodot v0.6.2 h1:zOb5MsuMn7AH9/Ewc/EK83yqcNViK1m1l3C2UuP3RcA=
github.com/ory/herodot v0.6.2/go.mod h1:3BOneqcyBsVybCPAJoi92KN2BpJHcmDqAMcAAaJiJow=
github.com/ory/jsonschema/v2 v2.1.1-0.20191123130340-1c20114d2c04 h1:Yb4pmkauz7cWHFydPJI/yu6EsKGKawY85efES64sW7E=
github.com/ory/jsonschema/v2 v2.1.1-0.20191123130340-1c20114d2c04/go.mod h1:yzJzKUGV4RbWqWIBBP4wSOBqavX5saE02yirLS0OTyg=
github.com/ory/viper v1.5.6 h1:w4ceGgWwWLzAFYQ7bHaDZmwNsAto2JPVdyQjQnn7VWI=
github.com/ory/viper v1.5.6/go.mod h1:TYmpFpKLxjQwvT4f0QPpkOn4sDXU1kDgAwJpgLYiQ28=
github.com/ory/x v0.0.83 h1:MTFG07BJL+CfvDRBA0VbdZBKjGeSChAa1zIn6QCPwiw=
github.com/ory/x v0.0.83/go.mod h1:RXLPBG7B+hAViONVg0sHwK+U/ie1Y/NeXrq1JcARfoE=
github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE=
github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
Expand Down
4 changes: 2 additions & 2 deletions selfservice/form/html_form.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ func (c *HTMLForm) ParseError(err error) error {
continue
}
switch ctx := err.Context.(type) {
case *jsonschema.ValidationRequiredError:
for _, required := range ctx.MissingPropertyPtrs {
case *jsonschema.ValidationContextRequired:
for _, required := range ctx.Missing {
// The pointer can be ignored because if there is an error, we'll just use
// the empty field (global error).
pointer, _ := jsonschemax.JSONPointerToDotNotation(required)
Expand Down

0 comments on commit 90b25b3

Please sign in to comment.