Merge pull request #49377 from nextcloud/enh/add-first-login-timestamp

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

apps/provisioning_api/lib/Controller/AUserDataOCSController.php

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

apps/provisioning_api/lib/ResponseDefinitions.php

@@ -46,6 +46,8 @@
  *     headlineScope?: Provisioning_APIUserDetailsScope,
  *     id: string,
  *     language: string,
+ *     firstLoginTimestamp: int,
+ *     lastLoginTimestamp: int,
  *     lastLogin: int,
  *     locale: string,
  *     manager: string,

apps/provisioning_api/openapi-administration.json

@@ -92,6 +92,8 @@
                     "headline",
                     "id",
                     "language",
+                    "firstLoginTimestamp",
+                    "lastLoginTimestamp",
                     "lastLogin",
                     "locale",
                     "manager",
@@ -195,6 +197,14 @@
                     "language": {
                         "type": "string"
                     },
+                    "firstLoginTimestamp": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    "lastLoginTimestamp": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
                     "lastLogin": {
                         "type": "integer",
                         "format": "int64"

apps/provisioning_api/openapi-full.json

@@ -139,6 +139,8 @@
                     "headline",
                     "id",
                     "language",
+                    "firstLoginTimestamp",
+                    "lastLoginTimestamp",
                     "lastLogin",
                     "locale",
                     "manager",
@@ -242,6 +244,14 @@
                     "language": {
                         "type": "string"
                     },
+                    "firstLoginTimestamp": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    "lastLoginTimestamp": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
                     "lastLogin": {
                         "type": "integer",
                         "format": "int64"

apps/provisioning_api/openapi.json

@@ -139,6 +139,8 @@
                     "headline",
                     "id",
                     "language",
+                    "firstLoginTimestamp",
+                    "lastLoginTimestamp",
                     "lastLogin",
                     "locale",
                     "manager",
@@ -242,6 +244,14 @@
                     "language": {
                         "type": "string"
                     },
+                    "firstLoginTimestamp": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    "lastLoginTimestamp": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
                     "lastLogin": {
                         "type": "integer",
                         "format": "int64"

apps/provisioning_api/tests/Controller/UsersControllerTest.php

@@ -1144,9 +1144,13 @@ public function testGetUserDataAsAdmin(): void {
 			->method('getHome')
 			->willReturn('/var/www/newtcloud/data/UID');
 		$targetUser
-			->expects($this->once())
+			->expects($this->exactly(2))
 			->method('getLastLogin')
 			->willReturn(1521191471);
+		$targetUser
+			->expects($this->once())
+			->method('getFirstLogin')
+			->willReturn(1511191471);
 		$targetUser
 			->expects($this->once())
 			->method('getBackendClassName')
@@ -1169,6 +1173,8 @@ public function testGetUserDataAsAdmin(): void {
 			'id' => 'UID',
 			'enabled' => true,
 			'storageLocation' => '/var/www/newtcloud/data/UID',
+			'firstLoginTimestamp' => 1511191471,
+			'lastLoginTimestamp' => 1521191471,
 			'lastLogin' => 1521191471000,
 			'backend' => 'Database',
 			'subadmin' => ['group3'],
@@ -1270,9 +1276,13 @@ public function testGetUserDataAsSubAdminAndUserIsAccessible(): void {
 			->expects($this->never())
 			->method('getHome');
 		$targetUser
-			->expects($this->once())
+			->expects($this->exactly(2))
 			->method('getLastLogin')
 			->willReturn(1521191471);
+		$targetUser
+			->expects($this->once())
+			->method('getFirstLogin')
+			->willReturn(1511191471);
 		$targetUser
 			->expects($this->once())
 			->method('getBackendClassName')
@@ -1308,6 +1318,8 @@ public function testGetUserDataAsSubAdminAndUserIsAccessible(): void {
 		$expected = [
 			'id' => 'UID',
 			'enabled' => true,
+			'firstLoginTimestamp' => 1511191471,
+			'lastLoginTimestamp' => 1521191471,
 			'lastLogin' => 1521191471000,
 			'backend' => 'Database',
 			'subadmin' => [],
@@ -1452,9 +1464,13 @@ public function testGetUserDataAsSubAdminSelfLookup(): void {
 			->expects($this->never())
 			->method('getHome');
 		$targetUser
-			->expects($this->once())
+			->expects($this->exactly(2))
 			->method('getLastLogin')
 			->willReturn(1521191471);
+		$targetUser
+			->expects($this->once())
+			->method('getFirstLogin')
+			->willReturn(1511191471);
 		$targetUser
 			->expects($this->once())
 			->method('getBackendClassName')
@@ -1485,6 +1501,8 @@ public function testGetUserDataAsSubAdminSelfLookup(): void {
 
 		$expected = [
 			'id' => 'UID',
+			'firstLoginTimestamp' => 1511191471,
+			'lastLoginTimestamp' => 1521191471,
 			'lastLogin' => 1521191471000,
 			'backend' => 'Database',
 			'subadmin' => [],

apps/settings/src/components/Users/UserListHeader.vue

@@ -71,6 +71,12 @@
 				{{ t('settings', 'Storage location') }}
 			</span>
 		</th>
+		<th v-if="showConfig.showFirstLogin"
+			class="header__cell"
+			data-cy-user-list-header-first-login
+			scope="col">
+			<span>{{ t('settings', 'First login') }}</span>
+		</th>
 		<th v-if="showConfig.showLastLogin"
 			class="header__cell"
 			data-cy-user-list-header-last-login

apps/settings/src/components/Users/UserRow.vue

@@ -229,6 +229,12 @@
 			</template>
 		</td>
 
+		<td v-if="showConfig.showFirstLogin"
+			class="row__cell"
+			data-cy-user-list-cell-first-login>
+			<span v-if="!isObfuscated">{{ userFirstLogin }}</span>
+		</td>
+
 		<td v-if="showConfig.showLastLogin"
 			:title="userLastLoginTooltip"
 			class="row__cell"

apps/settings/src/components/Users/UserSettingsDialog.vue

@@ -24,6 +24,11 @@
 				:checked.sync="showStoragePath">
 				{{ t('settings', 'Show storage path') }}
 			</NcCheckboxRadioSwitch>
+			<NcCheckboxRadioSwitch type="switch"
+				data-test="showFirstLogin"
+				:checked.sync="showFirstLogin">
+				{{ t('settings', 'Show first login') }}
+			</NcCheckboxRadioSwitch>
 			<NcCheckboxRadioSwitch type="switch"
 				data-test="showLastLogin"
 				:checked.sync="showLastLogin">
@@ -164,6 +169,15 @@ export default {
 			},
 		},
 
+		showFirstLogin: {
+			get() {
+				return this.showConfig.showFirstLogin
+			},
+			set(status) {
+				this.setShowConfig('showFirstLogin', status)
+			},
+		},
+
 		showLastLogin: {
 			get() {
 				return this.showConfig.showLastLogin

apps/settings/src/mixins/UserRowMixin.js

@@ -4,6 +4,7 @@
  */
 
 import { formatFileSize } from '@nextcloud/files'
+import { useFormatDateTime } from '@nextcloud/vue'
 
 export default {
 	props: {
@@ -36,6 +37,12 @@ export default {
 			default: () => [],
 		},
 	},
+	setup(props) {
+		const { formattedFullTime } = useFormatDateTime(props.user.firstLoginTimestamp * 1000, { relativeTime: false })
+		return {
+			formattedFullTime,
+		}
+	},
 	computed: {
 		showConfig() {
 			return this.$store.getters.getShowConfig
@@ -120,16 +127,26 @@ export default {
 			return userLang
 		},
 
+		userFirstLogin() {
+			if (this.user.firstLoginTimestamp > 0) {
+				return this.formattedFullTime
+			}
+			if (this.user.firstLoginTimestamp < 0) {
+				return t('settings', 'Unknown')
+			}
+			return t('settings', 'Never')
+		},
+
 		/* LAST LOGIN */
 		userLastLoginTooltip() {
-			if (this.user.lastLogin > 0) {
-				return OC.Util.formatDate(this.user.lastLogin)
+			if (this.user.lastLoginTimestamp > 0) {
+				return OC.Util.formatDate(this.user.lastLoginTimestamp * 1000)
 			}
 			return ''
 		},
 		userLastLogin() {
-			if (this.user.lastLogin > 0) {
-				return OC.Util.relativeModifiedDate(this.user.lastLogin)
+			if (this.user.lastLoginTimestamp > 0) {
+				return OC.Util.relativeModifiedDate(this.user.lastLoginTimestamp * 1000)
 			}
 			return t('settings', 'Never')
 		},

apps/settings/src/store/users.js

@@ -40,6 +40,7 @@ const state = {
 	showConfig: {
 		showStoragePath: localStorage.getItem('account_settings__showStoragePath') === 'true',
 		showUserBackend: localStorage.getItem('account_settings__showUserBackend') === 'true',
+		showFirstLogin: localStorage.getItem('account_settings__showFirstLogin') === 'true',
 		showLastLogin: localStorage.getItem('account_settings__showLastLogin') === 'true',
 		showNewUserForm: localStorage.getItem('account_settings__showNewUserForm') === 'true',
 		showLanguages: localStorage.getItem('account_settings__showLanguages') === 'true',

core/Command/User/Info.php

@@ -56,14 +56,25 @@ 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' => $this->formatLoginDate($user->getFirstLogin()),
+			'last_seen' => $this->formatLoginDate($user->getLastLogin()),
 			'user_directory' => $user->getHome(),
 			'backend' => $user->getBackendClassName()
 		];
 		$this->writeArrayInOutputFormat($input, $output, $data);
 		return 0;
 	}
 
+	private function formatLoginDate(int $timestamp): string {
+		if ($timestamp < 0) {
+			return 'unknown';
+		} elseif ($timestamp === 0) {
+			return 'never';
+		} else {
+			return date(\DateTimeInterface::ATOM, $timestamp); // ISO-8601
+		}
+	}
+
 	/**
 	 * @param IUser $user
 	 * @return array

core/Command/User/ListCommand.php

@@ -83,7 +83,8 @@ private function formatUsers(array $users, bool $detailed = false): \Generator {
 					'enabled' => $user->isEnabled(),
 					'groups' => $groups,
 					'quota' => $user->getQuota(),
-					'last_seen' => date(\DateTimeInterface::ATOM, $user->getLastLogin()), // ISO-8601
+					'first_seen' => $this->formatLoginDate($user->getFirstLogin()),
+					'last_seen' => $this->formatLoginDate($user->getLastLogin()),
 					'user_directory' => $user->getHome(),
 					'backend' => $user->getBackendClassName()
 				];
@@ -93,4 +94,14 @@ private function formatUsers(array $users, bool $detailed = false): \Generator {
 			yield $user->getUID() => $value;
 		}
 	}
+
+	private function formatLoginDate(int $timestamp): string {
+		if ($timestamp < 0) {
+			return 'unknown';
+		} elseif ($timestamp === 0) {
+			return 'never';
+		} else {
+			return date(\DateTimeInterface::ATOM, $timestamp); // ISO-8601
+		}
+	}
 }