chore: use label in link/unlink settings nodes (#3977)

ory · Jul 4, 2024 · 180287a · 180287a
1 parent 020a9de
commit 180287a
Show file tree

Hide file tree

Showing 17 changed files with 115 additions and 73 deletions.
diff --git a/...egy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=githuber.json b/...egy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=githuber.json
@@ -153,10 +153,10 @@
     "meta": {
       "label": {
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         },
         "id": 1050003,
-        "text": "Unlink ory",
+        "text": "Unlink Ory",
         "type": "info"
       }
     },

diff --git a/...gy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=multiuser.json b/...gy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=multiuser.json
@@ -153,10 +153,10 @@
     "meta": {
       "label": {
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         },
         "id": 1050003,
-        "text": "Unlink ory",
+        "text": "Unlink Ory",
         "type": "info"
       }
     },

diff --git a/...egy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=password.json b/...egy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=password.json
@@ -153,10 +153,10 @@
     "meta": {
       "label": {
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         },
         "id": 1050002,
-        "text": "Link ory",
+        "text": "Link Ory",
         "type": "info"
       }
     },

diff --git a/.../.snapshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=fetch.json b/.../.snapshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=fetch.json
@@ -153,10 +153,10 @@
     "meta": {
       "label": {
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         },
         "id": 1050003,
-        "text": "Unlink ory",
+        "text": "Unlink Ory",
         "type": "info"
       }
     },

diff --git a/...napshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=original.json b/...napshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=original.json
@@ -153,10 +153,10 @@
     "meta": {
       "label": {
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         },
         "id": 1050003,
-        "text": "Unlink ory",
+        "text": "Unlink Ory",
         "type": "info"
       }
     },

diff --git a/...napshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=response.json b/...napshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=response.json
@@ -154,10 +154,10 @@
     "meta": {
       "label": {
         "id": 1050003,
-        "text": "Unlink ory",
+        "text": "Unlink Ory",
         "type": "info",
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         }
       }
     }

diff --git a/...e=link-case=should_link_a_connection_even_if_user_does_not_have_oidc_credentials_yet.json b/...e=link-case=should_link_a_connection_even_if_user_does_not_have_oidc_credentials_yet.json
@@ -153,10 +153,10 @@
     "meta": {
       "label": {
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         },
         "id": 1050002,
-        "text": "Link ory",
+        "text": "Link Ory",
         "type": "info"
       }
     },

diff --git a/...trategy-suite=link-case=should_not_be_able_to_link_a_connection_which_already_exists.json b/...trategy-suite=link-case=should_not_be_able_to_link_a_connection_which_already_exists.json
@@ -154,10 +154,10 @@
     "meta": {
       "label": {
         "id": 1050003,
-        "text": "Unlink ory",
+        "text": "Unlink Ory",
         "type": "info",
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         }
       }
     }

diff --git a/...uite=unlink-case=should_not_be_able_to_unlink_a_connection_not_yet_linked-flow=fetch.json b/...uite=unlink-case=should_not_be_able_to_unlink_a_connection_not_yet_linked-flow=fetch.json
@@ -153,10 +153,10 @@
     "meta": {
       "label": {
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         },
         "id": 1050003,
-        "text": "Unlink ory",
+        "text": "Unlink Ory",
         "type": "info"
       }
     },

diff --git a/...suite=unlink-case=should_not_be_able_to_unlink_a_connection_not_yet_linked-flow=json.json b/...suite=unlink-case=should_not_be_able_to_unlink_a_connection_not_yet_linked-flow=json.json
@@ -154,10 +154,10 @@
     "meta": {
       "label": {
         "id": 1050003,
-        "text": "Unlink ory",
+        "text": "Unlink Ory",
         "type": "info",
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         }
       }
     }

diff --git a/...suite=unlink-case=should_not_be_able_to_unlink_an_non-existing_connection-flow=fetch.json b/...suite=unlink-case=should_not_be_able_to_unlink_an_non-existing_connection-flow=fetch.json
@@ -153,10 +153,10 @@
     "meta": {
       "label": {
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         },
         "id": 1050003,
-        "text": "Unlink ory",
+        "text": "Unlink Ory",
         "type": "info"
       }
     },

diff --git a/...-suite=unlink-case=should_not_be_able_to_unlink_an_non-existing_connection-flow=json.json b/...-suite=unlink-case=should_not_be_able_to_unlink_an_non-existing_connection-flow=json.json
@@ -154,10 +154,10 @@
     "meta": {
       "label": {
         "id": 1050003,
-        "text": "Unlink ory",
+        "text": "Unlink Ory",
         "type": "info",
         "context": {
-          "provider": "ory"
+          "provider": "Ory"
         }
       }
     }

diff --git a/selfservice/strategy/oidc/nodes.go b/selfservice/strategy/oidc/nodes.go
@@ -8,10 +8,10 @@ import (
 	"github.com/ory/kratos/ui/node"
 )
 
-func NewLinkNode(provider string) *node.Node {
-	return node.NewInputField("link", provider, node.OpenIDConnectGroup, node.InputAttributeTypeSubmit).WithMetaLabel(text.NewInfoSelfServiceSettingsUpdateLinkOIDC(provider))
+func NewLinkNode(providerID, providerLabel string) *node.Node {
+	return node.NewInputField("link", providerID, node.OpenIDConnectGroup, node.InputAttributeTypeSubmit).WithMetaLabel(text.NewInfoSelfServiceSettingsUpdateLinkOIDC(providerLabel))
 }
 
-func NewUnlinkNode(provider string) *node.Node {
-	return node.NewInputField("unlink", provider, node.OpenIDConnectGroup, node.InputAttributeTypeSubmit).WithMetaLabel(text.NewInfoSelfServiceSettingsUpdateUnlinkOIDC(provider))
+func NewUnlinkNode(providerID, providerLabel string) *node.Node {
+	return node.NewInputField("unlink", providerID, node.OpenIDConnectGroup, node.InputAttributeTypeSubmit).WithMetaLabel(text.NewInfoSelfServiceSettingsUpdateUnlinkOIDC(providerLabel))
 }
diff --git a/selfservice/strategy/oidc/strategy_settings.go b/selfservice/strategy/oidc/strategy_settings.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/ory/x/sqlxx"
+	"github.com/ory/x/stringsx"
 
 	"github.com/tidwall/sjson"
 
@@ -173,7 +174,7 @@ func (s *Strategy) PopulateSettingsMethod(r *http.Request, id *identity.Identity
 		if l.Config().OrganizationID != "" {
 			continue
 		}
-		sr.UI.GetNodes().Append(NewLinkNode(l.Config().ID))
+		sr.UI.GetNodes().Append(NewLinkNode(l.Config().ID, stringsx.Coalesce(l.Config().Label, l.Config().ID)))
 	}
 
 	count, err := s.d.IdentityManager().CountActiveFirstFactorCredentials(r.Context(), confidential)
@@ -185,7 +186,7 @@ func (s *Strategy) PopulateSettingsMethod(r *http.Request, id *identity.Identity
 		// This means that we're able to remove a connection because it is the last configured credential. If it is
 		// removed, the identity is no longer able to sign in.
 		for _, l := range linked {
-			sr.UI.GetNodes().Append(NewUnlinkNode(l.Config().ID))
+			sr.UI.GetNodes().Append(NewUnlinkNode(l.Config().ID, stringsx.Coalesce(l.Config().Label, l.Config().ID)))
 		}
 	}