Dont use isSyncMaintained

owncloud · Mar 11, 2018 · 707ac94 · 707ac94
1 parent b24aae4
commit 707ac94
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 29 deletions.
diff --git a/lib/private/Group/Backend.php b/lib/private/Group/Backend.php
@@ -133,8 +133,4 @@ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 	public function isVisibleForScope($scope) {
 		return true;
 	}
-
-	public function isSyncMaintained() {
-		return false;
-	}
 }
diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php
@@ -149,11 +149,4 @@ public function groupExists($groupName) {
 		$stmt->closeCursor();
 		return isset($data['exists']);
 	}
-
-	/**
-	 * Groups and memberships of this backend are maintained by the users
-	 */
-	public function isSyncMaintained() {
-		return false;
-	}
 }
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
@@ -495,9 +495,7 @@ public function tryBasicAuthLogin(IRequest $request) {
 	private function updateUserMemberships(IUser $user) {
 		// Update only the backends which are sync maintained
 		foreach($this->groupManager->getBackends() as $groupBackend) {
-			if ($groupBackend->isSyncMaintained()) {
-				$this->groupSyncService->syncUserMemberships($groupBackend, $user->getUID());
-			}
+			$this->groupSyncService->syncUserMemberships($groupBackend, $user->getUID());
 		};
 	}
 

diff --git a/lib/public/GroupInterface.php b/lib/public/GroupInterface.php
@@ -126,12 +126,4 @@ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
 	 */
 	public function isVisibleForScope($scope);
 
-	/**
-	 * Returns whether the groups and memberships are to be maintained by core
-	 * and sync mechanism to be used.
-	 *
-	 * @since 10.0.0
-	 */
-	public function isSyncMaintained();
-
 }
diff --git a/tests/Core/Command/Group/SyncBackendTest.php b/tests/Core/Command/Group/SyncBackendTest.php
@@ -101,7 +101,6 @@ protected function setUp() {
 				'addToGroup',
 				'removeFromGroup',
 				'isVisibleForScope',
-				'isSyncMaintained',
 			])
 			->getMock();
 		$this->userBackend1 = $this->getMockBuilder(UserInterface::class)

diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php
@@ -90,8 +90,7 @@ private function getTestBackend($implementedActions = null, $visibleForScopes =
 				'deleteGroup',
 				'addToGroup',
 				'removeFromGroup',
-				'isVisibleForScope',
-				'isSyncMaintained'
+				'isVisibleForScope'
 			])
 			->getMock();
 		$backend->expects($this->any())

diff --git a/tests/lib/Group/SyncServiceTest.php b/tests/lib/Group/SyncServiceTest.php
@@ -80,7 +80,6 @@ public function setUp() {
 				'addToGroup',
 				'removeFromGroup',
 				'isVisibleForScope',
-				'isSyncMaintained',
 			])
 			->getMock();
 

diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php
@@ -76,9 +76,6 @@ protected function setUp() {
 		$this->groupSyncService = $this->createMock(\OC\Group\SyncService::class);
 
 		$groupBackend = $this->createMock(GroupInterface::class);
-		$groupBackend->expects($this->any())
-			->method('isSyncMaintained')
-			->willReturn(true);
 		$this->groupManager->expects($this->any())
 			->method('getBackends')
 			->willReturn([$groupBackend]);