-
+
@@ -935,24 +936,9 @@ function roomLimitModeChanged (value) {
}
/**
- * Options for the room token expiration mode radio button group.
+ * Options for time period selects (room token expiration, room auto delete, etc.)
*/
-const roomTokenExpirationOptions = computed(() => {
- return [
- { value: 1440, text: t('settings.application.one_day') },
- { value: 10080, text: t('settings.application.one_week') },
- { value: 43200, text: t('settings.application.one_month') },
- { value: 129600, text: t('settings.application.three_month') },
- { value: 262800, text: t('settings.application.six_month') },
- { value: 525600, text: t('settings.application.one_year') },
- { value: -1, text: t('app.unlimited') }
- ];
-});
-
-/**
- * Options for the room auto deletion never used and inactive selects.
- */
-const roomDeleteNotificationOptions = computed(() => {
+const timePeriods = computed(() => {
return [
{ value: 7, text: t('settings.application.one_week') },
{ value: 14, text: t('settings.application.two_weeks') },
@@ -961,19 +947,15 @@ const roomDeleteNotificationOptions = computed(() => {
{ value: 180, text: t('settings.application.six_month') },
{ value: 365, text: t('settings.application.one_year') },
{ value: 730, text: t('settings.application.two_years') },
- { value: -1, text: t('settings.application.never') }
+ { value: -1, text: t('app.unlimited') }
];
});
/**
- * Options for the room auto deletion deadline.
+ * Options for the room auto deletion deadline select.
*/
const roomDeleteDeadlineOptions = computed(() => {
- return [
- { value: 7, text: t('settings.application.one_week') },
- { value: 14, text: t('settings.application.two_weeks') },
- { value: 30, text: t('settings.application.one_month') }
- ];
+ return timePeriods.value.filter((period) => period.value <= 30 && period.value !== -1);
});
onMounted(() => {
diff --git a/tests/Feature/api/v1/Room/RoomTokenTest.php b/tests/Feature/api/v1/Room/RoomTokenTest.php
index 6bab8b347..dc26a95b7 100644
--- a/tests/Feature/api/v1/Room/RoomTokenTest.php
+++ b/tests/Feature/api/v1/Room/RoomTokenTest.php
@@ -111,7 +111,7 @@ public function testIndex()
// Check expire date
$results = $this->actingAs($this->user)->getJson(route('api.v1.rooms.tokens.get', ['room' => $this->room]))->json('data');
$token = RoomToken::find($results[0]['token']);
- self::assertEquals($token->created_at->addMinutes(90)->toISOString(), $results[0]['expires']);
+ self::assertEquals($token->created_at->addDays(90)->toISOString(), $results[0]['expires']);
setting(['room_token_expiration' => -1]);
$results = $this->actingAs($this->user)->getJson(route('api.v1.rooms.tokens.get', ['room' => $this->room]))->json('data');
diff --git a/tests/Feature/api/v1/SettingsTest.php b/tests/Feature/api/v1/SettingsTest.php
index 6cdfe6de1..89d10ce4d 100644
--- a/tests/Feature/api/v1/SettingsTest.php
+++ b/tests/Feature/api/v1/SettingsTest.php
@@ -805,7 +805,7 @@ public function testUpdateApplicationSettingsWithInvalidInputs()
$payload['banner'] = [
'enabled' => 'foo',
];
- $payload['room_token_expiration'] = 1440;
+ $payload['room_token_expiration'] = 7;
$payload['help_url'] = '';
$payload['legal_notice_url'] = '';
$payload['privacy_policy_url'] = '';
diff --git a/tests/Unit/Console/DeleteObsoleteTokensTest.php b/tests/Unit/Console/DeleteObsoleteTokensTest.php
index 83ed0b7b2..d0705374b 100644
--- a/tests/Unit/Console/DeleteObsoleteTokensTest.php
+++ b/tests/Unit/Console/DeleteObsoleteTokensTest.php
@@ -36,17 +36,17 @@ public function testDeletionOfExpiredRoomTokens()
RoomToken::factory()->count(2)->create();
RoomToken::factory()->create([
- 'created_at' => Carbon::now()->subMinutes(11),
+ 'created_at' => Carbon::now()->subDays(11),
]);
RoomToken::factory()->create([
- 'created_at' => Carbon::now()->subMinutes(11),
- 'last_usage' => Carbon::now()->subMinutes(5),
+ 'created_at' => Carbon::now()->subDays(11),
+ 'last_usage' => Carbon::now()->subDays(5),
]);
RoomToken::factory()->create([
- 'created_at' => Carbon::now()->subMinutes(20),
- 'last_usage' => Carbon::now()->subMinutes(11),
+ 'created_at' => Carbon::now()->subDays(20),
+ 'last_usage' => Carbon::now()->subDays(11),
]);
$this->assertDatabaseCount('room_tokens', 5);