Merge pull request #286 from nextcloud/fix-268

always create user in the SAML back-end and update the attributes

2 files changed, 26 insertions, 14 deletions

diff --git a/lib/Controller/SAMLController.php b/lib/Controller/SAMLController.php
index 902199a4..8f508b22 100644
--- a/lib/Controller/SAMLController.php
+++ b/lib/Controller/SAMLController.php
@@ -284,7 +284,10 @@ class SAMLController extends Controller {
 			if (!($user instanceof IUser)) {
 				throw new \InvalidArgumentException('User is not valid');
 			}
-			$user->updateLastLoginTimestamp();
+			$firstLogin = $user->updateLastLoginTimestamp();
+			if($firstLogin) {
+				$this->userBackend->initializeHomeDir($user->getUID());
+			}
 		} catch (\Exception $e) {
 			$this->logger->logException($e, ['app' => $this->appName]);
 			return new Http\RedirectResponse($this->urlGenerator->linkToRouteAbsolute('user_saml.SAML.notProvisioned'));
diff --git a/lib/UserBackend.php b/lib/UserBackend.php
index 026c275a..bc8d9f3f 100644
--- a/lib/UserBackend.php
+++ b/lib/UserBackend.php
@@ -146,19 +146,28 @@ class UserBackend implements IApacheBackend, UserInterface, IUserBackend {
 			}
 			$qb->execute();
 
-			### Code taken from lib/private/User/Session.php - function prepareUserLogin() ###
-			//trigger creation of user home and /files folder
-			$userFolder = \OC::$server->getUserFolder($uid);
-			try {
-				// copy skeleton
-				\OC_Util::copySkeleton($uid, $userFolder);
-			} catch (NotPermittedException $ex) {
-				// read only uses
-			}
-			// trigger any other initialization
-			$user = $this->userManager->get($uid);
-			\OC::$server->getEventDispatcher()->dispatch(IUser::class . '::firstLogin', new GenericEvent($user));
+			$this->initializeHomeDir($uid);
+
+		}
+	}
+
+	/**
+	 * @param string $uid
+	 * @throws \OCP\Files\NotFoundException
+	 */
+	public function initializeHomeDir($uid) {
+		### Code taken from lib/private/User/Session.php - function prepareUserLogin() ###
+		//trigger creation of user home and /files folder
+		$userFolder = \OC::$server->getUserFolder($uid);
+		try {
+			// copy skeleton
+			\OC_Util::copySkeleton($uid, $userFolder);
+		} catch (NotPermittedException $ex) {
+			// read only uses
 		}
+		// trigger any other initialization
+		$user = $this->userManager->get($uid);
+		\OC::$server->getEventDispatcher()->dispatch(IUser::class . '::firstLogin', new GenericEvent($user));
 	}
 
 	/**
@@ -227,7 +236,7 @@ class UserBackend implements IApacheBackend, UserInterface, IUserBackend {
 	/**
 	 * Returns the user's home directory, if home directory mapping is set up.
 	 *
-	 * @param string $uid the username	
+	 * @param string $uid the username
 	 * @return string
 	 */
 	public function getHome($uid) {