fix: better const handling for internal context

schema/errors.go

@@ -59,6 +59,28 @@ func NewTOTPVerifierWrongError(instancePtr string) error {
 	})
 }
 
+func NewLookupAlreadyUsed() error {
+	t := text.NewErrorValidationLookupAlreadyUsed()
+	return errors.WithStack(&ValidationError{
+		ValidationError: &jsonschema.ValidationError{
+			Message:     t.Text,
+			InstancePtr: "#/",
+		},
+		Messages: new(text.Messages).Add(t),
+	})
+}
+
+func NewErrorValidationLookupInvalid() error {
+	t := text.NewErrorValidationLookupInvalid()
+	return errors.WithStack(&ValidationError{
+		ValidationError: &jsonschema.ValidationError{
+			Message:     t.Text,
+			InstancePtr: "#/",
+		},
+		Messages: new(text.Messages).Add(t),
+	})
+}
+
 type ValidationErrorContextPasswordPolicyViolation struct {
 	Reason string
 }

selfservice/flow/error.go

@@ -5,6 +5,7 @@ import (
 )
 
 var (
-	ErrStrategyNotResponsible = errors.New("strategy is not responsible for this request")
-	ErrCompletedByStrategy    = errors.New("flow response completed by strategy")
+	ErrStrategyNotResponsible   = errors.New("strategy is not responsible for this request")
+	ErrCompletedByStrategy      = errors.New("flow response completed by strategy")
+	ErrStrategyAsksToReturnToUI = errors.New("flow strategy is redirecting to the ui")
 )

selfservice/flow/internal_context.go

@@ -1,3 +1,7 @@
 package flow
 
-const InternalContextKeyTOTPURL = "totp_url"
+import "github.com/ory/kratos/identity"
+
+func PrefixInternalContextKey(t identity.CredentialsType, suffix string) string {
+	return string(t) + "_" + suffix
+}

selfservice/strategy/totp/.schema/settings.schema.json

@@ -10,12 +10,24 @@
       "type": "string"
     },
     "totp_code": {
-      "type": "string",
-      "maxLength": 6,
-      "minLength": 6
+      "type": "string"
     },
     "totp_unlink": {
       "type": "boolean"
     }
+  },
+  "if": {
+    "properties": {
+      "method": {
+        "const": "totp"
+      }
+    }
+  },
+  "then": {
+    "totp_code": {
+      "type": "string",
+      "maxLength": 6,
+      "minLength": 6
+    }
   }
 }

selfservice/strategy/totp/login.go

@@ -48,7 +48,7 @@ func (s *Strategy) PopulateLoginMethod(r *http.Request, requestedAAL identity.Au
 
 	sr.UI.SetCSRF(s.d.GenerateCSRFToken(r))
 	sr.UI.SetNode(node.NewInputField("totp_code", "", node.TOTPGroup, node.InputAttributeTypeText, node.WithRequiredInputAttribute).WithMetaLabel(text.NewInfoLoginTOTPLabel()))
-	sr.UI.GetNodes().Append(node.NewInputField("method", "totp", node.TOTPGroup, node.InputAttributeTypeSubmit).WithMetaLabel(text.NewInfoLogin()))
+	sr.UI.GetNodes().Append(node.NewInputField("method", s.ID(), node.TOTPGroup, node.InputAttributeTypeSubmit).WithMetaLabel(text.NewInfoLogin()))
 
 	return nil
 }

selfservice/strategy/totp/settings.go

@@ -30,6 +30,8 @@ import (
 	"github.com/ory/x/decoderx"
 )
 
+const internalContextKeyURL = "url"
+
 func (s *Strategy) RegisterSettingsRoutes(_ *x.RouterPublic) {
 }
 
@@ -156,7 +158,7 @@ func (s *Strategy) continueSettingsFlow(
 }
 
 func (s *Strategy) continueSettingsFlowAddTOTP(w http.ResponseWriter, r *http.Request, ctxUpdate *settings.UpdateContext, p *submitSelfServiceSettingsFlowWithTotpMethodBody) (*identity.Identity, error) {
-	keyURL := gjson.GetBytes(ctxUpdate.Flow.InternalContext, flow.InternalContextKeyTOTPURL).String()
+	keyURL := gjson.GetBytes(ctxUpdate.Flow.InternalContext, flow.PrefixInternalContextKey(s.ID(), internalContextKeyURL)).String()
 	if len(keyURL) == 0 {
 		return nil, errors.WithStack(herodot.ErrInternalServerError.WithReasonf("Could not find they TOTP key in the internal context. This is a code bug and should be reported to https://github.com/ory/kratos/."))
 	}
@@ -192,6 +194,17 @@ func (s *Strategy) continueSettingsFlowAddTOTP(w http.ResponseWriter, r *http.Re
 	c := &identity.Credentials{Type: s.ID(), Identifiers: []string{i.ID.String()}, Config: co}
 	c.Config = co
 	i.SetCredentials(s.ID(), *c)
+
+	// Remove the TOTP URL from the internal context now that it is set!
+	ctxUpdate.Flow.InternalContext, err = sjson.DeleteBytes(ctxUpdate.Flow.InternalContext, flow.PrefixInternalContextKey(s.ID(), internalContextKeyURL))
+	if err != nil {
+		return nil, err
+	}
+
+	if err := s.d.SettingsFlowPersister().UpdateSettingsFlow(r.Context(), ctxUpdate.Flow); err != nil {
+		return nil, err
+	}
+
 	return i, nil
 }
 
@@ -241,7 +254,7 @@ func (s *Strategy) PopulateSettingsMethod(r *http.Request, id *identity.Identity
 			return err
 		}
 
-		f.InternalContext, err = sjson.SetBytes(f.InternalContext, flow.InternalContextKeyTOTPURL, key.URL())
+		f.InternalContext, err = sjson.SetBytes(f.InternalContext, flow.PrefixInternalContextKey(s.ID(), internalContextKeyURL), key.URL())
 		if err != nil {
 			return err
 		}