Store more information about authorized extensions

Namely: display name, date of authorization, date of last access
Signed-off-by: Seb Julliand <[email protected]>

Author: sebjulliand

src/api/Storage.ts

@@ -5,7 +5,7 @@ const LAST_PROFILE_KEY = `currentProfile`;
 const SOURCE_LIST_KEY = `sourceList`;
 const DEPLOYMENT_KEY = `deployment`;
 const DEBUG_KEY = `debug`;
-const SERVER_SETTINGS_CACHE_KEY = (name : string) => `serverSettingsCache_${name}`;
+const SERVER_SETTINGS_CACHE_KEY = (name: string) => `serverSettingsCache_${name}`;
 const PREVIOUS_SEARCH_TERMS_KEY = `prevSearchTerms`;
 const RECENTLY_OPENED_FILES_KEY = `recentlyOpenedFiles`;
 const AUTHORISED_EXTENSIONS_KEY = `authorisedExtensions`
@@ -14,6 +14,13 @@ export type PathContent = Record<string, string[]>;
 export type DeploymentPath = Record<string, string>;
 export type DebugCommands = Record<string, string>;
 
+type AuthorisedExtension = {
+  id: string
+  displayName: string
+  since: number
+  lastAccess: number
+}
+
 abstract class Storage {
   protected readonly globalState;
 
@@ -181,7 +188,7 @@ export class ConnectionStorage extends Storage {
     return this.set(DEBUG_KEY, existingCommands);
   }
 
-  getWorkspaceDeployPath(workspaceFolder : vscode.WorkspaceFolder){
+  getWorkspaceDeployPath(workspaceFolder: vscode.WorkspaceFolder) {
     const deployDirs = this.get<DeploymentPath>(DEPLOYMENT_KEY) || {};
     return deployDirs[workspaceFolder.uri.fsPath].toLowerCase();
   }
@@ -198,26 +205,37 @@ export class ConnectionStorage extends Storage {
     await this.set(RECENTLY_OPENED_FILES_KEY, undefined);
   }
 
-  async addAuthorizedExtension(extension: string) {
-    const extensions = this.get<string[]>(AUTHORISED_EXTENSIONS_KEY) || [];
-    if (!extensions.includes(extension)) {
-      extensions.push(extension);
+  async addAuthorisedExtension(extension: vscode.Extension<any>) {
+    const extensions = this.getAuthorisedExtensions();
+    if (!this.isExtensionAuthorised(extension)) {
+      extensions.push({
+        id: extension.id,
+        displayName: extension.packageJSON.displayName,
+        since: new Date().getTime(),
+        lastAccess: new Date().getTime()
+      });
       await this.set(AUTHORISED_EXTENSIONS_KEY, extensions);
     }
   }
 
-  isExtensionAuthorised(extension: string) {
-    const extensions = this.get<string[]>(AUTHORISED_EXTENSIONS_KEY) || [];
-    return extensions.includes(extension);
+  isExtensionAuthorised(extension: vscode.Extension<any>) {
+    const authorisedExtension = this.getAuthorisedExtensions().find(authorisedExtension => authorisedExtension.id === extension.id);
+    if (authorisedExtension) {
+      authorisedExtension.lastAccess = new Date().getTime();
+    }
+    return authorisedExtension !== undefined;
+  }
+
+  getAuthorisedExtensions(): AuthorisedExtension[] {
+    return this.get<AuthorisedExtension[]>(AUTHORISED_EXTENSIONS_KEY) || [];
   }
 
-  getAuthorizedExtensions(): string[] {
-    return this.get<string[]>(AUTHORISED_EXTENSIONS_KEY) || [];
+  removeAllAuthorisedExtension() {
+    this.removeAuthorisedExtension(this.getAuthorisedExtensions());
   }
 
-  removeAuthorizedExtension(extensions: string[]) {
-    const authorizedExtensions = this.get<string[]>(AUTHORISED_EXTENSIONS_KEY) || [];
-    const newExtensions = authorizedExtensions.filter(ext => !extensions.includes(ext));
+  removeAuthorisedExtension(extensions: AuthorisedExtension[]) {
+    const newExtensions = this.getAuthorisedExtensions().filter(ext => !extensions.includes(ext));
     return this.set(AUTHORISED_EXTENSIONS_KEY, newExtensions);
   }
 }

src/instantiate.ts

@@ -642,7 +642,7 @@ export async function loadAllofExtension(context: vscode.ExtensionContext) {
             const storedPassword = await context.secrets.get(connectionKey);
 
             if (storedPassword) {
-              let isAuthed = storage.isExtensionAuthorised(extensionId);
+              let isAuthed = storage.isExtensionAuthorised(extension);
 
               if (!isAuthed) {
                 const detail = `The ${displayName} extension is requesting access to your password for this connection. ${reason ? `\n\nReason: ${reason}` : `The extension did not provide a reason for password access.`}`;
@@ -669,7 +669,7 @@ export async function loadAllofExtension(context: vscode.ExtensionContext) {
 
                   switch (result) {
                     case `Allow`:
-                      await storage.addAuthorizedExtension(extensionId);
+                      await storage.addAuthorisedExtension(extension);
                       isAuthed = true;
                       done = true;
                       break;

src/webviews/settings/index.ts

@@ -32,7 +32,7 @@ export class SettingsUI {
       vscode.commands.registerCommand(`code-for-ibmi.showAdditionalSettings`, async (server?: Server, tab?: string) => {
         const connectionSettings = GlobalConfiguration.get<ConnectionConfiguration.Parameters[]>(`connectionSettings`);
         const connection = instance.getConnection();
-        const passwordAuthorisedExtensions: string[] = instance.getStorage()?.getAuthorizedExtensions() || [];
+        const passwordAuthorisedExtensions = instance.getStorage()?.getAuthorisedExtensions() || [];
 
         let config: ConnectionConfiguration.Parameters;
 
@@ -211,7 +211,7 @@ export class SettingsUI {
 
           passwordAuthTab
             .addParagraph(`The following extensions are authorized to use the password for this connection.`)
-            .addParagraph(`<ul>${passwordAuthorisedExtensions.map(ext => `<li>✅ <code>${ext}</code></li>`).join(``)}</ul>`)
+            .addParagraph(`<ul>${passwordAuthorisedExtensions.map(authExtension => `<li>✅ <code>${authExtension.displayName || authExtension.id}</code> - since ${new Date(authExtension.since).toDateString()} - last access on ${new Date(authExtension.lastAccess).toDateString()}</li>`).join(``)}</ul>`)
             .addButtons({ id: `clearAllowedExts`, label: `Clear list` })
 
           tabs.push({ label: `Extension Auth`, fields: passwordAuthTab.fields });
@@ -238,10 +238,7 @@ export class SettingsUI {
                 break;
 
               case `clearAllowedExts`:
-                const storage = instance.getStorage();
-                if (storage) {
-                  storage.removeAuthorizedExtension(storage.getAuthorizedExtensions());
-                }
+                instance.getStorage()?.removeAllAuthorisedExtension();
                 break;
 
               default: