Merge branch 'api-token-expire-today' into 'main'

Fix API token expiring today shown as expired in UI See merge request reportcreator/reportcreator!485
Syslifters · Mar 19, 2024 · d0b9387 · d0b9387
2 parents fb58bf0 + b494774
commit d0b9387
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Changelog
 
 ## Next
-* Add Content Security Policy directive form-action
+* Collaborative editing in notes
 * Remember "Encrypt PDF" setting in browser's local storage
 * Fix force change design API request not sent
-* Collaborative editing in notes
+* Add Content Security Policy directive form-action
+* Fix API token expiring today shown as expired in UI
 * Markdown editor: Improve vue template variable handling
 * Markdown editor: Allow escaping curly braces
 

diff --git a/frontend/src/components/Chip/Expires.vue b/frontend/src/components/Chip/Expires.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script setup lang="ts">
-import { formatDistanceToNow, parseISO, formatISO9075 } from 'date-fns';
+import { formatDistanceToNow, parseISO, formatISO9075, endOfDay, endOfToday } from 'date-fns';
 
 const props = withDefaults(defineProps<{
   value?: string|null,
@@ -34,5 +34,5 @@ const formattedDate = computed(() => {
   }
   return 'in ' + formatDistanceToNow(date.value);
 });
-const isExpired = computed(() => date.value && date.value < new Date());
+const isExpired = computed(() => date.value && endOfDay(date.value) < endOfToday());
 </script>
diff --git a/frontend/src/components/S/DatePicker.vue b/frontend/src/components/S/DatePicker.vue
@@ -21,6 +21,7 @@
       <v-date-picker
         v-model="dateValue"
         :disabled="props.disabled || props.disabled"
+        :min="props.minDate"
         view-mode="month"
         show-adjacent-months
         show-week
@@ -36,11 +37,13 @@ const props = withDefaults(defineProps<{
   disabled?: boolean;
   readonly?: boolean;
   locale?: string;
+  minDate?: string;
 }>(), {
   modelValue: null,
   disabled: false,
   readonly: false,
   locale: 'en',
+  minDate: undefined,
 });
 const emits = defineEmits<{
   (e: 'update:modelValue', modelValue: string|null): void,

diff --git a/frontend/src/pages/users/self/apitokens.vue b/frontend/src/pages/users/self/apitokens.vue
@@ -62,6 +62,7 @@
                       v-model="setupWizard.form.expire_date"
                       label="Expire Date (optional)"
                       :error-messages="setupWizard.errors?.expire_date"
+                      :min-date="formatISO9075(new Date(), { representation: 'date' })"
                     />
                   </v-card-text>
                   <v-card-actions>
@@ -104,6 +105,8 @@
 </template>
 
 <script setup lang="ts">
+import { formatISO9075 } from 'date-fns';
+
 const auth = useAuth();
 const apiTokens = await useAsyncDataE<ApiToken[]>(async () => {
   try {