Delete Membership

core/auth/auth.go

@@ -1933,9 +1933,28 @@ func (a *Auth) deleteAccount(context storage.TransactionContext, account model.A
 }
 
 func (a *Auth) deleteAccountFromApps(context storage.TransactionContext, account model.Account, fromAppsIDs []string) error {
-	//TODO - Stefan
+	for _, idToDelete := range fromAppsIDs {
+		orgApps, _ := a.deleteApps(context, account.OrgAppsMemberships, idToDelete)
+		account.OrgAppsMemberships = orgApps
+
+		err := a.storage.DeleteAccountOrgAppsMemberships(context, account.ID, orgApps)
+		if err != nil {
+			return errors.WrapErrorAction(logutils.ActionDelete, model.TypeAccount, nil, err)
+		}
+	}
+
 	return nil
 }
+func (a *Auth) deleteApps(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,6 +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
+	DeleteAccountOrgAppsMemberships(context storage.TransactionContext, accountID string, orgApps []model.OrgAppMembership) error
 
 	//Profiles
 	UpdateAccountProfile(context storage.TransactionContext, profile model.Profile) error

driven/storage/adapter.go

@@ -2322,6 +2322,30 @@ func (sa *Adapter) DeleteAccountRoles(context TransactionContext, accountID stri
 	return nil
 }
 
+// DeleteAccountOrgAppsMemberships deletes account org_apps_membership
+func (sa *Adapter) DeleteAccountOrgAppsMemberships(context TransactionContext, accountID string, orgApps []model.OrgAppMembership) error {
+	//filter
+	filter := bson.D{
+		primitive.E{Key: "_id", Value: accountID},
+	}
+
+	update := bson.D{
+		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)
+	}
+	if res.ModifiedCount != 1 {
+		return errors.ErrorAction(logutils.ActionUpdate, model.TypeAccount, &logutils.FieldArgs{"_id": accountID, "modified": res.ModifiedCount, "expected": 1})
+	}
+	return nil
+}
+
 // UpdateAccountGroups updates the account groups
 func (sa *Adapter) UpdateAccountGroups(context TransactionContext, accountID string, appOrgID string, groups []model.AccountGroup) error {
 	stgGroups := accountGroupsToStorage(groups)