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

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

@@ -1,9 +1,7 @@
 import appChannelsService from '../../../services/app-channels.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 channels.');
-                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 channels.', {
-                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 channels.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before listing channels.');
-                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 channels for?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         const foundChannels = await appChannelsService.findAll({
             appId,
@@ -65,5 +35,5 @@ export default defineCommand({
             console.table(foundChannels);
             consola.success('Channels retrieved successfully.');
         }
-    },
+    }),
 });

package/dist/commands/apps/channels/list.test.js

@@ -1,5 +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 userConfig from '../../../utils/user-config.js';
 import consola from 'consola';
 import nock from 'nock';
@@ -7,10 +8,12 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import listChannelsCommand from './list.js';
 // Mock dependencies
 vi.mock('@/utils/user-config.js');
+vi.mock('@/utils/prompt.js');
 vi.mock('@/services/authorization-service.js');
 vi.mock('consola');
 describe('apps-channels-list', () => {
     const mockUserConfig = vi.mocked(userConfig);
+    const mockPrompt = vi.mocked(prompt);
     const mockConsola = vi.mocked(consola);
     const mockAuthorizationService = vi.mocked(authorizationService);
     beforeEach(() => {
@@ -33,7 +36,7 @@ describe('apps-channels-list', () => {
         const options = { appId };
         mockAuthorizationService.hasAuthorizationToken.mockReturnValue(false);
         await expect(listChannelsCommand.action(options, undefined)).rejects.toThrow('Process exited with code 1');
-        expect(mockConsola.error).toHaveBeenCalledWith('You must be logged in to run this command. Please run the `login` command first.');
+        expect(mockConsola.error).toHaveBeenCalledWith('You must be logged in to run this command. Set the `CAPAWESOME_TOKEN` environment variable or use the `--token` option.');
     });
     it('should require appId', async () => {
         const options = { appId: undefined };

package/dist/commands/apps/channels/pause.js

@@ -1,9 +1,7 @@
 import appChannelsService from '../../../services/app-channels.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,47 +11,15 @@ export default defineCommand({
         appId: z.string().uuid({ message: 'App ID must be a UUID.' }).optional().describe('ID of the app.'),
         channel: z.string().optional().describe('Name of the channel to pause.'),
     })),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId, channel } = 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 pausing a channel.');
-                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.', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select the organization of the app.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before pausing a channel.');
-                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 pause the channel in?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
-            if (!appId) {
-                consola.error('You must select an app.');
-                process.exit(1);
-            }
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         if (!channel) {
             if (!isInteractive()) {
@@ -81,5 +47,5 @@ export default defineCommand({
         }
         await appChannelsService.pause({ appId, channelId });
         consola.success('Channel paused successfully.');
-    },
+    }),
 });

package/dist/commands/apps/channels/resume.js

@@ -1,9 +1,7 @@
 import appChannelsService from '../../../services/app-channels.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,47 +11,15 @@ export default defineCommand({
         appId: z.string().uuid({ message: 'App ID must be a UUID.' }).optional().describe('ID of the app.'),
         channel: z.string().optional().describe('Name of the channel to resume.'),
     })),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId, channel } = 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 resuming a channel.');
-                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.', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select the organization of the app.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before resuming a channel.');
-                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 resume the channel in?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
-            if (!appId) {
-                consola.error('You must select an app.');
-                process.exit(1);
-            }
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         if (!channel) {
             if (!isInteractive()) {
@@ -81,5 +47,5 @@ export default defineCommand({
         }
         await appChannelsService.resume({ appId, channelId });
         consola.success('Channel resumed successfully.');
-    },
+    }),
 });

package/dist/commands/apps/channels/update.js

@@ -1,9 +1,7 @@
 import appChannelsService from '../../../services/app-channels.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,44 +13,16 @@ export default defineCommand({
         name: z.string().optional().describe('Name of the channel.'),
         protected: z.boolean().optional().describe('Whether to protect the channel or not.'),
     })),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId, channelId, name, protected: _protected } = 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 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 updating a channel.');
-                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 update a channel.', {
-                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 update a channel.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before updating a channel.');
-                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 update the channel for?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         // Prompt for channel ID if not provided
         if (!channelId) {
@@ -72,5 +42,5 @@ export default defineCommand({
             protected: _protected,
         });
         consola.success('Channel updated successfully.');
-    },
+    }),
 });

package/dist/commands/apps/channels/update.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-channels-update', () => {
     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(() => {
@@ -37,8 +39,10 @@ describe('apps-channels-update', () => {
         const channelId = 'channel-456';
         const options = { appId, channelId };
         mockAuthorizationService.hasAuthorizationToken.mockReturnValue(false);
+        mockPrompt.mockResolvedValueOnce(false);
         await expect(updateChannelCommand.action(options, undefined)).rejects.toThrow('Process exited with code 1');
-        expect(mockConsola.error).toHaveBeenCalledWith('You must be logged in to run this command. Please run the `login` command first.');
+        expect(mockConsola.error).toHaveBeenCalledWith('You must be logged in to run this command.');
+        expect(mockConsola.error).toHaveBeenCalledWith('Please run the `login` command first.');
     });
     it('should update channel with provided options', async () => {
         const appId = 'app-123';
@@ -63,29 +67,15 @@ describe('apps-channels-update', () => {
         const appId = 'app-1';
         const channelId = 'channel-456';
         const testToken = 'test-token';
-        const organization = { id: orgId, name: 'Org 1' };
-        const app = { id: appId, name: 'App 1' };
         const options = { channelId };
-        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 updateScope = nock(DEFAULT_API_BASE_URL)
             .patch(`/v1/apps/${appId}/channels/${channelId}`)
             .matchHeader('Authorization', `Bearer ${testToken}`)
             .reply(200, { id: channelId });
-        mockPrompt
-            .mockResolvedValueOnce(orgId) // organization selection
-            .mockResolvedValueOnce(appId) // app selection
-            .mockResolvedValueOnce(channelId); // channel ID input
+        mockPromptOrganizationSelection.mockResolvedValueOnce(orgId);
+        mockPromptAppSelection.mockResolvedValueOnce(appId);
+        mockPrompt.mockResolvedValueOnce(channelId); // channel ID input
         await updateChannelCommand.action(options, undefined);
-        expect(orgsScope.isDone()).toBe(true);
-        expect(appsScope.isDone()).toBe(true);
         expect(updateScope.isDone()).toBe(true);
         expect(mockConsola.success).toHaveBeenCalledWith('Channel updated successfully.');
     });
@@ -116,24 +106,17 @@ describe('apps-channels-update', () => {
         await expect(updateChannelCommand.action(options, undefined)).rejects.toThrow();
         expect(scope.isDone()).toBe(true);
     });
-    it('should handle error when no organizations exist', async () => {
-        const testToken = 'test-token';
+    it('should exit when promptOrganizationSelection exits', async () => {
         const options = { name: 'new-name' };
-        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 updateChannelCommand.action(options, undefined);
         }
         catch (error) {
-            expect(error.message).toBe('process.exit called with code 1');
+            expect(error.message).toBe('Process exited with code 1');
         }
-        expect(scope.isDone()).toBe(true);
-        expect(mockConsola.error).toHaveBeenCalledWith('You must create an organization before updating a channel.');
-        expect(exitSpy).toHaveBeenCalledWith(1);
     });
 });

package/dist/commands/apps/create.js

@@ -1,8 +1,7 @@
 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, promptOrganizationSelection } from '../../utils/prompt.js';
 import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
 import { z } from 'zod';
@@ -12,31 +11,14 @@ export default defineCommand({
         name: z.string().optional().describe('Name of the app.'),
         organizationId: z.string().optional().describe('ID of the organization to create the app in.'),
     })),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { name, organizationId } = 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 (!organizationId) {
             if (!isInteractive()) {
                 consola.error('You must provide the organization 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 app.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            organizationId = await prompt('Which organization do you want to create the app in?', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select an organization to create the app in.');
-                process.exit(1);
-            }
+            organizationId = await promptOrganizationSelection({ allowCreate: true });
         }
         if (!name) {
             if (!isInteractive()) {
@@ -48,5 +30,5 @@ export default defineCommand({
         const response = await appsService.create({ name, organizationId });
         consola.info(`App ID: ${response.id}`);
         consola.success('App created successfully.');
-    },
+    }),
 });

package/dist/commands/apps/create.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, promptOrganizationSelection } from '../../utils/prompt.js';
 import userConfig from '../../utils/user-config.js';
 import consola from 'consola';
 import nock from 'nock';
@@ -17,6 +17,7 @@ vi.mock('@/utils/environment.js', () => ({
 describe('apps-create', () => {
     const mockUserConfig = vi.mocked(userConfig);
     const mockPrompt = vi.mocked(prompt);
+    const mockPromptOrganizationSelection = vi.mocked(promptOrganizationSelection);
     const mockConsola = vi.mocked(consola);
     const mockAuthorizationService = vi.mocked(authorizationService);
     beforeEach(() => {
@@ -49,34 +50,19 @@ describe('apps-create', () => {
     });
     it('should prompt for organization when not provided', async () => {
         const appName = 'Test App';
-        const orgId1 = 'org-1';
-        const orgId2 = 'org-2';
+        const orgId = 'org-1';
         const appId = 'app-456';
         const testToken = 'test-token';
-        const organizations = [
-            { id: orgId1, name: 'Org 1' },
-            { id: orgId2, name: 'Org 2' },
-        ];
         const options = { name: appName };
-        const orgsScope = nock(DEFAULT_API_BASE_URL)
-            .get('/v1/organizations')
-            .matchHeader('Authorization', `Bearer ${testToken}`)
-            .reply(200, organizations);
         const createScope = nock(DEFAULT_API_BASE_URL)
-            .post(`/v1/apps?organizationId=${orgId1}`, { name: appName })
+            .post(`/v1/apps?organizationId=${orgId}`, { name: appName })
             .matchHeader('Authorization', `Bearer ${testToken}`)
             .reply(201, { id: appId, name: appName });
-        mockPrompt.mockResolvedValueOnce(orgId1);
+        mockPromptOrganizationSelection.mockResolvedValueOnce(orgId);
         await createAppCommand.action(options, undefined);
-        expect(orgsScope.isDone()).toBe(true);
         expect(createScope.isDone()).toBe(true);
-        expect(mockPrompt).toHaveBeenCalledWith('Which organization do you want to create the app in?', {
-            type: 'select',
-            options: [
-                { label: 'Org 1', value: orgId1 },
-                { label: 'Org 2', value: orgId2 },
-            ],
-        });
+        expect(mockPromptOrganizationSelection).toHaveBeenCalled();
+        expect(mockConsola.success).toHaveBeenCalledWith('App created successfully.');
     });
     it('should prompt for app name when not provided', async () => {
         const organizationId = 'org-123';
@@ -93,17 +79,13 @@ describe('apps-create', () => {
         expect(scope.isDone()).toBe(true);
         expect(mockPrompt).toHaveBeenCalledWith('Enter the name of the app:', { type: 'text' });
     });
-    it('should handle error when no organizations exist', async () => {
-        const appName = 'Test App';
-        const testToken = 'test-token';
-        const options = { name: appName };
-        const scope = nock(DEFAULT_API_BASE_URL)
-            .get('/v1/organizations')
-            .matchHeader('Authorization', `Bearer ${testToken}`)
-            .reply(200, []);
+    it('should exit when promptOrganizationSelection exits', async () => {
+        const options = { name: 'Test App' };
+        mockPromptOrganizationSelection.mockImplementation(() => {
+            process.exit(1);
+            return Promise.resolve('');
+        });
         await expect(createAppCommand.action(options, undefined)).rejects.toThrow('Process exited with code 1');
-        expect(scope.isDone()).toBe(true);
-        expect(mockConsola.error).toHaveBeenCalledWith('You must create an organization before creating an app.');
     });
     it('should handle API error during creation', async () => {
         const appName = 'Test App';

package/dist/commands/apps/delete.js

@@ -1,8 +1,7 @@
 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';
@@ -12,43 +11,15 @@ export default defineCommand({
         appId: z.string().optional().describe('ID of the app.'),
         yes: z.boolean().optional().describe('Skip confirmation prompt.'),
     }), { y: 'yes' }),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId } = 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 the 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 app.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            const organizationId = await prompt('Which organization do you want to delete the app from?', {
-                type: 'select',
-                options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
-            });
-            if (!organizationId) {
-                consola.error('You must select an organization to delete the app from.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before deleting it.');
-                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?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         if (!options.yes && isInteractive()) {
             const confirmed = await prompt('Are you sure you want to delete this app?', {
@@ -60,5 +31,5 @@ export default defineCommand({
         }
         await appsService.delete({ id: appId });
         consola.success('App deleted successfully.');
-    },
+    }),
 });