Reworded auth extension functions

Signed-off-by: Seb Julliand <[email protected]>

Author: sebjulliand

src/api/Storage.ts

@@ -205,9 +205,9 @@ export class ConnectionStorage extends Storage {
     await this.set(RECENTLY_OPENED_FILES_KEY, undefined);
   }
 
-  async addAuthorisedExtension(extension: vscode.Extension<any>) {
+  async grantExtensionAuthorisation(extension: vscode.Extension<any>) {
     const extensions = this.getAuthorisedExtensions();
-    if (!this.isExtensionAuthorised(extension)) {
+    if (!this.getExtensionAuthorisation(extension)) {
       extensions.push({
         id: extension.id,
         displayName: extension.packageJSON.displayName,
@@ -218,23 +218,23 @@ export class ConnectionStorage extends Storage {
     }
   }
 
-  isExtensionAuthorised(extension: vscode.Extension<any>) {
+  getExtensionAuthorisation(extension: vscode.Extension<any>) {
     const authorisedExtension = this.getAuthorisedExtensions().find(authorisedExtension => authorisedExtension.id === extension.id);
     if (authorisedExtension) {
       authorisedExtension.lastAccess = new Date().getTime();
     }
-    return authorisedExtension !== undefined;
+    return authorisedExtension;
   }
 
   getAuthorisedExtensions(): AuthorisedExtension[] {
     return this.get<AuthorisedExtension[]>(AUTHORISED_EXTENSIONS_KEY) || [];
   }
 
-  removeAllAuthorisedExtension() {
-    this.removeAuthorisedExtension(this.getAuthorisedExtensions());
+  revokeAllExtensionAuthorisations() {
+    this.revokeExtensionAuthorisation(...this.getAuthorisedExtensions());
   }
 
-  removeAuthorisedExtension(extensions: AuthorisedExtension[]) {
+  revokeExtensionAuthorisation(...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(extension);
+              let isAuthed = storage.getExtensionAuthorisation(extension) !== undefined;
 
               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.addAuthorisedExtension(extension);
+                      await storage.grantExtensionAuthorisation(extension);
                       isAuthed = true;
                       done = true;
                       break;

src/webviews/settings/index.ts

@@ -238,7 +238,7 @@ export class SettingsUI {
                 break;
 
               case `clearAllowedExts`:
-                instance.getStorage()?.removeAllAuthorisedExtension();
+                instance.getStorage()?.revokeAllExtensionAuthorisations();
                 break;
 
               default: