feat: improve sorting of ui fields

See #1196
ory · Apr 9, 2021 · 797b49d · 797b49d
1 parent cb670a8
commit 797b49d
Show file tree

Hide file tree

Showing 64 changed files with 1,036 additions and 210 deletions.
diff --git a/cmd/daemon/serve.go b/cmd/daemon/serve.go
@@ -1,11 +1,12 @@
 package daemon
 
 import (
- "github.com/ory/kratos/selfservice/flow/recovery"
  "net/http"
  "strings"
  "sync"
 
+ "github.com/ory/kratos/selfservice/flow/recovery"
+
  "github.com/ory/x/reqlog"
 
  "github.com/ory/kratos/cmd/courier"

diff --git a/internal/httpclient/.openapi-generator/VERSION b/internal/httpclient/.openapi-generator/VERSION
@@ -1 +1 @@
-5.0.0
+5.1.0
diff --git a/internal/httpclient/docs/AdminApi.md b/internal/httpclient/docs/AdminApi.md
@@ -140,7 +140,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**RecoveryLink**](recoveryLink.md)
+[**RecoveryLink**](RecoveryLink.md)
 
 ### Authorization
 
@@ -414,7 +414,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**ErrorContainer**](errorContainer.md)
+[**ErrorContainer**](ErrorContainer.md)
 
 ### Authorization
 
@@ -480,7 +480,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**LoginFlow**](loginFlow.md)
+[**LoginFlow**](LoginFlow.md)
 
 ### Authorization
 
@@ -546,7 +546,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**RecoveryFlow**](recoveryFlow.md)
+[**RecoveryFlow**](RecoveryFlow.md)
 
 ### Authorization
 
@@ -612,7 +612,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**RegistrationFlow**](registrationFlow.md)
+[**RegistrationFlow**](RegistrationFlow.md)
 
 ### Authorization
 
@@ -678,7 +678,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**SettingsFlow**](settingsFlow.md)
+[**SettingsFlow**](SettingsFlow.md)
 
 ### Authorization
 
@@ -744,7 +744,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**VerificationFlow**](verificationFlow.md)
+[**VerificationFlow**](VerificationFlow.md)
 
 ### Authorization
 
@@ -805,7 +805,7 @@ Other parameters are passed through a pointer to a apiGetVersionRequest struct v
 
 ### Return type
 
-[**InlineResponse2001**](inline_response_200_1.md)
+[**InlineResponse2001**](InlineResponse2001.md)
 
 ### Authorization
 
@@ -866,7 +866,7 @@ Other parameters are passed through a pointer to a apiIsAliveRequest struct via
 
 ### Return type
 
-[**InlineResponse200**](inline_response_200.md)
+[**InlineResponse200**](InlineResponse200.md)
 
 ### Authorization
 
@@ -927,7 +927,7 @@ Other parameters are passed through a pointer to a apiIsReadyRequest struct via
 
 ### Return type
 
-[**InlineResponse200**](inline_response_200.md)
+[**InlineResponse200**](InlineResponse200.md)
 
 ### Authorization
 

diff --git a/internal/httpclient/docs/GenericError.md b/internal/httpclient/docs/GenericError.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Error** | Pointer to [**GenericErrorPayload**](genericErrorPayload.md) | | [optional] 
+**Error** | Pointer to [**GenericErrorPayload**](GenericErrorPayload.md) | | [optional] 
 
 ## Methods
 

diff --git a/internal/httpclient/docs/LoginFlow.md b/internal/httpclient/docs/LoginFlow.md
@@ -11,7 +11,7 @@ Name | Type | Description | Notes
 **IssuedAt** | **time.Time** | IssuedAt is the time (UTC) when the flow started. | 
 **RequestUrl** | **string** | RequestURL is the initial URL that was requested from ORY Kratos. It can be used to forward information contained in the URL&#39;s path or query for example. | 
 **Type** | **string** | The flow type can either be &#x60;api&#x60; or &#x60;browser&#x60;. | 
-**Ui** | [**UiContainer**](uiContainer.md) | | 
+**Ui** | [**UiContainer**](UiContainer.md) | | 
 
 ## Methods
 

diff --git a/internal/httpclient/docs/LoginViaApiResponse.md b/internal/httpclient/docs/LoginViaApiResponse.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Session** | [**Session**](session.md) | | 
+**Session** | [**Session**](Session.md) | | 
 **SessionToken** | **string** | The Session Token A session token is equivalent to a session cookie, but it can be sent in the HTTP Authorization Header: Authorization: bearer ${session-token} The session token is only issued for API flows, not for Browser flows! | 
 
 ## Methods

diff --git a/internal/httpclient/docs/PublicApi.md b/internal/httpclient/docs/PublicApi.md
@@ -210,7 +210,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**SettingsViaApiResponse**](settingsViaApiResponse.md)
+[**SettingsViaApiResponse**](SettingsViaApiResponse.md)
 
 ### Authorization
 
@@ -405,7 +405,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**ErrorContainer**](errorContainer.md)
+[**ErrorContainer**](ErrorContainer.md)
 
 ### Authorization
 
@@ -471,7 +471,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**LoginFlow**](loginFlow.md)
+[**LoginFlow**](LoginFlow.md)
 
 ### Authorization
 
@@ -537,7 +537,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**RecoveryFlow**](recoveryFlow.md)
+[**RecoveryFlow**](RecoveryFlow.md)
 
 ### Authorization
 
@@ -603,7 +603,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**RegistrationFlow**](registrationFlow.md)
+[**RegistrationFlow**](RegistrationFlow.md)
 
 ### Authorization
 
@@ -669,7 +669,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**SettingsFlow**](settingsFlow.md)
+[**SettingsFlow**](SettingsFlow.md)
 
 ### Authorization
 
@@ -735,7 +735,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**VerificationFlow**](verificationFlow.md)
+[**VerificationFlow**](VerificationFlow.md)
 
 ### Authorization
 
@@ -860,7 +860,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**LoginFlow**](loginFlow.md)
+[**LoginFlow**](LoginFlow.md)
 
 ### Authorization
 
@@ -980,7 +980,7 @@ Other parameters are passed through a pointer to a apiInitializeSelfServiceRecov
 
 ### Return type
 
-[**RecoveryFlow**](recoveryFlow.md)
+[**RecoveryFlow**](RecoveryFlow.md)
 
 ### Authorization
 
@@ -1100,7 +1100,7 @@ Other parameters are passed through a pointer to a apiInitializeSelfServiceRegis
 
 ### Return type
 
-[**RegistrationFlow**](registrationFlow.md)
+[**RegistrationFlow**](RegistrationFlow.md)
 
 ### Authorization
 
@@ -1220,7 +1220,7 @@ Other parameters are passed through a pointer to a apiInitializeSelfServiceSetti
 
 ### Return type
 
-[**SettingsFlow**](settingsFlow.md)
+[**SettingsFlow**](SettingsFlow.md)
 
 ### Authorization
 
@@ -1340,7 +1340,7 @@ Other parameters are passed through a pointer to a apiInitializeSelfServiceVerif
 
 ### Return type
 
-[**VerificationFlow**](verificationFlow.md)
+[**VerificationFlow**](VerificationFlow.md)
 
 ### Authorization
 
@@ -1529,7 +1529,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**LoginViaApiResponse**](loginViaApiResponse.md)
+[**LoginViaApiResponse**](LoginViaApiResponse.md)
 
 ### Authorization
 
@@ -1595,7 +1595,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**RegistrationViaApiResponse**](registrationViaApiResponse.md)
+[**RegistrationViaApiResponse**](RegistrationViaApiResponse.md)
 
 ### Authorization
 
@@ -1663,7 +1663,7 @@ Name | Type | Description | Notes
 
 ### Return type
 
-[**Session**](session.md)
+[**Session**](Session.md)
 
 ### Authorization
 

diff --git a/internal/httpclient/docs/RecoveryFlow.md b/internal/httpclient/docs/RecoveryFlow.md
@@ -11,7 +11,7 @@ Name | Type | Description | Notes
 **RequestUrl** | **string** | RequestURL is the initial URL that was requested from ORY Kratos. It can be used to forward information contained in the URL&#39;s path or query for example. | 
 **State** | **string** | | 
 **Type** | Pointer to **string** | The flow type can either be &#x60;api&#x60; or &#x60;browser&#x60;. | [optional] 
-**Ui** | [**UiContainer**](uiContainer.md) | | 
+**Ui** | [**UiContainer**](UiContainer.md) | | 
 
 ## Methods
 

diff --git a/internal/httpclient/docs/RegistrationFlow.md b/internal/httpclient/docs/RegistrationFlow.md
@@ -10,7 +10,7 @@ Name | Type | Description | Notes
 **IssuedAt** | **time.Time** | IssuedAt is the time (UTC) when the flow occurred. | 
 **RequestUrl** | **string** | RequestURL is the initial URL that was requested from ORY Kratos. It can be used to forward information contained in the URL&#39;s path or query for example. | 
 **Type** | Pointer to **string** | The flow type can either be &#x60;api&#x60; or &#x60;browser&#x60;. | [optional] 
-**Ui** | [**UiContainer**](uiContainer.md) | | 
+**Ui** | [**UiContainer**](UiContainer.md) | | 
 
 ## Methods
 

diff --git a/internal/httpclient/docs/RegistrationViaApiResponse.md b/internal/httpclient/docs/RegistrationViaApiResponse.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Identity** | [**Identity**](Identity.md) | | 
-**Session** | Pointer to [**Session**](session.md) | | [optional] 
+**Session** | Pointer to [**Session**](Session.md) | | [optional] 
 **SessionToken** | **string** | The Session Token This field is only set when the session hook is configured as a post-registration hook. A session token is equivalent to a session cookie, but it can be sent in the HTTP Authorization Header: Authorization: bearer ${session-token} The session token is only issued for API flows, not for Browser flows! | 
 
 ## Methods

diff --git a/internal/httpclient/docs/SettingsFlow.md b/internal/httpclient/docs/SettingsFlow.md
@@ -12,7 +12,7 @@ Name | Type | Description | Notes
 **RequestUrl** | **string** | RequestURL is the initial URL that was requested from ORY Kratos. It can be used to forward information contained in the URL&#39;s path or query for example. | 
 **State** | **string** | | 
 **Type** | Pointer to **string** | The flow type can either be &#x60;api&#x60; or &#x60;browser&#x60;. | [optional] 
-**Ui** | [**UiContainer**](uiContainer.md) | | 
+**Ui** | [**UiContainer**](UiContainer.md) | | 
 
 ## Methods
 

diff --git a/internal/httpclient/docs/SettingsViaApiResponse.md b/internal/httpclient/docs/SettingsViaApiResponse.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Flow** | [**SettingsFlow**](settingsFlow.md) | | 
+**Flow** | [**SettingsFlow**](SettingsFlow.md) | | 
 **Identity** | [**Identity**](Identity.md) | | 
 
 ## Methods

diff --git a/internal/httpclient/docs/UiNode.md b/internal/httpclient/docs/UiNode.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Attributes** | [**UiNodeAttributes**](uiNodeAttributes.md) | | 
+**Attributes** | [**UiNodeAttributes**](UiNodeAttributes.md) | | 
 **Group** | **string** | | 
 **Messages** | [**[]UiText**](UiText.md) | | 
 **Type** | **string** | | 

diff --git a/internal/httpclient/docs/UiNodeAnchorAttributes.md b/internal/httpclient/docs/UiNodeAnchorAttributes.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Href** | **string** | The link&#39;s href (destination) URL. format: uri | 
-**Title** | [**UiText**](uiText.md) | | 
+**Title** | [**UiText**](UiText.md) | | 
 
 ## Methods
 

diff --git a/internal/httpclient/docs/UiNodeAttributes.md b/internal/httpclient/docs/UiNodeAttributes.md
@@ -5,16 +5,16 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Disabled** | **bool** | Sets the input&#39;s disabled field to true or false. | 
-**Label** | Pointer to [**UiText**](uiText.md) | | [optional] 
+**Label** | Pointer to [**UiText**](UiText.md) | | [optional] 
 **Name** | **string** | The input&#39;s element name. | 
 **Pattern** | Pointer to **string** | The input&#39;s pattern. | [optional] 
 **Required** | Pointer to **bool** | Mark this input field as required. | [optional] 
 **Type** | **string** | | 
-**Value** | Pointer to [**UiNodeInputAttributesValue**](uiNodeInputAttributesValue.md) | | [optional] 
-**Text** | [**UiText**](uiText.md) | | 
+**Value** | Pointer to [**UiNodeInputAttributesValue**](UiNodeInputAttributesValue.md) | | [optional] 
+**Text** | [**UiText**](UiText.md) | | 
 **Src** | **string** | The image&#39;s source URL. format: uri | 
 **Href** | **string** | The link&#39;s href (destination) URL. format: uri | 
-**Title** | [**UiText**](uiText.md) | | 
+**Title** | [**UiText**](UiText.md) | | 
 
 ## Methods
 

diff --git a/internal/httpclient/docs/UiNodeInputAttributes.md b/internal/httpclient/docs/UiNodeInputAttributes.md
@@ -5,12 +5,12 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Disabled** | **bool** | Sets the input&#39;s disabled field to true or false. | 
-**Label** | Pointer to [**UiText**](uiText.md) | | [optional] 
+**Label** | Pointer to [**UiText**](UiText.md) | | [optional] 
 **Name** | **string** | The input&#39;s element name. | 
 **Pattern** | Pointer to **string** | The input&#39;s pattern. | [optional] 
 **Required** | Pointer to **bool** | Mark this input field as required. | [optional] 
 **Type** | **string** | | 
-**Value** | Pointer to [**UiNodeInputAttributesValue**](uiNodeInputAttributesValue.md) | | [optional] 
+**Value** | Pointer to [**UiNodeInputAttributesValue**](UiNodeInputAttributesValue.md) | | [optional] 
 
 ## Methods
 

diff --git a/internal/httpclient/docs/UiNodeTextAttributes.md b/internal/httpclient/docs/UiNodeTextAttributes.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Text** | [**UiText**](uiText.md) | | 
+**Text** | [**UiText**](UiText.md) | | 
 
 ## Methods
 

diff --git a/internal/httpclient/docs/VerificationFlow.md b/internal/httpclient/docs/VerificationFlow.md
@@ -11,7 +11,7 @@ Name | Type | Description | Notes
 **RequestUrl** | Pointer to **string** | RequestURL is the initial URL that was requested from ORY Kratos. It can be used to forward information contained in the URL&#39;s path or query for example. | [optional] 
 **State** | **string** | | 
 **Type** | **string** | The flow type can either be &#x60;api&#x60; or &#x60;browser&#x60;. | 
-**Ui** | [**UiContainer**](uiContainer.md) | | 
+**Ui** | [**UiContainer**](UiContainer.md) | | 
 
 ## Methods
 

diff --git a/selfservice/flow/login/error.go b/selfservice/flow/login/error.go
@@ -106,6 +106,11 @@ func (s *ErrorHandler) WriteFlowError(w http.ResponseWriter, r *http.Request, f
  return
  }
 
+ if err := sortNodes(f.UI.Nodes); err != nil {
+ s.forward(w, r, f, err)
+ return
+ }
+
  if err := s.d.LoginFlowPersister().UpdateLoginFlow(r.Context(), f); err != nil {
  s.forward(w, r, f, err)
  return