Merge pull request #39 from heroku/jw/app-error-handling

Added instructions when no apps are found in the git remotes

Author: justinwilaby

package-lock.json

@@ -25,6 +25,10 @@
       {
         "view": "heroku:auth:login",
         "contents": "%heroku:auth:login:contents%"
+      },
+      {
+        "view": "heroku:getting-started",
+        "contents": "%heroku:getting-started:contents%"
       }
     ],
     "viewsContainers": {
@@ -40,13 +44,18 @@
       "heroku": [
         {
           "id": "heroku:auth:login",
-          "name": "Heroku",
+          "name": "%view.heroku.name%",
           "when": "!heroku.authenticated"
         },
         {
           "id": "heroku:resource-explorer:treeview",
-          "name": "Heroku Resource Explorer",
-          "when": "heroku.authenticated"
+          "name": "%view.heroku.resourceExplorer%",
+          "when": "heroku.authenticated && heroku.app-found"
+        },
+        {
+          "id": "heroku:getting-started",
+          "name": "%view.heroku.name%",
+          "when": "heroku.authenticated && !heroku.app-found"
         }
       ]
     },
@@ -187,6 +196,7 @@
     "@types/mocha": "^10.0.7",
     "@types/mvdan-sh": "^0.10.9",
     "@types/node": "18.x",
+    "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.3",
     "@types/vscode": "1.92.0",
     "@types/vscode-webview": "1.57.5",
@@ -203,6 +213,7 @@
     "lint-staged": "^15.2.0",
     "mocha": "10.7.0",
     "prettier": "3.3.3",
+    "proxyquire": "^2.1.3",
     "rewire": "^7.0.0",
     "sinon": "^18.0.0",
     "typescript": "~5.6.2"

package.json

@@ -3,7 +3,15 @@
     "message": "Sign in to your Heroku account\n[Sign in](command:heroku:welcome:signin)"
   },
 
+  "heroku:getting-started:contents": {
+    "message": "It looks like this project is not a Heroku app.\n[Get started on Heroku](https://devcenter.heroku.com/start)"
+  },
+
   "view.heroku.name": {
     "message": "Heroku"
+  },
+
+  "view.heroku.resourceExplorer": {
+    "message": "Heroku Resource Explorer"
   }
 }

package.nls.json

@@ -54,16 +54,20 @@ export class ShowAddonsViewCommand extends AbortController implements RunnableCo
     extensionUri: vscode.Uri,
     addonTreeItem: Bindable<vscode.TreeItem>
   ): Promise<void> {
-    this.appIdentifier = appIdentifier;
-    this.addonTreeItem = addonTreeItem;
+    if (this.appIdentifier !== appIdentifier) {
+      ShowAddonsViewCommand.addonsPanel?.dispose();
+      ShowAddonsViewCommand.addonsPanel = undefined;
+    }
+
     if (ShowAddonsViewCommand.addonsPanel) {
       try {
         return ShowAddonsViewCommand.addonsPanel.reveal();
       } catch {
         // panel is disposed.
       }
     }
-
+    this.appIdentifier = appIdentifier;
+    this.addonTreeItem = addonTreeItem;
     const panel = vscode.window.createWebviewPanel('Addons', 'Elements Marketplace', vscode.ViewColumn.One, {
       enableScripts: true
     });

resources/app-28.png

@@ -1,14 +1,20 @@
-import { watch, stat, FileChangeInfo } from 'node:fs/promises';
+import { watch, stat } from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
+import * as vscode from 'vscode';
 import { HerokuCommand } from '../heroku-command';
-import { herokuCommand } from '../../meta/command';
+import { herokuCommand, HerokuOutputChannel } from '../../meta/command';
+import { createSessionObject } from '../../utils/create-session-object';
+import { TokenCommand } from './token';
+import { WhoAmI } from './whoami';
 
-@herokuCommand()
+@herokuCommand({ outputChannelId: HerokuOutputChannel.Authentication })
 /**
  * Command that creates a watcher for the .netrc file.
  */
-export class WatchNetrc extends HerokuCommand<AsyncIterable<FileChangeInfo<string>>> {
+export class WatchNetrc extends HerokuCommand<
+  AsyncIterable<vscode.AuthenticationProviderAuthenticationSessionsChangeEvent>
+> {
   public static COMMAND_ID = 'heroku:watchnetrc' as const;
 
   /**
@@ -50,10 +56,44 @@ export class WatchNetrc extends HerokuCommand<AsyncIterable<FileChangeInfo<strin
    * terminal to sign in or out.
    *
    * @param signal The abort signal used to stop the watcher.
+   * @param context The extension context used to store and retrieve secrets.
+   * @param sessionKey The key used to read and store the session.
    * @returns a Promise that resolves to an AsyncIterable which will contain file change info on each await.
    */
-  public async run(signal: AbortSignal): Promise<AsyncIterable<FileChangeInfo<string>>> {
+  public async run(
+    signal: AbortSignal,
+    context: vscode.ExtensionContext,
+    sessionKey: string
+  ): Promise<AsyncIterable<vscode.AuthenticationProviderAuthenticationSessionsChangeEvent>> {
     const file = await WatchNetrc.getNetrcFileLocation();
-    return watch(file, { signal });
+    const iterator = watch(file, { signal });
+    const outputChannel = this.outputChannel as vscode.OutputChannel;
+
+    return (async function* (): AsyncGenerator<vscode.AuthenticationProviderAuthenticationSessionsChangeEvent> {
+      for await (const event of iterator) {
+        if (event.eventType !== 'change') {
+          continue;
+        }
+
+        const accessToken = await vscode.commands.executeCommand<string>(TokenCommand.COMMAND_ID);
+        if (!accessToken) {
+          const sessionJson = await context.secrets.get(sessionKey);
+          if (sessionJson) {
+            await context.secrets.delete(sessionKey);
+            const session = JSON.parse(sessionJson) as vscode.AuthenticationSession;
+            await vscode.commands.executeCommand('setContext', 'heroku.authenticated', false);
+            outputChannel.appendLine(`${session.account.label} signed out of Heroku`);
+            yield { added: undefined, removed: [session], changed: undefined };
+          }
+        } else {
+          const whoami = await vscode.commands.executeCommand<string>(WhoAmI.COMMAND_ID);
+          const session = createSessionObject(whoami, accessToken, []);
+          await context.secrets.store(sessionKey, JSON.stringify(session));
+          await vscode.commands.executeCommand('setContext', 'heroku.authenticated', true);
+          outputChannel.appendLine(`Logged in to Heroku as ${whoami}`);
+          yield { added: [session], removed: undefined, changed: undefined };
+        }
+      }
+    })();
   }
 }

src/extension/commands/add-on/show-addons-view.ts

@@ -1,6 +1,7 @@
 import vscode from 'vscode';
 import { HerokuCommand } from '../heroku-command';
 import { herokuCommand, HerokuOutputChannel } from '../../meta/command';
+import { LoginCommand } from './login';
 
 @herokuCommand({
   outputChannelId: HerokuOutputChannel.Authentication
@@ -23,7 +24,7 @@ export class WelcomeViewSignIn extends HerokuCommand<void> {
    */
   public async run(): Promise<void> {
     try {
-      const session = await vscode.authentication.getSession('heroku:auth:login', [], { createIfNone: true });
+      const session = await vscode.authentication.getSession(LoginCommand.COMMAND_ID, [], { createIfNone: true });
       if (session?.accessToken) {
         this.outputChannel?.appendLine(`Successfully authenticated as ${session.account.label}`);
       }