chore: synchronize workspaces

ory · Nov 28, 2024 · 798ff0a · 798ff0a
1 parent dfb5543
commit 798ff0a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 36 deletions.
diff --git a/selfservice/strategy/code/strategy_recovery_admin.go b/selfservice/strategy/code/strategy_recovery_admin.go
@@ -8,12 +8,13 @@ import (
 	"net/http"
 	"net/url"
 	"time"
+
 	"github.com/gobuffalo/pop/v6"
-	"go.opentelemetry.io/otel/trace"
-	"github.com/ory/kratos/x/events"
 	"github.com/gofrs/uuid"
 	"github.com/julienschmidt/httprouter"
 	"github.com/pkg/errors"
+	"go.opentelemetry.io/otel/trace"
+
 	"github.com/ory/herodot"
 	"github.com/ory/kratos/identity"
 	"github.com/ory/kratos/selfservice/flow"
@@ -22,6 +23,7 @@ import (
 	"github.com/ory/kratos/text"
 	"github.com/ory/kratos/ui/node"
 	"github.com/ory/kratos/x"
+	"github.com/ory/kratos/x/events"
 	"github.com/ory/x/decoderx"
 	"github.com/ory/x/sqlcon"
 	"github.com/ory/x/urlx"
@@ -223,7 +225,7 @@ func (s *Strategy) createRecoveryCodeForIdentity(w http.ResponseWriter, r *http.
 	}
 
 	trace.SpanFromContext(r.Context()).AddEvent(
-		events.NewRecoveryCodeCreatedByAdmin(ctx, recoveryFlow.ID, id.ID, flowType.String(), "code"),
+		events.NewRecoveryInitiatedByAdmin(ctx, recoveryFlow.ID, id.ID, flowType.String(), "code"),
 	)
 
 	s.deps.Audit().

diff --git a/selfservice/strategy/link/strategy_recovery.go b/selfservice/strategy/link/strategy_recovery.go
@@ -9,19 +9,15 @@ import (
 	"net/http"
 	"net/url"
 	"time"
-	"go.opentelemetry.io/otel/trace"
-	"github.com/ory/kratos/x/events"
+
 	"github.com/gobuffalo/pop/v6"
 	"github.com/gofrs/uuid"
 	"github.com/julienschmidt/httprouter"
 	"github.com/pkg/errors"
 	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
+
 	"github.com/ory/herodot"
-	"github.com/ory/x/decoderx"
-	"github.com/ory/x/otelx"
-	"github.com/ory/x/sqlcon"
-	"github.com/ory/x/sqlxx"
-	"github.com/ory/x/urlx"
 	"github.com/ory/kratos/identity"
 	"github.com/ory/kratos/schema"
 	"github.com/ory/kratos/selfservice/flow"
@@ -31,6 +27,12 @@ import (
 	"github.com/ory/kratos/text"
 	"github.com/ory/kratos/ui/node"
 	"github.com/ory/kratos/x"
+	"github.com/ory/kratos/x/events"
+	"github.com/ory/x/decoderx"
+	"github.com/ory/x/otelx"
+	"github.com/ory/x/sqlcon"
+	"github.com/ory/x/sqlxx"
+	"github.com/ory/x/urlx"
 )
 
 const (
@@ -195,7 +197,7 @@ func (s *Strategy) createRecoveryLinkForIdentity(w http.ResponseWriter, r *http.
 	}
 
 	trace.SpanFromContext(ctx).AddEvent(
-		events.NewRecoveryCodeCreatedByAdmin(ctx, req.ID, id.ID, req.Type.String(), "link"),
+		events.NewRecoveryInitiatedByAdmin(ctx, req.ID, id.ID, req.Type.String(), "link"),
 	)
 
 	s.d.Audit().

diff --git a/x/events/events.go b/x/events/events.go
@@ -19,29 +19,29 @@ import (
 )
 
 const (
-	SessionIssued              semconv.Event = "SessionIssued"
-	SessionChanged             semconv.Event = "SessionChanged"
-	SessionLifespanExtended    semconv.Event = "SessionLifespanExtended"
-	SessionRevoked             semconv.Event = "SessionRevoked"
-	SessionChecked             semconv.Event = "SessionChecked"
-	SessionTokenizedAsJWT      semconv.Event = "SessionTokenizedAsJWT"
-	RegistrationFailed         semconv.Event = "RegistrationFailed"
-	RegistrationSucceeded      semconv.Event = "RegistrationSucceeded"
-	LoginFailed                semconv.Event = "LoginFailed"
-	LoginSucceeded             semconv.Event = "LoginSucceeded"
-	SettingsFailed             semconv.Event = "SettingsFailed"
-	SettingsSucceeded          semconv.Event = "SettingsSucceeded"
-	RecoveryFailed             semconv.Event = "RecoveryFailed"
-	RecoverySucceeded          semconv.Event = "RecoverySucceeded"
-	RecoveryCodeCreatedByAdmin semconv.Event = "RecoveryCodeCreatedByAdmin"
-	VerificationFailed         semconv.Event = "VerificationFailed"
-	VerificationSucceeded      semconv.Event = "VerificationSucceeded"
-	IdentityCreated            semconv.Event = "IdentityCreated"
-	IdentityUpdated            semconv.Event = "IdentityUpdated"
-	IdentityDeleted            semconv.Event = "IdentityDeleted"
-	WebhookDelivered           semconv.Event = "WebhookDelivered"
-	WebhookSucceeded           semconv.Event = "WebhookSucceeded"
-	WebhookFailed              semconv.Event = "WebhookFailed"
+	SessionIssued            semconv.Event = "SessionIssued"
+	SessionChanged           semconv.Event = "SessionChanged"
+	SessionLifespanExtended  semconv.Event = "SessionLifespanExtended"
+	SessionRevoked           semconv.Event = "SessionRevoked"
+	SessionChecked           semconv.Event = "SessionChecked"
+	SessionTokenizedAsJWT    semconv.Event = "SessionTokenizedAsJWT"
+	RegistrationFailed       semconv.Event = "RegistrationFailed"
+	RegistrationSucceeded    semconv.Event = "RegistrationSucceeded"
+	LoginFailed              semconv.Event = "LoginFailed"
+	LoginSucceeded           semconv.Event = "LoginSucceeded"
+	SettingsFailed           semconv.Event = "SettingsFailed"
+	SettingsSucceeded        semconv.Event = "SettingsSucceeded"
+	RecoveryFailed           semconv.Event = "RecoveryFailed"
+	RecoverySucceeded        semconv.Event = "RecoverySucceeded"
+	RecoveryInitiatedByAdmin semconv.Event = "RecoveryInitiatedByAdmin"
+	VerificationFailed       semconv.Event = "VerificationFailed"
+	VerificationSucceeded    semconv.Event = "VerificationSucceeded"
+	IdentityCreated          semconv.Event = "IdentityCreated"
+	IdentityUpdated          semconv.Event = "IdentityUpdated"
+	IdentityDeleted          semconv.Event = "IdentityDeleted"
+	WebhookDelivered         semconv.Event = "WebhookDelivered"
+	WebhookSucceeded         semconv.Event = "WebhookSucceeded"
+	WebhookFailed            semconv.Event = "WebhookFailed"
 )
 
 const (
@@ -224,8 +224,8 @@ func NewRecoverySucceeded(ctx context.Context, flowID, identityID uuid.UUID, flo
 		)...)
 }
 
-func NewRecoveryCodeCreatedByAdmin(ctx context.Context, flowID, identityID uuid.UUID, flowType, method string) (string, trace.EventOption) {
-	return RecoveryCodeCreatedByAdmin.String(),
+func NewRecoveryInitiatedByAdmin(ctx context.Context, flowID, identityID uuid.UUID, flowType, method string) (string, trace.EventOption) {
+	return RecoveryInitiatedByAdmin.String(),
 		trace.WithAttributes(append(
 			semconv.AttributesFromContext(ctx),
 			attrSelfServiceFlowType(flowType),