fix

core/auth/auth.go

@@ -1933,32 +1933,23 @@ func (a *Auth) deleteAccount(context storage.TransactionContext, account model.A
 }
 
 func (a *Auth) deleteAccountFromApps(context storage.TransactionContext, account model.Account, fromAppsIDs []string) error {
-	var orgApps []model.OrgAppMembership
-	for _, idToDelete := range fromAppsIDs {
-		orgA, err := a.giveMembershipsByAppsIds(context, account.OrgAppsMemberships, idToDelete)
-		if err != nil {
-			return errors.WrapErrorAction(logutils.ActionDelete, model.TypeAccount, nil, err)
+	// compare the applicationIDs and find the matching IDs for the org_app_memberships
+	var membershipsIDs []string
+	for _, a := range account.OrgAppsMemberships {
+		for _, b := range fromAppsIDs {
+			if a.AppOrg.Application.ID == b {
+				membershipsIDs = append(membershipsIDs, a.ID)
+			}
 		}
-		orgApps = orgA
 	}
 
-	err := a.storage.UpdateAccountOrgAppsMembershipsObject(context, account.ID, orgApps)
+	err := a.storage.DeleteOrgAppsMembershipsObject(context, account.ID, membershipsIDs)
 	if err != nil {
 		return errors.WrapErrorAction(logutils.ActionDelete, model.TypeAccount, nil, err)
 	}
 
 	return nil
 }
-func (a *Auth) giveMembershipsByAppsIds(context storage.TransactionContext, orgApp []model.OrgAppMembership, fromAppsIDs string) ([]model.OrgAppMembership, error) {
-	for i, membership := range orgApp {
-		if membership.AppOrg.Application.ID == fromAppsIDs {
-			// Found the matching ID, remove it from the slice
-			orgApp = append(orgApp[:i], orgApp[i+1:]...)
-			break
-		}
-	}
-	return orgApp, nil
-}
 
 func (a *Auth) deleteFullAccount(context storage.TransactionContext, account model.Account) error {
 	//1. delete the account record

core/auth/interfaces.go

@@ -487,7 +487,7 @@ type Storage interface {
 	SaveAccount(context storage.TransactionContext, account *model.Account) error
 	DeleteAccount(context storage.TransactionContext, id string) error
 	UpdateAccountUsageInfo(context storage.TransactionContext, accountID string, updateLoginTime bool, updateAccessTokenTime bool, clientVersion *string) error
-	UpdateAccountOrgAppsMembershipsObject(context storage.TransactionContext, accountID string, orgApps []model.OrgAppMembership) error
+	DeleteOrgAppsMembershipsObject(context storage.TransactionContext, accountID string, membershipsIDs []string) error
 
 	//Profiles
 	UpdateAccountProfile(context storage.TransactionContext, profile model.Profile) error

driven/storage/adapter.go

@@ -2322,20 +2322,22 @@ func (sa *Adapter) DeleteAccountRoles(context TransactionContext, accountID stri
 	return nil
 }
 
-// UpdateAccountOrgAppsMembershipsObject update the whole account org_apps_memberships object
-func (sa *Adapter) UpdateAccountOrgAppsMembershipsObject(context TransactionContext, accountID string, orgApps []model.OrgAppMembership) error {
+// DeleteOrgAppsMembershipsObject delete the whole account org_apps_memberships object
+func (sa *Adapter) DeleteOrgAppsMembershipsObject(context TransactionContext, accountID string, membershipsIDs []string) error {
 	//filter
 	filter := bson.D{
 		primitive.E{Key: "_id", Value: accountID},
 	}
 
+	// update
 	update := bson.D{
+		primitive.E{Key: "$pull", Value: bson.D{
+			primitive.E{Key: "org_apps_memberships", Value: bson.M{"id": bson.M{"$in": membershipsIDs}}},
+		}},
 		primitive.E{Key: "$set", Value: bson.D{
-			primitive.E{Key: "org_apps_memberships", Value: orgApps},
 			primitive.E{Key: "date_updated", Value: time.Now().UTC()},
 		}},
 	}
-
 	res, err := sa.db.tenantsAccounts.UpdateOneWithContext(context, filter, update, nil)
 	if err != nil {
 		return errors.WrapErrorAction(logutils.ActionUpdate, model.TypeAccount, &logutils.FieldArgs{"_id": accountID}, err)