From d1f0c05723c462482b9be9fd947aea05951ffbf6 Mon Sep 17 00:00:00 2001
From: Prarup Gurung <grgprarup@gmail.com>
Date: Mon, 20 Mar 2023 12:28:52 +0545
Subject: [PATCH] Revert ldap related code removed

---
 .../features/bootstrap/Provisioning.php       | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/tests/acceptance/features/bootstrap/Provisioning.php b/tests/acceptance/features/bootstrap/Provisioning.php
index 34a31f867..025b4f688 100644
--- a/tests/acceptance/features/bootstrap/Provisioning.php
+++ b/tests/acceptance/features/bootstrap/Provisioning.php
@@ -705,14 +705,16 @@ trait Provisioning {
 		}
 		if (isset($setting["email"])) {
 			$entry['mail'] = $setting["email"];
-		} else {
+		} elseif (!OcisHelper::isTestingOnReva()) {
 			$entry['mail'] = $userId . '@owncloud.com';
 		}
 		$entry['gidNumber'] = 5000;
 		$entry['uidNumber'] = $uidNumber;
 
-		$entry['objectclass'][] = 'ownCloud';
-		$entry['ownCloudUUID'] = WebDavHelper::generateUUIDv4();
+		if (!OcisHelper::isTestingOnReva()) {
+			$entry['objectclass'][] = 'ownCloud';
+			$entry['ownCloudUUID'] = WebDavHelper::generateUUIDv4();
+		}
 
 		if (OcisHelper::isTestingParallelDeployment()) {
 			$entry['ownCloudSelector'] = $this->getOCSelector();
@@ -749,8 +751,10 @@ trait Provisioning {
 			$entry['objectclass'][] = 'groupOfNames';
 			$entry['member'] = "";
 		}
-		$entry['objectclass'][] = 'ownCloud';
-		$entry['ownCloudUUID'] = WebDavHelper::generateUUIDv4();
+		if (!OcisHelper::isTestingOnReva()) {
+			$entry['objectclass'][] = 'ownCloud';
+			$entry['ownCloudUUID'] = WebDavHelper::generateUUIDv4();
+		}
 
 		$this->ldap->add($newDN, $entry);
 		$this->ldapCreatedGroups[] = $group;
@@ -775,6 +779,18 @@ trait Provisioning {
 			);
 			$this->rememberThatGroupIsNotExpectedToExist($group);
 		}
+		if (!$this->skipImportLdif) {
+			//delete all created ldap users
+			$this->ldap->delete(
+				"ou=" . $this->ldapUsersOU . "," . $this->ldapBaseDN,
+				true
+			);
+			//delete all created ldap groups
+			$this->ldap->delete(
+				"ou=" . $this->ldapGroupsOU . "," . $this->ldapBaseDN,
+				true
+			);
+		}
 	}
 
 	/**
@@ -3151,9 +3167,12 @@ trait Provisioning {
 		} elseif (OcisHelper::isTestingWithGraphApi()) {
 			$requestingUser = $this->getAdminUsername();
 			$requestingPassword = $this->getAdminPassword();
-		} else {
+		} elseif (!OcisHelper::isTestingOnReva()) {
 			$requestingUser = 'moss';
 			$requestingPassword = 'vista';
+		} else {
+			$requestingUser = $this->getActualUsername($user);
+			$requestingPassword = $this->getPasswordForUser($requestingUser);
 		}
 
 		$path = (OcisHelper::isTestingWithGraphApi())