@hubspot/cli 7.9.0-beta.0 → 7.9.0-beta.1

package/lang/en.d.ts

@@ -2835,6 +2835,7 @@ export declare const lib: {
             readonly success: (appName: string, accountId: number) => string;
         };
         readonly appDataNotFound: "An error occurred while fetching data for your app.";
+        readonly oauthAppRedirectUrlError: (redirectUrl: string) => string;
     };
     readonly LocalDevWebsocketServer: {
         readonly errors: {

package/lang/en.js

@@ -2829,6 +2829,7 @@ export const lib = {
             success: (appName, accountId) => `Your app ${chalk.bold(appName)} has been installed successfully on account ${uiAccountDescription(accountId)}\n`,
         },
         appDataNotFound: 'An error occurred while fetching data for your app.',
+        oauthAppRedirectUrlError: (redirectUrl) => `${chalk.bold('No reponse from your OAuth service:')} ${redirectUrl}\nYour app needs a valid OAuth2 service to be installed for local dev. ${uiLink('Learn more', 'https://developers.hubspot.com/docs/apps/developer-platform/build-apps/authentication/oauth/working-with-oauth')}`,
     },
     LocalDevWebsocketServer: {
         errors: {

package/lib/__tests__/http.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/__tests__/http.test.js

@@ -0,0 +1,40 @@
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import http from 'http';
+import { isServerRunningAtUrl } from '../http.js';
+describe('isServerRunningAtUrl', () => {
+    let server;
+    let serverPort;
+    beforeAll(async () => {
+        server = http.createServer((req, res) => {
+            res.writeHead(200);
+            res.end('OK');
+        });
+        await new Promise(resolve => {
+            server.listen(0, () => {
+                serverPort = server.address().port;
+                resolve();
+            });
+        });
+    });
+    afterAll(async () => {
+        await new Promise(resolve => {
+            server.close(() => resolve());
+        });
+    });
+    it('should return true when a server is running', async () => {
+        const result = await isServerRunningAtUrl(`http://localhost:${serverPort}`);
+        expect(result).toBe(true);
+    });
+    it('should return false when connection is refused', async () => {
+        const result = await isServerRunningAtUrl('http://localhost:59999');
+        expect(result).toBe(false);
+    });
+    it('should return false for invalid URLs', async () => {
+        const result = await isServerRunningAtUrl('not-a-valid-url');
+        expect(result).toBe(false);
+    });
+    it('should handle different paths on the same server', async () => {
+        const result = await isServerRunningAtUrl(`http://localhost:${serverPort}/some/path`);
+        expect(result).toBe(true);
+    });
+});

package/lib/http.d.ts

@@ -0,0 +1 @@
+export declare function isServerRunningAtUrl(serverUrl: string): Promise<boolean>;

package/lib/http.js

@@ -0,0 +1,26 @@
+import http from 'http';
+import https from 'https';
+const IS_SERVER_RUNNING_TIMEOUT = 2000;
+export function isServerRunningAtUrl(serverUrl) {
+    return new Promise(resolve => {
+        try {
+            const url = new URL(serverUrl);
+            const protocol = url.protocol === 'https:' ? https : http;
+            const req = protocol.get(serverUrl);
+            req.on('socket', socket => {
+                socket.on('connect', () => {
+                    resolve(true);
+                    req.destroy();
+                });
+            });
+            req.on('error', (err) => {
+                resolve(err.code !== 'ECONNREFUSED');
+            });
+            req.end();
+            setTimeout(() => resolve(false), IS_SERVER_RUNNING_TIMEOUT);
+        }
+        catch (err) {
+            resolve(false);
+        }
+    });
+}

package/lib/projects/localDev/AppDevModeInterface.d.ts

@@ -26,6 +26,7 @@ declare class AppDevModeInterface {
     private autoInstallStaticAuthApp;
     private installAppOrOpenInstallUrl;
     private checkTestAccountAppInstallation;
+    private validateOauthAppRedirectUrl;
     private resolveAppInstallPromise;
     private handleAppInstallSuccessDevServerMessage;
     private handleAppInstallInitiatedDevServerMessage;

package/lib/projects/localDev/AppDevModeInterface.js

@@ -13,6 +13,7 @@ import { uiLogger } from '../../ui/logger.js';
 import { getOauthAppInstallUrl, getStaticAuthAppInstallUrl, } from '../../app/urls.js';
 import { isDeveloperTestAccount, isSandbox } from '../../accountTypes.js';
 import SpinniesManager from '../../ui/SpinniesManager.js';
+import { isServerRunningAtUrl } from '../../http.js';
 class AppDevModeInterface {
     localDevState;
     localDevLogger;
@@ -214,6 +215,18 @@ class AppDevModeInterface {
         }
         return { needsInstall: !isInstalledWithScopeGroups, isReinstall };
     }
+    async validateOauthAppRedirectUrl() {
+        const redirectUrl = this.appNode?.config.auth.redirectUrls[0];
+        if (!redirectUrl) {
+            return;
+        }
+        const serverIsRunningAtRedirectUrl = await isServerRunningAtUrl(redirectUrl);
+        if (!serverIsRunningAtRedirectUrl) {
+            uiLogger.log('');
+            uiLogger.error(lib.AppDevModeInterface.oauthAppRedirectUrlError(redirectUrl));
+            process.exit(EXIT_CODES.ERROR);
+        }
+    }
     resolveAppInstallPromise() {
         if (this.appInstallResolve) {
             this.appInstallResolve();
@@ -284,6 +297,9 @@ class AppDevModeInterface {
                         failColor: 'white',
                     });
                 }
+                if (this.isOAuthApp()) {
+                    await this.validateOauthAppRedirectUrl();
+                }
                 this.localDevState.addListener('devServerMessage', this.onDevServerMessage);
                 await this.installAppOrOpenInstallUrl(isReinstall || false);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.9.0-beta.0",
+    "version": "7.9.0-beta.1",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",