Cleanup

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

Author: sebjulliand

src/api/Storage.ts

@@ -198,20 +198,20 @@ export class ConnectionStorage extends Storage {
     await this.set(RECENTLY_OPENED_FILES_KEY, undefined);
   }
 
-  async authorizeExtension(extension: string) {
+  async addAuthorizedExtension(extension: string) {
     const extensions = this.get<string[]>(AUTHORISED_EXTENSIONS_KEY) || [];
     if (!extensions.includes(extension)) {
       extensions.push(extension);
       await this.set(AUTHORISED_EXTENSIONS_KEY, extensions);
     }
   }
 
-  extensionIsAuthorised(extension: string) {
+  isExtensionAuthorised(extension: string) {
     const extensions = this.get<string[]>(AUTHORISED_EXTENSIONS_KEY) || [];
     return extensions.includes(extension);
   }
 
-  authorizedExtensions(): string[] {
+  getAuthorizedExtensions(): string[] {
     return this.get<string[]>(AUTHORISED_EXTENSIONS_KEY) || [];
   }
 

src/instantiate.ts

@@ -8,6 +8,7 @@ import Instance from "./api/Instance";
 import { Search } from "./api/Search";
 import { Terminal } from './api/Terminal';
 import { refreshDiagnosticsFromServer } from './api/errors/diagnostics';
+import { setupGitEventHandler } from './api/local/git';
 import { QSysFS, getUriFromPath, parseFSOptions } from "./filesystems/qsys/QSysFs";
 import { init as clApiInit } from "./languages/clle/clApi";
 import * as clRunner from "./languages/clle/clRunner";
@@ -17,11 +18,10 @@ import { Action, BrowserItem, DeploymentMethod, MemberItem, OpenEditableOptions,
 import { SearchView } from "./views/searchView";
 import { ActionsUI } from './webviews/actions';
 import { VariablesUI } from "./webviews/variables";
-import { setupGitEventHandler } from './api/local/git';
 
 export let instance: Instance;
 
-let passwordAttempts: {[ext: string]: number} = {}
+const passwordAttempts: {[extensionId: string]: number} = {}
 
 const CLEAR_RECENT = `$(trash) Clear recently opened`;
 const CLEAR_CACHED = `$(trash) Clear cached`;
@@ -643,42 +643,42 @@ export async function loadAllofExtension(context: vscode.ExtensionContext) {
             if (storedPassword) {
 
               const storage = instance.getStorage()!;
-              let isAuthed = storage.extensionIsAuthorised(extensionId);
+              let isAuthed = storage.isExtensionAuthorised(extensionId);
 
               if (!isAuthed) {
                 const displayName = extension.packageJSON.displayName || extensionId;
                 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.`}`;
                 let done = false;
-                let asModal = true;
+                let modal = true;
 
                 while (!done) {
-                  let options: string[] = [`Allow`];
+                  const options: string[] = [`Allow`];
 
-                  if (asModal) {
+                  if (modal) {
                     options.push(`View on Marketplace`);
                   } else {
                     options.push(`Deny`);
                   }
 
                   const result = await vscode.window.showWarningMessage(
-                    asModal ? `Password Request` : detail, 
+                    modal ? `Password Request` : detail, 
                     {
-                      modal: asModal,
+                      modal,
                       detail,
                     }, 
                     ...options
                   );
 
                   switch (result) {
                     case `Allow`:
-                      await storage.authorizeExtension(extensionId);
+                      await storage.addAuthorizedExtension(extensionId);
                       isAuthed = true;
                       done = true;
                       break;
 
                     case `View on Marketplace`:
                       vscode.commands.executeCommand('extension.open', extensionId);
-                      asModal = false;
+                      modal = false;
                       break;
 
                     default:
@@ -699,8 +699,6 @@ export async function loadAllofExtension(context: vscode.ExtensionContext) {
             throw new Error(`Not connected to an IBM i.`);
           }
         }
-
-        return undefined;
       }
     }),
 

src/webviews/settings/index.ts

@@ -1,7 +1,7 @@
 import vscode from "vscode";
 import { ConnectionConfiguration, GlobalConfiguration } from "../../api/Configuration";
-import { GlobalStorage } from '../../api/Storage';
 import { ComplexTab, CustomUI, Section } from "../../api/CustomUI";
+import { GlobalStorage } from '../../api/Storage';
 import { Tools } from "../../api/Tools";
 import { isManaged } from "../../api/debug";
 import * as certificates from "../../api/debug/certificates";
@@ -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()?.authorizedExtensions() || [];
+        const passwordAuthorisedExtensions: string[] = instance.getStorage()?.getAuthorizedExtensions() || [];
 
         let config: ConnectionConfiguration.Parameters;
 
@@ -206,7 +206,7 @@ export class SettingsUI {
 
         const ui = new CustomUI();
 
-        if (passwordAuthorisedExtensions.length > 0) {
+        if (passwordAuthorisedExtensions.length) {
           const passwordAuthTab = new Section();
 
           passwordAuthTab
@@ -236,17 +236,18 @@ export class SettingsUI {
               case `import`:
                 vscode.commands.executeCommand(`code-for-ibmi.debug.setup.local`);
                 break;
-              
+
               case `clearAllowedExts`:
-                if (instance.getStorage()) {
-                  instance.getStorage()?.removeAuthorizedExtension(instance.getStorage()?.authorizedExtensions()!);
+                const storage = instance.getStorage();
+                if (storage) {
+                  storage.removeAuthorizedExtension(storage.getAuthorizedExtensions());
                 }
                 break;
 
               default:
                 const data = page.data;
                 for (const key in data) {
-  
+
                   //In case we need to play with the data
                   switch (key) {
                     case `sourceASP`:
@@ -266,25 +267,25 @@ export class SettingsUI {
                         .filter(Tools.distinct);
                       break;
                   }
-  
+
                   //Refresh connection browser if not connected
                   if (!instance.getConnection()) {
                     vscode.commands.executeCommand(`code-for-ibmi.refreshConnections`);
                   }
                 }
-  
+
                 if (restartFields.some(item => data[item] && data[item] !== config[item])) {
                   restart = true;
                 }
-  
+
                 const reloadBrowsers = config.protectedPaths.join(",") !== data.protectedPaths.join(",");
                 const removeCachedSettings = (!data.quickConnect && data.quickConnect !== config.quickConnect);
-  
+
                 Object.assign(config, data);
                 await instance.setConfig(config);
                 if (removeCachedSettings)
                   GlobalStorage.get().deleteServerSettingsCache(config.name);
-  
+
                 if (connection) {
                   if (restart) {
                     vscode.window.showInformationMessage(`Some settings require a restart to take effect. Reload workspace now?`, `Reload`, `No`)