Resolve minor configuration issues and response errors (#85)

ory · Nov 4, 2019 · a44913b · a44913b
1 parent e0c96ef
commit a44913b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/docs/config.schema.json b/docs/config.schema.json
@@ -305,7 +305,8 @@
  "mfa_ui",
  "login_ui",
  "registration_ui",
- "error_ui"
+ "error_ui",
+ "default_return_to"
  ],
  "additionalProperties": false
  },

diff --git a/driver/configuration/provider_viper.go b/driver/configuration/provider_viper.go
@@ -35,7 +35,7 @@ const (
 
  ViperKeySecretsSession = "secrets.session"
 
- ViperKeyURLsDefaultReturnTo = "urls.self.default_return_to"
+ ViperKeyURLsDefaultReturnTo = "urls.default_return_to"
  ViperKeyURLsSelfPublic = "urls.self.public"
  ViperKeyURLsSelfAdmin = "urls.self.admin"
  ViperKeyURLsLogin = "urls.login_ui"

diff --git a/identity/pool_sql.go b/identity/pool_sql.go
@@ -241,8 +241,11 @@ LEFT OUTER JOIN identity_credential as ic ON
 LEFT OUTER JOIN identity_credential_identifier as ici ON
  ici.identity_credential_pk = ic.pk
 %s`, where)
- if err := p.db.SelectContext(ctx, &rows, p.db.Rebind(query), args...); err != nil {
- return nil, sqlcon.HandleError(err)
+ if err := sqlcon.HandleError(p.db.SelectContext(ctx, &rows, p.db.Rebind(query), args...)); err != nil {
+ if errors.Cause(err) == sqlcon.ErrNoRows {
+ return nil, errors.WithStack(herodot.ErrNotFound.WithReasonf(`Identity could not be found.`))
+ }
+ return nil, err
  }
 
  if len(rows) == 0 {