cleanup and debugging it with James. no logic changes

Author: Arvid Paeglit

.extensionStatus

@@ -1,9 +1,4 @@
 // Changing this requires changing display name in package.json.
 export const DEEPCODE_NAME = "DeepCode";
 export const ALLOWED_PAYLOAD_SIZE = 1024 * 1024 * 4; // max payload size of 4MB in bytes
-export const INSTALL_STATUS = {
-  justInstalled: "JUST_INSTALLED",
-  installed: "INSTALLED"
-};
-export const STATUSFILE_NAME = ".extensionStatus";
 export const IDE_NAME = "vscode";

src/deepcode/constants/general.ts

@@ -5,6 +5,7 @@ export const statusCodes: { [key: string]: number } = {
   unauthorizedUser: 401,
   unauthorizedBundleAccess: 403,
   notFound: 404,
+  analysisTimeout: 408,
   bigPayload: 413,
   serverError: 500,
   badGateway: 502,

src/deepcode/constants/statusCodes.ts

@@ -91,11 +91,7 @@ class DeepCodeErrorHandler implements DeepCode.ErrorHandlerInterface {
   }
 
   private async unauthorizedAccess(extension: DeepCode.ExtensionInterface): Promise<void> {
-    do {
-      await extension.initiateLogin();
-    } while (!extension.token)
-
-    await sleep(2000);
+    await sleep(1000);
     await extension.activateExtensionAnalyzeActions();
   }
 

src/deepcode/lib/errorHandler/DeepCodeErrorHandler.ts

@@ -8,6 +8,7 @@ import DeepCodeWorkspaceFoldersWatcher from "../watchers/WorkspaceFoldersWatcher
 import DeepCodeEditorsWatcher from "../watchers/EditorsWatcher";
 import DeepCodeSettingsWatcher from "../watchers/DeepCodeSettingsWatcher";
 import DeepCodeErrorhandler from "../errorHandler/DeepCodeErrorHandler";
+import { IDE_NAME } from "../../constants/general";
 
 export default class BaseDeepCodeModule implements DeepCode.BaseDeepCodeModuleInterface {
   public store: DeepCode.ExtensionStoreInterface;
@@ -28,7 +29,7 @@ export default class BaseDeepCodeModule implements DeepCode.BaseDeepCodeModuleIn
   public staticToken = '';
   public staticBaseURL = '';
   public defaultBaseURL = 'https://www.deepcode.ai';
-  public staticuUploadApproved = false;
+  public staticUploadApproved = false;
 
   constructor() {
     this.store = new DeepCodeStore();
@@ -60,13 +61,17 @@ export default class BaseDeepCodeModule implements DeepCode.BaseDeepCodeModuleIn
     return this.staticToken || vscode.workspace.getConfiguration('deepcode').get('token');
   }
 
-  public set token(value) {
+  public async setToken(token: string): Promise<void>  {
     this.staticToken = '';
-    vscode.workspace.getConfiguration('deepcode').update('token', value, true);
+    await vscode.workspace.getConfiguration('deepcode').update('token', token, true);
+  }
+
+  public get source(): string {
+    return process.env['GITPOD_WORKSPACE_ID'] ? 'gitpod' : IDE_NAME; 
   }
 
   public get uploadApproved(): boolean {
-    return this.staticuUploadApproved || !!(vscode.workspace.getConfiguration('deepcode').get('uploadApproved'));
+    return this.staticUploadApproved || this.source !== IDE_NAME || !!(vscode.workspace.getConfiguration('deepcode').get('uploadApproved'));
   }
 
   public async approveUpload(isGlobal: boolean = false): Promise<void> {

src/deepcode/lib/modules/BaseDeepCodeModule.ts

@@ -1,13 +1,8 @@
 import * as vscode from "vscode";
-// import * as path from "path";
-// import * as nodeFs from "fs";
 
 import DeepCode from "../../../interfaces/DeepCodeInterfaces";
-import http from "../../http/requests";
 import BundlesModule from "./BundlesModule";
 
-// import { INSTALL_STATUS, STATUSFILE_NAME, DEEPCODE_NAME } from "../../constants/general";
-
 export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepCodeLibInterface {
 
   public activateWatchers(): void {
@@ -17,31 +12,27 @@ export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepC
     this.settingsWatcher.activate(this);
   }
 
-  // public async preActivateActions(): Promise<void> {
-  //   // let status = INSTALL_STATUS.installed;
-  //   // if (process.env.NODE_ENV === "production") {
-  //   //   status = this.manageExtensionStatus();
-  //   // }
-  //   await this.activateActions();    
-  // }
-
-  // public manageExtensionStatus(): string {
-  //   const extension = vscode.extensions.all.find(
-  //     el => el.packageJSON.displayName === DEEPCODE_NAME
-  //   );
-  //   if (extension) {
-  //     const statusFilePath = path.join(extension.extensionPath, `/${STATUSFILE_NAME}`);
-  //     const extensionStatus = nodeFs.readFileSync(statusFilePath, "utf8");
-  //     if (extensionStatus === INSTALL_STATUS.justInstalled) {
-  //       this.store.cleanStore();
-  //       nodeFs.writeFileSync(statusFilePath, INSTALL_STATUS.installed);
-  //       return INSTALL_STATUS.justInstalled;
-  //     }
-  //   }
-  //   return INSTALL_STATUS.installed;
-  // }
 
   public async activateExtensionAnalyzeActions(): Promise<void> {
+
+    // First, check logged in or not
+    let loggedIn = await this.checkSession();
+    if (!loggedIn) {
+      await this.initiateLogin();
+      loggedIn = await this.checkSession();
+      if (!loggedIn) {
+        return;
+      }
+    }
+
+    // Second, check user consent on sending files to server
+    if (!this.uploadApproved) {
+      await this.askUploadApproval();
+      if (!this.uploadApproved) {
+        return;
+      }
+    }
+
     const workspaceFolders: readonly vscode.WorkspaceFolder[] | undefined = vscode.workspace.workspaceFolders;
 
     if (!workspaceFolders || !workspaceFolders.length) {
@@ -55,24 +46,6 @@ export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepC
 
       await this.updateHashesBundles();
 
-      // First, check logged in or not
-      let loggedIn = await this.checkSession();
-      if (!loggedIn) {
-        await this.initiateLogin();
-        loggedIn = await this.checkSession();
-        if (!loggedIn) {
-          return;
-        }
-      }
-
-      // Second, check user consent on sending files to server
-      if (!this.uploadApproved) {
-        await this.askUploadApproval();
-        if (!this.uploadApproved) {
-          return;
-        }
-      }
-
       // Third, initiate analysis
       try {
         // Main entry point to 

src/deepcode/lib/modules/DeepCodeLib.ts

@@ -5,16 +5,13 @@ import DeepCode from "../../../interfaces/DeepCodeInterfaces";
 import http from "../../http/requests";
 import { deepCodeMessages } from "../../messages/deepCodeMessages";
 import BaseDeepCodeModule from "./BaseDeepCodeModule";
-import { statusCodes } from "../../constants/statusCodes";
-import { IDE_NAME } from "../../constants/general";
 
 const sleep = (duration: number) => new Promise(resolve => setTimeout(resolve, duration));
 
 class LoginModule extends BaseDeepCodeModule implements DeepCode.LoginModuleInterface {
   private pendingLogin: boolean = false;
 
   public async initiateLogin(): Promise<void> {
-    
     if (this.pendingLogin) {
       return
     }
@@ -26,15 +23,14 @@ class LoginModule extends BaseDeepCodeModule implements DeepCode.LoginModuleInte
 
       pressedButton = await vscode.window.showInformationMessage(login.msg, login.button);
       if (pressedButton === login.button) {
-        const source = process.env['GITPOD_WORKSPACE_ID'] ? 'gitpod' : IDE_NAME;
-        const result = await http.login(this.baseURL, source);
+        const result = await http.login(this.baseURL, this.source);
 
         let { sessionToken, loginURL } = result;
         if (!sessionToken || !loginURL) {
           throw new Error();
         }
         await open(loginURL);
-        this.token = sessionToken;
+        await this.setToken(sessionToken);
         await this.waitLoginConfirmation();
       }
     } finally {

src/deepcode/lib/modules/LoginModule.ts

@@ -184,14 +184,16 @@ namespace DeepCode {
     hashesBundles: HashesBundlesInterface;
     serverFilesFilterList: AllowedServerFilterListInterface;
     remoteBundles: RemoteBundlesCollectionInterface;
+    source: string;
     staticToken: string;
     defaultBaseURL: string;
     staticBaseURL: string;
     baseURL: string;
     termsConditionsUrl: string;
     token: string;
+    setToken(token: string): Promise<void>;
     uploadApproved: boolean;
-    approveUpload(): Promise<void>;
+    approveUpload(isGlobal: boolean): Promise<void>;
     analyzer: DeepCode.AnalyzerInterface;
     statusBarItem: StatusBarItemInterface;
     filesWatcher: DeepCodeWatcherInterface;
@@ -225,11 +227,8 @@ namespace DeepCode {
   }
 
   export interface DeepCodeLibInterface {
-    // preActivateActions(): Promise<void>;
-    // activateActions(): Promise<void>;
     activateWatchers(): void;
     activateExtensionAnalyzeActions(): Promise<void>;
-    // manageExtensionStatus(): string;
   }
 
   export interface ExtensionInterface

src/interfaces/DeepCodeInterfaces.ts

@@ -16,6 +16,8 @@ var browserVer;
 
 if (agt.indexOf("opera") != -1) {
   browserType = "Opera";
+  // deepcode ignore UseStrictEquality: <please specify a reason of ignoring this>
+  // deepcode ignore UseStrictEquality: <please specify a reason of ignoring this>
 
   if (agt.indexOf("opera 7") != -1 || agt.indexOf("opera/7") != -1) {
     browserVer = "Opera7";

src/test/mocked_data/sample_repository/main.js

@@ -68,6 +68,7 @@ const preTestConfigureExtension = () => {
   const testExtension = extension.getExtension();
 
   // set test token and backend host
+  testExtension.staticUploadApproved = true;
   testExtension.staticToken = testToken;
   testExtension.staticBaseURL = testHost;