feat: Add first login timestamp of each user to oc_preferences and user:info output

apps/provisioning_api/lib/Controller/AUserData.php

@@ -116,6 +116,7 @@ protected function getUserData(string $userId, bool $includeScopes = false): ?ar
 
 		// Find the data
 		$data['id'] = $targetUserObject->getUID();
+		$data['firstLogin'] = $targetUserObject->getFirstLogin() * 1000;
 		$data['lastLogin'] = $targetUserObject->getLastLogin() * 1000;
 		$data['backend'] = $targetUserObject->getBackendClassName();
 		$data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID());

apps/provisioning_api/lib/ResponseDefinitions.php

@@ -46,6 +46,7 @@
  *     headlineScope?: Provisioning_APIUserDetailsScope,
  *     id: string,
  *     language: string,
+ *     firstLogin: int,
  *     lastLogin: int,
  *     locale: string,
  *     manager: string,

apps/provisioning_api/openapi-administration.json

@@ -92,6 +92,7 @@
                     "headline",
                     "id",
                     "language",
+                    "firstLogin",
                     "lastLogin",
                     "locale",
                     "manager",
@@ -195,6 +196,10 @@
                     "language": {
                         "type": "string"
                     },
+                    "firstLogin": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
                     "lastLogin": {
                         "type": "integer",
                         "format": "int64"

apps/provisioning_api/openapi-full.json

@@ -139,6 +139,7 @@
                     "headline",
                     "id",
                     "language",
+                    "firstLogin",
                     "lastLogin",
                     "locale",
                     "manager",
@@ -242,6 +243,10 @@
                     "language": {
                         "type": "string"
                     },
+                    "firstLogin": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
                     "lastLogin": {
                         "type": "integer",
                         "format": "int64"

apps/provisioning_api/openapi.json

@@ -139,6 +139,7 @@
                     "headline",
                     "id",
                     "language",
+                    "firstLogin",
                     "lastLogin",
                     "locale",
                     "manager",
@@ -242,6 +243,10 @@
                     "language": {
                         "type": "string"
                     },
+                    "firstLogin": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
                     "lastLogin": {
                         "type": "integer",
                         "format": "int64"

apps/provisioning_api/tests/Controller/UsersControllerTest.php

@@ -1147,6 +1147,10 @@ public function testGetUserDataAsAdmin(): void {
 			->expects($this->once())
 			->method('getLastLogin')
 			->willReturn(1521191471);
+		$targetUser
+			->expects($this->once())
+			->method('getFirstLogin')
+			->willReturn(1511191471);
 		$targetUser
 			->expects($this->once())
 			->method('getBackendClassName')
@@ -1169,6 +1173,7 @@ public function testGetUserDataAsAdmin(): void {
 			'id' => 'UID',
 			'enabled' => true,
 			'storageLocation' => '/var/www/newtcloud/data/UID',
+			'firstLogin' => 1511191471000,
 			'lastLogin' => 1521191471000,
 			'backend' => 'Database',
 			'subadmin' => ['group3'],
@@ -1273,6 +1278,10 @@ public function testGetUserDataAsSubAdminAndUserIsAccessible(): void {
 			->expects($this->once())
 			->method('getLastLogin')
 			->willReturn(1521191471);
+		$targetUser
+			->expects($this->once())
+			->method('getFirstLogin')
+			->willReturn(1511191471);
 		$targetUser
 			->expects($this->once())
 			->method('getBackendClassName')
@@ -1308,6 +1317,7 @@ public function testGetUserDataAsSubAdminAndUserIsAccessible(): void {
 		$expected = [
 			'id' => 'UID',
 			'enabled' => true,
+			'firstLogin' => 1511191471000,
 			'lastLogin' => 1521191471000,
 			'backend' => 'Database',
 			'subadmin' => [],
@@ -1455,6 +1465,10 @@ public function testGetUserDataAsSubAdminSelfLookup(): void {
 			->expects($this->once())
 			->method('getLastLogin')
 			->willReturn(1521191471);
+		$targetUser
+			->expects($this->once())
+			->method('getFirstLogin')
+			->willReturn(1511191471);
 		$targetUser
 			->expects($this->once())
 			->method('getBackendClassName')
@@ -1485,6 +1499,7 @@ public function testGetUserDataAsSubAdminSelfLookup(): void {
 
 		$expected = [
 			'id' => 'UID',
+			'firstLogin' => 1511191471000,
 			'lastLogin' => 1521191471000,
 			'backend' => 'Database',
 			'subadmin' => [],

core/Command/User/Info.php

@@ -47,6 +47,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			return 1;
 		}
 		$groups = $this->groupManager->getUserGroupIds($user);
+		$firstLogin = $user->getFirstLogin();
+		$lastLogin = $user->getLastLogin();
+		if ($firstLogin < 0) {
+			$firstSeen = 'unknown';
+		} elseif ($firstLogin === 0) {
+			$firstSeen = 'never';
+		} else {
+			$firstSeen = date(\DateTimeInterface::ATOM, $firstLogin); // ISO-8601
+		}
+		if ($lastLogin < 0) {
+			$lastSeen = 'unknown';
+		} elseif ($lastLogin === 0) {
+			$lastSeen = 'never';
+		} else {
+			$lastSeen = date(\DateTimeInterface::ATOM, $lastLogin); // ISO-8601
+		}
 		$data = [
 			'user_id' => $user->getUID(),
 			'display_name' => $user->getDisplayName(),
@@ -56,7 +72,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			'groups' => $groups,
 			'quota' => $user->getQuota(),
 			'storage' => $this->getStorageInfo($user),
-			'last_seen' => date(\DateTimeInterface::ATOM, $user->getLastLogin()), // ISO-8601
+			'first_seen' => $firstSeen,
+			'last_seen' => $lastSeen,
 			'user_directory' => $user->getHome(),
 			'backend' => $user->getBackendClassName()
 		];

lib/private/User/LazyUser.php

@@ -60,11 +60,15 @@ public function setDisplayName($displayName) {
 		return $this->getUser()->setDisplayName($displayName);
 	}
 
-	public function getLastLogin() {
+	public function getLastLogin(): int {
 		return $this->getUser()->getLastLogin();
 	}
 
-	public function updateLastLoginTimestamp() {
+	public function getFirstLogin(): int {
+		return $this->getUser()->getFirstLogin();
+	}
+
+	public function updateLastLoginTimestamp(): bool {
 		return $this->getUser()->updateLastLoginTimestamp();
 	}
 

lib/private/User/User.php

@@ -65,8 +65,8 @@ class User implements IUser {
 	/** @var string */
 	private $home;
 
-	/** @var int|null */
-	private $lastLogin;
+	private ?int $lastLogin = null;
+	private ?int $firstLogin = null;
 
 	/** @var IAvatarManager */
 	private $avatarManager;
@@ -202,28 +202,47 @@ private function ensureAccountManager() {
 	/**
 	 * returns the timestamp of the user's last login or 0 if the user did never
 	 * login
-	 *
-	 * @return int
 	 */
-	public function getLastLogin() {
+	public function getLastLogin(): int {
 		if ($this->lastLogin === null) {
 			$this->lastLogin = (int)$this->config->getUserValue($this->uid, 'login', 'lastLogin', 0);
 		}
-		return (int)$this->lastLogin;
+		return $this->lastLogin;
+	}
+
+	/**
+	 * returns the timestamp of the user's last login or 0 if the user did never
+	 * login
+	 */
+	public function getFirstLogin(): int {
+		if ($this->firstLogin === null) {
+			$this->firstLogin = (int)$this->config->getUserValue($this->uid, 'login', 'firstLogin', 0);
+		}
+		return $this->firstLogin;
 	}
 
 	/**
 	 * updates the timestamp of the most recent login of this user
 	 */
-	public function updateLastLoginTimestamp() {
+	public function updateLastLoginTimestamp(): bool {
 		$previousLogin = $this->getLastLogin();
+		$firstLogin = $this->getFirstLogin();
 		$now = time();
 		$firstTimeLogin = $previousLogin === 0;
 
 		if ($now - $previousLogin > 60) {
-			$this->lastLogin = time();
-			$this->config->setUserValue(
-				$this->uid, 'login', 'lastLogin', (string)$this->lastLogin);
+			$this->lastLogin = $now;
+			$this->config->setUserValue($this->uid, 'login', 'lastLogin', (string)$this->lastLogin);
+		}
+
+		if ($firstLogin === 0) {
+			if ($firstTimeLogin) {
+				$this->firstLogin = $now;
+			} else {
+				/* Unknown first login, most likely was before upgrade to Nextcloud 31 */
+				$this->firstLogin = -1;
+			}
+			$this->config->setUserValue($this->uid, 'login', 'firstLogin', (string)$this->firstLogin);
 		}
 
 		return $firstTimeLogin;

lib/public/IUser.php

@@ -50,13 +50,22 @@ public function setDisplayName($displayName);
 	 * @return int
 	 * @since 8.0.0
 	 */
-	public function getLastLogin();
+	public function getLastLogin(): int;
 
 	/**
-	 * updates the timestamp of the most recent login of this user
+	 * Returns the timestamp of the user's first login, 0 if the user did never login, or -1 if the data is unknown (first login was on an older version)
+	 *
+	 * @since 31.0.0
+	 */
+	public function getFirstLogin(): int;
+
+	/**
+	 * Updates the timestamp of the most recent login of this user (and first login if needed)
+	 *
+	 * @return bool whether this is the first login
 	 * @since 8.0.0
 	 */
-	public function updateLastLoginTimestamp();
+	public function updateLastLoginTimestamp(): bool;
 
 	/**
 	 * Delete the user