Merge pull request #457 from nextcloud/backport/444/stable16

[stable16] use UserSession for dav conn

lib/Service/CirclesService.php

@@ -49,6 +49,7 @@
 use OCA\Circles\Model\Member;
 use OCP\IGroupManager;
 use OCP\IL10N;
+use OCP\IUserSession;
 
 class CirclesService {
 
@@ -91,6 +92,7 @@ class CirclesService {
 	 *
 	 * @param string $userId
 	 * @param IL10N $l10n
+	 * @param IUserSession $userSession
 	 * @param IGroupManager $groupManager
 	 * @param ConfigService $configService
 	 * @param CirclesRequest $circlesRequest
@@ -104,6 +106,7 @@ class CirclesService {
 	public function __construct(
 		$userId,
 		IL10N $l10n,
+		IUserSession $userSession,
 		IGroupManager $groupManager,
 		ConfigService $configService,
 		CirclesRequest $circlesRequest,
@@ -114,6 +117,14 @@ public function __construct(
 		CircleProviderRequest $circleProviderRequest,
 		MiscService $miscService
 	) {
+
+		if ($userId === null) {
+			$user = $userSession->getUser();
+			if ($user !== null) {
+				$userId = $user->getUID();
+			}
+		}
+
 		$this->userId = $userId;
 		$this->l10n = $l10n;
 		$this->groupManager = $groupManager;