feature/exclude-expired-entries--option

_locales/en/messages.json

@@ -231,6 +231,10 @@
     "message": "Search all open Kee Vaults and KeePass databases",
     "description": ""
   },
+  "pref_excludeExpiredEntries_label": {
+    "message": "Exclude expired entries",
+    "description": "When enabled, matching entries that have expired (Expires=true and ExpiryTime is in the past) will be hidden from the result list."
+  },
   "pref_when_kee_chooses_standard_form_desc": {
     "message": "When Kee chooses a matching login for a standard form, Kee should",
     "description": "Context/label for user when changing setting relating to auto-fill/submit behaviour. A list of potential actions will be displayed immediately after this string and the user can select their preferred behaviour from that list."

src/background/jsonrpcClient.ts

@@ -244,6 +244,7 @@ export class jsonrpcClient {
             username
         ]);
         const results: Entry[] = [];
+        const now = new Date();
         for (const sessionResponse of sessionResponses) {
             if (sessionResponse.resultWrapper?.result?.[0]) {
                 const db = DatabaseSummary.fromKPRPCDatabaseSummaryDTO(
@@ -256,6 +257,13 @@ export class jsonrpcClient {
                 );
             }
         }
+        if (configManager.current.excludeExpiredEntries) {
+            return results.filter(entry => {
+                if (!entry.expires || !entry.expiryTime) return true;
+                const expiry = new Date(entry.expiryTime);
+                return isNaN(expiry.getTime()) || expiry >= now;
+            });
+        }
         return results;
     }
 

src/common/ConfigManager.ts

@@ -78,6 +78,7 @@ defaultConfig.theme = null;
 defaultConfig.hideConfirmationAfterSave = false;
 defaultConfig.mustShowReleaseNotesAtStartup = false;
 defaultConfig.autoFillFieldsWithExistingValue = false;
+defaultConfig.excludeExpiredEntries = false;
 
 export class ConfigManager {
     public current: Config;

src/common/config.ts

@@ -96,4 +96,5 @@ export class Config {
     hideConfirmationAfterSave: boolean;
     mustShowReleaseNotesAtStartup: boolean;
     autoFillFieldsWithExistingValue: boolean;
+    excludeExpiredEntries: boolean;
 }

src/common/model/Entry.ts

@@ -44,6 +44,9 @@ export class Entry {
 
     readonly database: DatabaseSummary;
 
+    readonly expires: boolean;
+    readonly expiryTime: string;
+
     // How relevant this entry is to the current form in
     // the browser - transient (not stored in KeePass)
     //TODO:5 put all match data into a new object?
@@ -67,6 +70,8 @@ export class Entry {
         this.matchAccuracy = e.matchAccuracy || 0;
         this.icon = e.icon || { version: 1, iconImageData: "" };
         this.database = e.database || new Database({});
+        this.expires = e.expires || false;
+        this.expiryTime = e.expiryTime || "";
         this.relevanceScore = e.relevanceScore;
         this.lowFieldMatchRatio = e.lowFieldMatchRatio;
         this.formIndex = e.formIndex;
@@ -120,7 +125,9 @@ export class Entry {
             httpRealm: entryDto.hTTPRealm,
             uuid: entryDto.uniqueID,
             title: entryDto.title,
-            fields: sortedFields
+            fields: sortedFields,
+            expires: entryDto.expires,
+            expiryTime: entryDto.expiryTime
         });
 
         return entry;

src/common/model/KPRPCDTOs.ts

@@ -85,6 +85,8 @@ export class EntryDto {
     uniqueID: string;
     title: string;
     formFieldList: FieldDto[];
+    expires: boolean;
+    expiryTime: string;
 }
 
 export class EntrySummaryDto {

src/settings/index.html

@@ -84,6 +84,9 @@ <h3 class="panel-title" data-i18n="pref_FindingEntries_heading"></h3>
                         <div class="checkbox">
                             <label><input type="checkbox" id="pref_searchAllOpenDBs_label" /><span data-i18n="pref_searchAllOpenDBs_label"></span></label>
                         </div>
+                        <div class="checkbox">
+                            <label><input type="checkbox" id="pref_excludeExpiredEntries_label" /><span data-i18n="pref_excludeExpiredEntries_label"></span></label>
+                        </div>
                     </div>
                 </div>
 

src/settings/main.ts

@@ -35,6 +35,11 @@ function loadInitialConfig() {
     (document.getElementById("pref_searchAllOpenDBs_label") as HTMLInputElement).checked =
         configManager.current.searchAllOpenDBs ? configManager.current.searchAllOpenDBs : null;
 
+    (document.getElementById("pref_excludeExpiredEntries_label") as HTMLInputElement).checked =
+        configManager.current.excludeExpiredEntries
+            ? configManager.current.excludeExpiredEntries
+            : null;
+
     (
         document.getElementById("pref_autoFillFormsWithMultipleMatches_label") as HTMLInputElement
     ).checked = configManager.current.autoFillFormsWithMultipleMatches
@@ -106,6 +111,9 @@ function setupInputListeners() {
     document
         .getElementById("pref_searchAllOpenDBs_label")
         .addEventListener("change", saveSearchAllOpenDBs);
+    document
+        .getElementById("pref_excludeExpiredEntries_label")
+        .addEventListener("change", saveExcludeExpiredEntries);
     document
         .getElementById("pref_autoFillFormsWithMultipleMatches_label")
         .addEventListener("change", saveAutoFillFormsWithMultipleMatches);
@@ -948,6 +956,15 @@ function saveSearchAllOpenDBs(e) {
     });
 }
 
+function saveExcludeExpiredEntries(e) {
+    e.preventDefault();
+    configManager.setASAP({
+        excludeExpiredEntries: (
+            document.getElementById("pref_excludeExpiredEntries_label") as HTMLInputElement
+        ).checked
+    });
+}
+
 function saveAutoFillFormsWithMultipleMatches(e) {
     e.preventDefault();
     configManager.setASAP({