Merge 156b4a2 into 0b109cd

identity/identity.go

@@ -102,15 +102,15 @@ type Identity struct {
 	// ---
 	// x-omitempty: true
 	// ---
-	VerifiableAddresses []VerifiableAddress `json:"verifiable_addresses,omitempty" faker:"-" has_many:"identity_verifiable_addresses" fk_id:"identity_id"`
+	VerifiableAddresses []VerifiableAddress `json:"verifiable_addresses,omitempty" faker:"-" has_many:"identity_verifiable_addresses" fk_id:"identity_id" order_by:"id asc"`
 
 	// RecoveryAddresses contains all the addresses that can be used to recover an identity.
 	//
 	// Extensions:
 	// ---
 	// x-omitempty: true
 	// ---
-	RecoveryAddresses []RecoveryAddress `json:"recovery_addresses,omitempty" faker:"-" has_many:"identity_recovery_addresses" fk_id:"identity_id"`
+	RecoveryAddresses []RecoveryAddress `json:"recovery_addresses,omitempty" faker:"-" has_many:"identity_recovery_addresses" fk_id:"identity_id" order_by:"id asc"`
 
 	// Store metadata about the identity which the identity itself can see when calling for example the
 	// session endpoint. Do not store sensitive information (e.g. credit score) about the identity in this field.

persistence/sql/persister_identity.go

@@ -458,14 +458,6 @@ func (p *Persister) GetIdentity(ctx context.Context, id uuid.UUID) (*identity.Id
 
 	i.Credentials = nil
 
-	if err := p.findVerifiableAddresses(ctx, &i); err != nil {
-		return nil, sqlcon.HandleError(err)
-	}
-
-	if err := p.findRecoveryAddresses(ctx, &i); err != nil {
-		return nil, sqlcon.HandleError(err)
-	}
-
 	if err := p.injectTraitsSchemaURL(ctx, &i); err != nil {
 		return nil, err
 	}