@capawesome/cli 4.1.0-dev.f5ef8ba.1771047437 → 4.2.0

package/dist/commands/apps/delete.test.js

@@ -1,6 +1,6 @@
 import { DEFAULT_API_BASE_URL } from '../../config/consts.js';
 import authorizationService from '../../services/authorization-service.js';
-import { prompt } from '../../utils/prompt.js';
+import { prompt, promptAppSelection, promptOrganizationSelection } from '../../utils/prompt.js';
 import userConfig from '../../utils/user-config.js';
 import consola from 'consola';
 import nock from 'nock';
@@ -17,6 +17,8 @@ vi.mock('@/utils/environment.js', () => ({
 describe('apps-delete', () => {
     const mockUserConfig = vi.mocked(userConfig);
     const mockPrompt = vi.mocked(prompt);
+    const mockPromptOrganizationSelection = vi.mocked(promptOrganizationSelection);
+    const mockPromptAppSelection = vi.mocked(promptAppSelection);
     const mockConsola = vi.mocked(consola);
     const mockAuthorizationService = vi.mocked(authorizationService);
     beforeEach(() => {
@@ -62,51 +64,25 @@ describe('apps-delete', () => {
         const orgId = 'org-1';
         const appId = 'app-1';
         const testToken = 'test-token';
-        const organization = { id: orgId, name: 'Org 1' };
-        const app = { id: appId, name: 'App 1' };
         const options = {};
-        const orgsScope = nock(DEFAULT_API_BASE_URL)
-            .get('/v1/organizations')
-            .matchHeader('Authorization', `Bearer ${testToken}`)
-            .reply(200, [organization]);
-        const appsScope = nock(DEFAULT_API_BASE_URL)
-            .get('/v1/apps')
-            .query({ organizationId: orgId })
-            .matchHeader('Authorization', `Bearer ${testToken}`)
-            .reply(200, [app]);
         const deleteScope = nock(DEFAULT_API_BASE_URL)
             .delete(`/v1/apps/${appId}`)
             .matchHeader('Authorization', `Bearer ${testToken}`)
             .reply(200);
-        mockPrompt
-            .mockResolvedValueOnce(orgId) // organization selection
-            .mockResolvedValueOnce(appId) // app selection
-            .mockResolvedValueOnce(true); // confirmation
+        mockPromptOrganizationSelection.mockResolvedValueOnce(orgId);
+        mockPromptAppSelection.mockResolvedValueOnce(appId);
+        mockPrompt.mockResolvedValueOnce(true); // confirmation
         await deleteAppCommand.action(options, undefined);
-        expect(orgsScope.isDone()).toBe(true);
-        expect(appsScope.isDone()).toBe(true);
         expect(deleteScope.isDone()).toBe(true);
         expect(mockConsola.success).toHaveBeenCalledWith('App deleted successfully.');
     });
-    it('should handle error when no organizations exist', async () => {
-        const testToken = 'test-token';
+    it('should exit when promptOrganizationSelection exits', async () => {
         const options = {};
-        const scope = nock(DEFAULT_API_BASE_URL)
-            .get('/v1/organizations')
-            .matchHeader('Authorization', `Bearer ${testToken}`)
-            .reply(200, []);
-        const exitSpy = vi.spyOn(process, 'exit').mockImplementation((code) => {
-            throw new Error(`process.exit called with code ${code}`);
+        mockPromptOrganizationSelection.mockImplementation(() => {
+            process.exit(1);
+            return Promise.resolve('');
         });
-        try {
-            await deleteAppCommand.action(options, undefined);
-        }
-        catch (error) {
-            expect(error.message).toBe('process.exit called with code 1');
-        }
-        expect(scope.isDone()).toBe(true);
-        expect(mockConsola.error).toHaveBeenCalledWith('You must create an organization before deleting an app.');
-        expect(exitSpy).toHaveBeenCalledWith(1);
+        await expect(deleteAppCommand.action(options, undefined)).rejects.toThrow('Process exited with code 1');
     });
     it('should handle API error during deletion', async () => {
         const appId = 'app-123';

package/dist/commands/apps/deployments/cancel.js

@@ -1,10 +1,8 @@
 import appDeploymentsService from '../../../services/app-deployments.js';
-import appsService from '../../../services/apps.js';
-import authorizationService from '../../../services/authorization-service.js';
 import jobsService from '../../../services/jobs.js';
-import organizationsService from '../../../services/organizations.js';
+import { withAuth } from '../../../utils/auth.js';
 import { isInteractive } from '../../../utils/environment.js';
-import { prompt } from '../../../utils/prompt.js';
+import { prompt, promptAppSelection, promptOrganizationSelection } from '../../../utils/prompt.js';
 import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
 import { z } from 'zod';
@@ -24,49 +22,16 @@ export default defineCommand({
             .optional()
             .describe('Deployment ID to cancel.'),
     })),
-    action: async (options) => {
+    action: withAuth(async (options) => {
         let { appId, deploymentId } = options;
-        // Check if the user is logged in
-        if (!authorizationService.hasAuthorizationToken()) {
-            consola.error('You must be logged in to run this command. Please run the `login` command first.');
-            process.exit(1);
-        }
         // Prompt for app ID if not provided
         if (!appId) {
             if (!isInteractive()) {
                 consola.error('You must provide an app ID when running in non-interactive environment.');
                 process.exit(1);
             }
-            const organizations = await organizationsService.findAll();
-            if (organizations.length === 0) {
-                consola.error('You must create an organization before canceling a deployment.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            const organizationId = await prompt('Select the organization of the app for which you want to cancel a deployment.', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select the organization of an app for which you want to cancel a deployment.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (apps.length === 0) {
-                consola.error('You must create an app before canceling a deployment.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            appId = await prompt('Which app do you want to cancel a deployment for:', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
-            if (!appId) {
-                consola.error('You must select an app to cancel a deployment for.');
-                process.exit(1);
-            }
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         // Prompt for deployment ID if not provided
         if (!deploymentId) {
@@ -107,5 +72,5 @@ export default defineCommand({
             },
         });
         consola.success('Deployment successfully canceled.');
-    },
+    }),
 });

package/dist/commands/apps/deployments/create.js

@@ -2,12 +2,10 @@ import { DEFAULT_CONSOLE_BASE_URL } from '../../../config/consts.js';
 import appBuildsService from '../../../services/app-builds.js';
 import appDeploymentsService from '../../../services/app-deployments.js';
 import appDestinationsService from '../../../services/app-destinations.js';
-import appsService from '../../../services/apps.js';
-import authorizationService from '../../../services/authorization-service.js';
-import organizationsService from '../../../services/organizations.js';
 import { unescapeAnsi } from '../../../utils/ansi.js';
+import { withAuth } from '../../../utils/auth.js';
 import { isInteractive } from '../../../utils/environment.js';
-import { prompt } from '../../../utils/prompt.js';
+import { prompt, promptAppSelection, promptOrganizationSelection } from '../../../utils/prompt.js';
 import { wait } from '../../../utils/wait.js';
 import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
@@ -35,49 +33,16 @@ export default defineCommand({
             .optional()
             .describe('Exit immediately after creating the deployment without waiting for completion.'),
     })),
-    action: async (options) => {
+    action: withAuth(async (options) => {
         let { appId, buildId, buildNumber, channel, destination } = options;
-        // Check if the user is logged in
-        if (!authorizationService.hasAuthorizationToken()) {
-            consola.error('You must be logged in to run this command. Please run the `login` command first.');
-            process.exit(1);
-        }
         // Prompt for app ID if not provided
         if (!appId) {
             if (!isInteractive()) {
                 consola.error('You must provide an app ID when running in non-interactive environment.');
                 process.exit(1);
             }
-            const organizations = await organizationsService.findAll();
-            if (organizations.length === 0) {
-                consola.error('You must create an organization before creating a deployment.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            const organizationId = await prompt('Select the organization of the app for which you want to create a deployment.', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select the organization of an app for which you want to create a deployment.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (apps.length === 0) {
-                consola.error('You must create an app before creating a deployment.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            appId = await prompt('Which app do you want to create a deployment for:', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
-            if (!appId) {
-                consola.error('You must select an app to create a deployment for.');
-                process.exit(1);
-            }
+            const organizationId = await promptOrganizationSelection({ allowCreate: true });
+            appId = await promptAppSelection(organizationId, { allowCreate: true });
         }
         // Convert build number to build ID if provided
         if (!buildId && buildNumber) {
@@ -269,5 +234,5 @@ export default defineCommand({
                 }
             }
         }
-    },
+    }),
 });

package/dist/commands/apps/deployments/logs.js

@@ -1,9 +1,7 @@
 import appDeploymentsService from '../../../services/app-deployments.js';
-import appsService from '../../../services/apps.js';
-import authorizationService from '../../../services/authorization-service.js';
-import organizationsService from '../../../services/organizations.js';
 import { unescapeAnsi } from '../../../utils/ansi.js';
-import { prompt } from '../../../utils/prompt.js';
+import { withAuth } from '../../../utils/auth.js';
+import { prompt, promptAppSelection, promptOrganizationSelection } from '../../../utils/prompt.js';
 import { wait } from '../../../utils/wait.js';
 import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
@@ -25,49 +23,16 @@ export default defineCommand({
             .optional()
             .describe('Deployment ID to view logs.'),
     })),
-    action: async (options) => {
+    action: withAuth(async (options) => {
         let { appId, deploymentId } = options;
-        // Check if the user is logged in
-        if (!authorizationService.hasAuthorizationToken()) {
-            consola.error('You must be logged in to run this command. Please run the `login` command first.');
-            process.exit(1);
-        }
         // Prompt for app ID if not provided
         if (!appId) {
             if (!isInteractive()) {
                 consola.error('You must provide an app ID when running in non-interactive environment.');
                 process.exit(1);
             }
-            const organizations = await organizationsService.findAll();
-            if (organizations.length === 0) {
-                consola.error('You must create an organization before viewing deployment logs.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            const organizationId = await prompt('Select the organization that contains the app whose deployment logs you want to view?', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select the organization containing the app whose deployment logs you want to view.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (apps.length === 0) {
-                consola.error('You must create an app before viewing deployment logs.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            appId = await prompt('Which app do you want to view deployment logs for?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
-            if (!appId) {
-                consola.error('You must select an app to view its deployment logs.');
-                process.exit(1);
-            }
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         // Prompt for deployment ID if not provided
         if (!deploymentId) {
@@ -125,5 +90,5 @@ export default defineCommand({
                 }
             }
         }
-    },
+    }),
 });

package/dist/commands/apps/devices/delete.js

@@ -1,8 +1,6 @@
 import appDevicesService from '../../../services/app-devices.js';
-import appsService from '../../../services/apps.js';
-import authorizationService from '../../../services/authorization-service.js';
-import organizationsService from '../../../services/organizations.js';
-import { prompt } from '../../../utils/prompt.js';
+import { withAuth } from '../../../utils/auth.js';
+import { prompt, promptAppSelection, promptOrganizationSelection } from '../../../utils/prompt.js';
 import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
 import { isInteractive } from '../../../utils/environment.js';
@@ -14,44 +12,16 @@ export default defineCommand({
         deviceId: z.string().optional().describe('ID of the device.'),
         yes: z.boolean().optional().describe('Skip confirmation prompt.'),
     }), { y: 'yes' }),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId, deviceId } = options;
-        if (!authorizationService.hasAuthorizationToken()) {
-            consola.error('You must be logged in to run this command. Please run the `login` command first.');
-            process.exit(1);
-        }
         // Prompt for app ID if not provided
         if (!appId) {
             if (!isInteractive()) {
                 consola.error('You must provide an app ID when running in non-interactive environment.');
                 process.exit(1);
             }
-            const organizations = await organizationsService.findAll();
-            if (organizations.length === 0) {
-                consola.error('You must create an organization before deleting a device.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            const organizationId = await prompt('Select the organization of the app from which you want to delete a device.', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select the organization of an app from which you want to delete a device.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before deleting a device.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            appId = await prompt('Which app do you want to delete the device from?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         // Prompt for device ID if not provided
         if (!deviceId) {
@@ -78,5 +48,5 @@ export default defineCommand({
             deviceId,
         });
         consola.success('Device deleted successfully.');
-    },
+    }),
 });

package/dist/commands/apps/devices/delete.test.js

@@ -1,6 +1,6 @@
 import { DEFAULT_API_BASE_URL } from '../../../config/consts.js';
 import authorizationService from '../../../services/authorization-service.js';
-import { prompt } from '../../../utils/prompt.js';
+import { prompt, promptAppSelection, promptOrganizationSelection } from '../../../utils/prompt.js';
 import userConfig from '../../../utils/user-config.js';
 import consola from 'consola';
 import nock from 'nock';
@@ -17,6 +17,8 @@ vi.mock('@/utils/environment.js', () => ({
 describe('apps-devices-delete', () => {
     const mockUserConfig = vi.mocked(userConfig);
     const mockPrompt = vi.mocked(prompt);
+    const mockPromptOrganizationSelection = vi.mocked(promptOrganizationSelection);
+    const mockPromptAppSelection = vi.mocked(promptAppSelection);
     const mockConsola = vi.mocked(consola);
     const mockAuthorizationService = vi.mocked(authorizationService);
     beforeEach(() => {
@@ -24,7 +26,9 @@ describe('apps-devices-delete', () => {
         mockUserConfig.read.mockReturnValue({ token: 'test-token' });
         mockAuthorizationService.getCurrentAuthorizationToken.mockReturnValue('test-token');
         mockAuthorizationService.hasAuthorizationToken.mockReturnValue(true);
-        vi.spyOn(process, 'exit').mockImplementation(() => undefined);
+        vi.spyOn(process, 'exit').mockImplementation((code) => {
+            throw new Error(`Process exited with code ${code}`);
+        });
     });
     afterEach(() => {
         nock.cleanAll();
@@ -63,29 +67,15 @@ describe('apps-devices-delete', () => {
         const appId = 'app-1';
         const deviceId = 'device-456';
         const testToken = 'test-token';
-        const organization = { id: orgId, name: 'Org 1' };
-        const app = { id: appId, name: 'App 1' };
         const options = { deviceId };
-        const orgsScope = nock(DEFAULT_API_BASE_URL)
-            .get('/v1/organizations')
-            .matchHeader('Authorization', `Bearer ${testToken}`)
-            .reply(200, [organization]);
-        const appsScope = nock(DEFAULT_API_BASE_URL)
-            .get('/v1/apps')
-            .query({ organizationId: orgId })
-            .matchHeader('Authorization', `Bearer ${testToken}`)
-            .reply(200, [app]);
         const deleteScope = nock(DEFAULT_API_BASE_URL)
             .delete(`/v1/apps/${appId}/devices/${deviceId}`)
             .matchHeader('Authorization', `Bearer ${testToken}`)
             .reply(200);
-        mockPrompt
-            .mockResolvedValueOnce(orgId) // organization selection
-            .mockResolvedValueOnce(appId) // app selection
-            .mockResolvedValueOnce(true); // confirmation
+        mockPromptOrganizationSelection.mockResolvedValueOnce(orgId);
+        mockPromptAppSelection.mockResolvedValueOnce(appId);
+        mockPrompt.mockResolvedValueOnce(true); // confirmation
         await deleteDeviceCommand.action(options, undefined);
-        expect(orgsScope.isDone()).toBe(true);
-        expect(appsScope.isDone()).toBe(true);
         expect(deleteScope.isDone()).toBe(true);
         expect(mockConsola.success).toHaveBeenCalledWith('Device deleted successfully.');
     });
@@ -106,25 +96,13 @@ describe('apps-devices-delete', () => {
         expect(mockPrompt).toHaveBeenCalledWith('Enter the device ID:', { type: 'text' });
         expect(mockConsola.success).toHaveBeenCalledWith('Device deleted successfully.');
     });
-    it('should handle error when no organizations exist', async () => {
-        const testToken = 'test-token';
+    it('should exit when promptOrganizationSelection exits', async () => {
         const options = {};
-        const scope = nock(DEFAULT_API_BASE_URL)
-            .get('/v1/organizations')
-            .matchHeader('Authorization', `Bearer ${testToken}`)
-            .reply(200, []);
-        const exitSpy = vi.spyOn(process, 'exit').mockImplementation((code) => {
-            throw new Error(`process.exit called with code ${code}`);
+        mockPromptOrganizationSelection.mockImplementation(() => {
+            process.exit(1);
+            return Promise.resolve('');
         });
-        try {
-            await deleteDeviceCommand.action(options, undefined);
-        }
-        catch (error) {
-            expect(error.message).toBe('process.exit called with code 1');
-        }
-        expect(scope.isDone()).toBe(true);
-        expect(mockConsola.error).toHaveBeenCalledWith('You must create an organization before deleting a device.');
-        expect(exitSpy).toHaveBeenCalledWith(1);
+        await expect(deleteDeviceCommand.action(options, undefined)).rejects.toThrow('Process exited with code 1');
     });
     it('should handle API error during deletion', async () => {
         const appId = 'app-123';

package/dist/commands/apps/environments/create.js

@@ -1,9 +1,7 @@
 import appEnvironmentsService from '../../../services/app-environments.js';
-import appsService from '../../../services/apps.js';
-import authorizationService from '../../../services/authorization-service.js';
-import organizationsService from '../../../services/organizations.js';
+import { withAuth } from '../../../utils/auth.js';
 import { isInteractive } from '../../../utils/environment.js';
-import { prompt } from '../../../utils/prompt.js';
+import { prompt, promptAppSelection, promptOrganizationSelection } from '../../../utils/prompt.js';
 import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
 import { z } from 'zod';
@@ -13,43 +11,15 @@ export default defineCommand({
         appId: z.string().optional().describe('ID of the app.'),
         name: z.string().optional().describe('Name of the environment.'),
     })),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId, name } = options;
-        if (!authorizationService.hasAuthorizationToken()) {
-            consola.error('You must be logged in to run this command. Please run the `login` command first.');
-            process.exit(1);
-        }
         if (!appId) {
             if (!isInteractive()) {
                 consola.error('You must provide an app ID when running in non-interactive environment.');
                 process.exit(1);
             }
-            const organizations = await organizationsService.findAll();
-            if (organizations.length === 0) {
-                consola.error('You must create an organization before creating an environment.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            const organizationId = await prompt('Select the organization of the app for which you want to create an environment.', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select the organization of an app for which you want to create an environment.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before creating an environment.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            appId = await prompt('Which app do you want to create the environment for?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
+            const organizationId = await promptOrganizationSelection({ allowCreate: true });
+            appId = await promptAppSelection(organizationId, { allowCreate: true });
         }
         if (!name) {
             if (!isInteractive()) {
@@ -64,5 +34,5 @@ export default defineCommand({
         });
         consola.info(`Environment ID: ${response.id}`);
         consola.success('Environment created successfully.');
-    },
+    }),
 });

package/dist/commands/apps/environments/delete.js

@@ -1,9 +1,7 @@
 import appEnvironmentsService from '../../../services/app-environments.js';
-import appsService from '../../../services/apps.js';
-import authorizationService from '../../../services/authorization-service.js';
-import organizationsService from '../../../services/organizations.js';
+import { withAuth } from '../../../utils/auth.js';
 import { isInteractive } from '../../../utils/environment.js';
-import { prompt } from '../../../utils/prompt.js';
+import { prompt, promptAppSelection, promptOrganizationSelection } from '../../../utils/prompt.js';
 import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
 import { z } from 'zod';
@@ -15,43 +13,15 @@ export default defineCommand({
         name: z.string().optional().describe('Name of the environment. Either the ID or name must be provided.'),
         yes: z.boolean().optional().describe('Skip confirmation prompt.'),
     }), { y: 'yes' }),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId, environmentId, name } = options;
-        if (!authorizationService.hasAuthorizationToken()) {
-            consola.error('You must be logged in to run this command. Please run the `login` command first.');
-            process.exit(1);
-        }
         if (!appId) {
             if (!isInteractive()) {
                 consola.error('You must provide an app ID when running in non-interactive environment.');
                 process.exit(1);
             }
-            const organizations = await organizationsService.findAll();
-            if (organizations.length === 0) {
-                consola.error('You must create an organization before deleting an environment.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            const organizationId = await prompt('Select the organization of the app from which you want to delete an environment.', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select the organization of an app from which you want to delete an environment.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before deleting an environment.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            appId = await prompt('Which app do you want to delete the environment from?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         if (!environmentId && !name) {
             if (!isInteractive()) {
@@ -84,5 +54,5 @@ export default defineCommand({
             name,
         });
         consola.success('Environment deleted successfully.');
-    },
+    }),
 });

package/dist/commands/apps/environments/list.js

@@ -1,9 +1,7 @@
 import appEnvironmentsService from '../../../services/app-environments.js';
-import appsService from '../../../services/apps.js';
-import authorizationService from '../../../services/authorization-service.js';
-import organizationsService from '../../../services/organizations.js';
+import { withAuth } from '../../../utils/auth.js';
 import { isInteractive } from '../../../utils/environment.js';
-import { prompt } from '../../../utils/prompt.js';
+import { promptAppSelection, promptOrganizationSelection } from '../../../utils/prompt.js';
 import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
 import { z } from 'zod';
@@ -15,43 +13,15 @@ export default defineCommand({
         limit: z.coerce.number().optional().describe('Limit for pagination.'),
         offset: z.coerce.number().optional().describe('Offset for pagination.'),
     })),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId, json, limit, offset } = options;
-        if (!authorizationService.hasAuthorizationToken()) {
-            consola.error('You must be logged in to run this command. Please run the `login` command first.');
-            process.exit(1);
-        }
         if (!appId) {
             if (!isInteractive()) {
                 consola.error('You must provide an app ID when running in non-interactive environment.');
                 process.exit(1);
             }
-            const organizations = await organizationsService.findAll();
-            if (organizations.length === 0) {
-                consola.error('You must create an organization before listing environments.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            const organizationId = await prompt('Select the organization of the app for which you want to list environments.', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select the organization of an app for which you want to list environments.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before listing environments.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            appId = await prompt('Which app do you want to list the environments for?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         const environments = await appEnvironmentsService.findAll({
             appId,
@@ -65,5 +35,5 @@ export default defineCommand({
             console.table(environments);
             consola.success('Environments retrieved successfully.');
         }
-    },
+    }),
 });