From 06afdf4349fcfd1391ec462fd15286cf51485e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Z=C3=BCrcher?= <zuercher@mst.local>
Date: Sat, 8 Nov 2025 12:09:56 +0100
Subject: [PATCH] add feature to set user defined expiration on every user
 close #4

---
 backend/go.mod                             |  2 +-
 backend/go.sum                             |  4 +--
 src/assets/lang/de-CH.yaml                 |  2 ++
 src/assets/lang/de-DE.yaml                 |  2 ++
 src/assets/lang/en-US.yaml                 |  2 ++
 src/boot/axios.ts                          | 15 ++++++++
 src/components/AddToEvent.vue              | 10 +++++-
 src/components/EditOneDialog.vue           | 35 +++++++++++++++---
 src/components/UserEditAllDialog.vue       |  7 ++--
 src/vueLib/models/users.ts                 |  2 +-
 src/vueLib/tables/members/MembersTable.vue | 10 +++---
 src/vueLib/tables/users/UserTable.ts       |  8 +++++
 src/vueLib/tables/users/UserTable.vue      | 41 +++++++++++++++-------
 13 files changed, 110 insertions(+), 30 deletions(-)

diff --git a/backend/go.mod b/backend/go.mod
index bbb564b..99fdf8f 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -3,7 +3,7 @@ module backend
 go 1.24.5
 
 require (
-	gitea.tecamino.com/paadi/access-handler v1.0.15
+	gitea.tecamino.com/paadi/access-handler v1.0.19
 	gitea.tecamino.com/paadi/memberDB v1.0.21
 	gitea.tecamino.com/paadi/tecamino-dbm v0.1.1
 	gitea.tecamino.com/paadi/tecamino-logger v0.2.1
diff --git a/backend/go.sum b/backend/go.sum
index c8f1d55..1cf0f8b 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -1,5 +1,5 @@
-gitea.tecamino.com/paadi/access-handler v1.0.15 h1:izXWf64fsyPwnqVnL5MO4oRzAtZ1XPvbgxfOt/np1dM=
-gitea.tecamino.com/paadi/access-handler v1.0.15/go.mod h1:wKsB5/Rvaj580gdg3+GbUf5V/0N00XN6cID+C/8135M=
+gitea.tecamino.com/paadi/access-handler v1.0.19 h1:L51Qg5RNjdIGeQsHwGUTV+ADRpUqPt3qdnu7A7UQbsw=
+gitea.tecamino.com/paadi/access-handler v1.0.19/go.mod h1:wKsB5/Rvaj580gdg3+GbUf5V/0N00XN6cID+C/8135M=
 gitea.tecamino.com/paadi/dbHandler v1.0.8 h1:ZWSBM/KFtLwTv2cBqwK1mOxWAxAfL0BcWEC3kJ9JALU=
 gitea.tecamino.com/paadi/dbHandler v1.0.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
 gitea.tecamino.com/paadi/memberDB v1.0.21 h1:kGQe5fUOc50oQj8caWcjnmmxJaSPuQEjeSG5qDT9Iz4=
diff --git a/src/assets/lang/de-CH.yaml b/src/assets/lang/de-CH.yaml
index caefe9b..1595442 100644
--- a/src/assets/lang/de-CH.yaml
+++ b/src/assets/lang/de-CH.yaml
@@ -111,3 +111,5 @@ responsibleAdded: Veratwortläche hinzuegfüegt
 responsiblesAdded: Veratwortläche hinzuegfüegt
 deleteResponsible: Veratwortläche entfernt
 deleteResponsibles: Veratwortläche entfernt
+expiration: Ablauf
+never: Nie
diff --git a/src/assets/lang/de-DE.yaml b/src/assets/lang/de-DE.yaml
index ae40d49..b2df1bc 100644
--- a/src/assets/lang/de-DE.yaml
+++ b/src/assets/lang/de-DE.yaml
@@ -111,3 +111,5 @@ responsibleAdded: Veratwortläche hinzuegfüegt
 responsiblesAdded: Verantwortliche hinzuegfüegt
 deleteResponsible: Verantwortliche entfernt
 deleteResponsibles: Verantwortliche entfernt
+expiration: Ablauf
+never: Nie
diff --git a/src/assets/lang/en-US.yaml b/src/assets/lang/en-US.yaml
index b653107..7f482e9 100644
--- a/src/assets/lang/en-US.yaml
+++ b/src/assets/lang/en-US.yaml
@@ -111,3 +111,5 @@ responsibleAdded: Responsible hinzuegfüegt
 responsiblesAdded: Responsibles hinzuegfüegt
 deleteResponsible: Responsible deleted
 deleteResponsibles: Responsibles deleted
+expiration: Expiration
+never: Never
diff --git a/src/boot/axios.ts b/src/boot/axios.ts
index ed0db55..8297383 100644
--- a/src/boot/axios.ts
+++ b/src/boot/axios.ts
@@ -55,6 +55,21 @@ appApi.interceptors.response.use(
 
     // Handle unauthorized responses
     if (error.response?.status === 401 && !originalRequest._retry) {
+      const data = error.response?.data;
+      const serverMessage =
+        typeof data === 'object' && data !== null && 'message' in data
+          ? (data as { message: string }).message
+          : undefined;
+
+      if (['no refresh token', 'is expired'].some((msg) => serverMessage?.includes(msg))) {
+        console.warn('[Axios] No refresh token — logging out');
+        try {
+          await logout();
+        } catch (logoutErr) {
+          console.error('[Axios] Logout failed:', logoutErr);
+        }
+        throw new Error('Session expired: no refresh token');
+      }
       if (isRefreshing) {
         // Wait until refresh completes
         return new Promise<AxiosResponse>((resolve, reject) => {
diff --git a/src/components/AddToEvent.vue b/src/components/AddToEvent.vue
index 24c316b..3d64408 100644
--- a/src/components/AddToEvent.vue
+++ b/src/components/AddToEvent.vue
@@ -18,7 +18,15 @@
       <q-btn class="q-ma-md" color="primary" no-caps @click="addAttendees">{{ localTitle }}</q-btn>
     </div>
   </DialogFrame>
-  <EditAllDialog ref="newEventRef" v-on:update="(val) => resolveNewEvent(val)"></EditAllDialog>
+  <EditAllDialog
+    ref="newEventRef"
+    v-on:update="
+      (val) => {
+        resolveNewEvent(val);
+        NotifyResponse($t('memberUpdated'));
+      }
+    "
+  ></EditAllDialog>
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/EditOneDialog.vue b/src/components/EditOneDialog.vue
index 30425d3..ed4ef06 100644
--- a/src/components/EditOneDialog.vue
+++ b/src/components/EditOneDialog.vue
@@ -2,24 +2,46 @@
   <DialogFrame ref="dialog" :header-title="'Edit ' + localTitle">
     <div class="row justify-center">
       <q-input autofocus :label="localTitle" filled v-model="value" @keyup.enter="save">
-        <template v-if="['firstVisit', 'lastVisit', 'date'].includes(localField)" v-slot:prepend>
+        <template
+          v-if="['firstVisit', 'lastVisit', 'date', 'expiration'].includes(localField)"
+          v-slot:prepend
+        >
           <q-icon name="event" class="cursor-pointer">
             <q-popup-proxy cover transition-show="scale" transition-hide="scale">
               <q-date v-model="value" mask="YYYY-MM-DD HH:mm:ss">
                 <div class="row items-center justify-end">
                   <q-btn :label="$t('now')" color="primary" no-caps flat @click="setTimeNow" />
+                  <q-btn
+                    v-if="localField"
+                    :label="$t('never')"
+                    color="primary"
+                    no-caps
+                    flat
+                    @click="value = 'never'"
+                  />
                   <q-btn no-caps v-close-popup :label="$t('close')" color="primary" flat />
                 </div>
               </q-date>
             </q-popup-proxy>
           </q-icon>
         </template>
-        <template v-if="['firstVisit', 'lastVisit', 'date'].includes(localField)" v-slot:append>
+        <template
+          v-if="['firstVisit', 'lastVisit', 'date', 'expiration'].includes(localField)"
+          v-slot:append
+        >
           <q-icon name="access_time" class="cursor-pointer">
             <q-popup-proxy cover transition-show="scale" transition-hide="scale">
               <q-time with-seconds v-model="value" mask="YYYY-MM-DD HH:mm:ss" format24h>
                 <div class="row items-center justify-end">
                   <q-btn :label="$t('now')" color="primary" no-caps flat @click="setTimeNow" />
+                  <q-btn
+                    v-if="localField"
+                    :label="$t('never')"
+                    color="primary"
+                    no-caps
+                    flat
+                    @click="value = 'never'"
+                  />
                   <q-btn no-caps v-close-popup :label="$t('close')" color="primary" flat />
                 </div>
               </q-time>
@@ -40,7 +62,6 @@ import { ref } from 'vue';
 import { appApi } from 'src/boot/axios';
 import type { Member } from 'src/vueLib/models/member';
 import { useNotify } from 'src/vueLib/general/useNotify';
-import { i18n } from 'src/boot/lang';
 
 const dialog = ref();
 const localMember = ref();
@@ -51,7 +72,6 @@ const value = ref('');
 const props = defineProps({
   endpoint: {
     type: String,
-    required: true,
   },
 });
 
@@ -74,6 +94,12 @@ function save() {
     dialog.value.close();
     return;
   }
+
+  if (!props.endpoint) {
+    localMember.value[localField.value] = value.value;
+    emit('update', localMember.value);
+    return;
+  }
   payload = [
     {
       id: localMember.value.id,
@@ -85,7 +111,6 @@ function save() {
     .post(props.endpoint, payload)
     .then(() => {
       emit('update');
-      NotifyResponse(i18n.global.t('memberUpdated'));
       dialog.value.close();
     })
     .catch((err) => {
diff --git a/src/components/UserEditAllDialog.vue b/src/components/UserEditAllDialog.vue
index 828725d..ef4d51b 100644
--- a/src/components/UserEditAllDialog.vue
+++ b/src/components/UserEditAllDialog.vue
@@ -91,10 +91,11 @@
             v-model="localUser.role"
           ></q-select>
           <q-input
-            class="col-5"
+            class="col-5 q-mt-xl"
             :label="$t('expires')"
             filled
-            v-model="localUser.expires"
+            type="datetime-local"
+            v-model="localUser.expiration"
           ></q-input>
         </div>
       </div>
@@ -131,7 +132,6 @@ const localUser = ref<User>({
   user: '',
   email: '',
   role: '',
-  expires: '',
 });
 
 const props = defineProps({
@@ -156,7 +156,6 @@ async function open(user: User | null) {
       user: '',
       email: '',
       role: '',
-      expires: '',
     };
     newUser.value = true;
   }
diff --git a/src/vueLib/models/users.ts b/src/vueLib/models/users.ts
index d1d0b5c..697d224 100644
--- a/src/vueLib/models/users.ts
+++ b/src/vueLib/models/users.ts
@@ -5,7 +5,7 @@ export interface User {
   user: string;
   email: string;
   role: string;
-  expires: string;
+  expiration?: string;
   password?: string;
   settings?: Settings;
 }
diff --git a/src/vueLib/tables/members/MembersTable.vue b/src/vueLib/tables/members/MembersTable.vue
index 56a75ee..bc0cdbd 100644
--- a/src/vueLib/tables/members/MembersTable.vue
+++ b/src/vueLib/tables/members/MembersTable.vue
@@ -116,7 +116,7 @@
         <q-td :props="props">
           <q-select
             v-if="responsibles.length > 0"
-            :disable="!user.isPermittedTo('members', 'write')"
+            :readonly="!user.isPermittedTo('members', 'write')"
             :options="responsibles"
             :option-label="(opt) => opt.firstName + ' ' + opt.lastName"
             v-model="props.row.responsiblePerson"
@@ -164,12 +164,12 @@
     ref="editOneDialog"
     endpoint="members/edit"
     query-id
-    v-on:update="updateMembers"
+    v-on:update="updateMember"
   ></EditOneDialog>
   <EditAllDialog
     ref="editAllDialog"
     :responsibles="responsibles"
-    v-on:update="updateMembers"
+    v-on:update="updateMember"
   ></EditAllDialog>
   <OkDialog
     ref="okDialog"
@@ -326,11 +326,13 @@ function removeMember(...removeMembers: Members) {
     });
 }
 
-function updateMember(member: Member) {
+function updateMember(member: Member | null) {
+  if (!member) NotifyResponse(i18n.global.t('memberUpdated'));
   appApi
     .post('/members/edit', [member])
     .then(() => NotifyResponse(i18n.global.t('memberUpdated')))
     .catch((err) => NotifyResponse(err, 'error'));
+  updateMembers().catch((err) => NotifyResponse(err, 'error'));
 }
 
 function addToEvent() {
diff --git a/src/vueLib/tables/users/UserTable.ts b/src/vueLib/tables/users/UserTable.ts
index 68a9db1..7f5ad7d 100644
--- a/src/vueLib/tables/users/UserTable.ts
+++ b/src/vueLib/tables/users/UserTable.ts
@@ -37,6 +37,14 @@ export function useUserTable() {
       sortable: true,
       style: 'width: 120px; max-width: 120px;',
     },
+    {
+      name: 'expiration',
+      align: 'left' as const,
+      label: i18n.global.t('expiration'),
+      field: 'expiration',
+      sortable: true,
+      style: 'width: 120px; max-width: 120px;',
+    },
     { name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
   ]);
 
diff --git a/src/vueLib/tables/users/UserTable.vue b/src/vueLib/tables/users/UserTable.vue
index 0a33e6a..c469ebf 100644
--- a/src/vueLib/tables/users/UserTable.vue
+++ b/src/vueLib/tables/users/UserTable.vue
@@ -67,17 +67,7 @@
         </q-input>
       </template>
       <template v-slot:body-cell="props">
-        <q-td v-if="props.col.name === 'role'" :props="props">
-          <q-select
-            :readonly="!user.isPermittedTo('userSettings', 'write') || !autorized(props.row)"
-            dense
-            v-model="props.row.role"
-            :options="localRoles"
-            @update:model-value="updateUser(props.row)"
-          ></q-select>
-        </q-td>
         <q-td
-          v-else
           :props="props"
           :style="
             autorized(props.row) && user.isPermittedTo('userSettings', 'write')
@@ -93,6 +83,34 @@
           {{ props.value }}
         </q-td>
       </template>
+      <template v-slot:body-cell-role="props">
+        <q-td :props="props">
+          <q-select
+            :readonly="!user.isPermittedTo('userSettings', 'write') || !autorized(props.row)"
+            dense
+            v-model="props.row.role"
+            :options="localRoles"
+            @update:model-value="updateUser(props.row)"
+          ></q-select>
+        </q-td>
+      </template>
+      <template v-slot:body-cell-expiration="props">
+        <q-td
+          :props="props"
+          :style="
+            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+              ? 'cursor: pointer'
+              : ''
+          "
+          @click="
+            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+              ? openSingleValueDialog(props.col.label, props.col.name, props.row)
+              : ''
+          "
+        >
+          {{ props.value === 'never' ? $t('never') : props.value }}
+        </q-td>
+      </template>
       <template v-slot:body-cell-option="props">
         <q-td :props="props">
           <q-btn
@@ -112,9 +130,8 @@
   </div>
   <EditOneDialog
     ref="editOneDialog"
-    endpoint="users/edit"
     query-id
-    v-on:update="updateUsers"
+    v-on:update="(val) => updateUser(val)"
   ></EditOneDialog>
   <EditAllDialog ref="editAllDialog" :roles="localRoles" v-on:update="updateUsers"></EditAllDialog>
   <OkDialog