@capawesome/cli 4.1.0 → 4.2.1

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [4.2.1](https://github.com/capawesome-team/cli/compare/v4.2.0...v4.2.1) (2026-03-01)
+
+## [4.2.0](https://github.com/capawesome-team/cli/compare/v4.1.0...v4.2.0) (2026-02-20)
+
+
+### Features
+
+* add interactive login prompt to all authenticated commands ([#116](https://github.com/capawesome-team/cli/issues/116)) ([4360b2f](https://github.com/capawesome-team/cli/commit/4360b2fca0e4d49eaa14b0d09b5702a0e9675be8))
+* add interactive org/app selection prompt ([#117](https://github.com/capawesome-team/cli/issues/117)) ([15e7813](https://github.com/capawesome-team/cli/commit/15e781363e4a8d5eeb25ca39e9d52bc5300e3a35))
+
+
+### Bug Fixes
+
+* **deps:** add overrides for glob and minimatch versions ([abf0888](https://github.com/capawesome-team/cli/commit/abf08882a6c8938db8d1e9dc2b132d1f44e65888))
+* parse private key before signing for OpenSSL 3.x compatibility ([#115](https://github.com/capawesome-team/cli/issues/115)) ([1f8e26f](https://github.com/capawesome-team/cli/commit/1f8e26f0453d9360ff0664c76098e92c5a709a98))
+
 ## [4.1.0](https://github.com/capawesome-team/cli/compare/v4.0.5...v4.1.0) (2026-02-12)
 
 

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

@@ -1,10 +1,8 @@
 import appBuildsService from '../../../services/app-builds.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('Build ID to cancel.'),
     })),
-    action: async (options) => {
+    action: withAuth(async (options) => {
         let { appId, buildId } = 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 build.');
-                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 build.', {
-                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 build.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (apps.length === 0) {
-                consola.error('You must create an app before canceling a build.');
-                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 build 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 build for.');
-                process.exit(1);
-            }
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         // Prompt for build ID if not provided
         if (!buildId) {
@@ -102,5 +67,5 @@ export default defineCommand({
             dto: { status: 'canceled' },
         });
         consola.success('Build successfully canceled.');
-    },
+    }),
 });

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

@@ -2,12 +2,10 @@ import { DEFAULT_CONSOLE_BASE_URL } from '../../../config/consts.js';
 import appBuildsService from '../../../services/app-builds.js';
 import appCertificatesService from '../../../services/app-certificates.js';
 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 { 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';
@@ -67,13 +65,8 @@ export default defineCommand({
             .describe('Download the generated ZIP file (Web only). Optionally provide a file path.'),
         yes: z.boolean().optional().describe('Skip confirmation prompts.'),
     }), { y: 'yes' }),
-    action: async (options) => {
+    action: withAuth(async (options) => {
         let { appId, platform, type, gitRef, environment, certificate, json, stack } = 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);
-        }
         // Validate that detached flag cannot be used with artifact flags
         if (options.detached && (options.apk || options.aab || options.ipa || options.zip)) {
             consola.error('The --detached flag cannot be used with --apk, --aab, --ipa, or --zip flags.');
@@ -85,36 +78,8 @@ export default defineCommand({
                 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 build.');
-                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 build.', {
-                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 build.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (apps.length === 0) {
-                consola.error('You must create an app before creating a build.');
-                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 build 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 build for.');
-                process.exit(1);
-            }
+            const organizationId = await promptOrganizationSelection({ allowCreate: true });
+            appId = await promptAppSelection(organizationId, { allowCreate: true });
         }
         // Prompt for platform if not provided
         if (!platform) {
@@ -366,7 +331,7 @@ export default defineCommand({
                 consola.success(`Build completed successfully.`);
             }
         }
-    },
+    }),
 });
 /**
  * Download a build artifact (APK, AAB, IPA, or ZIP).

package/dist/commands/apps/builds/download.js

@@ -1,8 +1,6 @@
 import appBuildsService from '../../../services/app-builds.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 fs from 'fs/promises';
@@ -41,49 +39,16 @@ export default defineCommand({
             .optional()
             .describe('Download the ZIP artifact. Optionally provide a file path.'),
     })),
-    action: async (options) => {
+    action: withAuth(async (options) => {
         let { appId, buildId } = 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 downloading a build.');
-                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 download a build:', {
-                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 download a build.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (apps.length === 0) {
-                consola.error('You must create an app before downloading a build.');
-                process.exit(1);
-            }
-            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            appId = await prompt('Select the app for which you want to download a build:', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
-            if (!appId) {
-                consola.error('You must select an app to download a build for.');
-                process.exit(1);
-            }
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         // Prompt for build ID if not provided
         if (!buildId) {
@@ -218,7 +183,7 @@ export default defineCommand({
                 filePath: typeof options.zip === 'string' ? options.zip : undefined,
             });
         }
-    },
+    }),
 });
 /**
  * Download a build artifact (APK, AAB, IPA, or ZIP).

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

@@ -1,9 +1,7 @@
 import appBuildsService from '../../../services/app-builds.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('Build ID to display the build logs for.'),
     })),
-    action: async (options) => {
+    action: withAuth(async (options) => {
         let { appId, buildId } = 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 build logs.');
-                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 view the build logs.', {
-                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 view the build logs.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (apps.length === 0) {
-                consola.error('You must create an app before viewing build 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 the build 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 the build logs.');
-                process.exit(1);
-            }
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         // Prompt for platform if not provided
         if (!buildId) {
@@ -116,5 +81,5 @@ export default defineCommand({
                 }
             }
         }
-    },
+    }),
 });

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

@@ -1,10 +1,8 @@
 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 { getMessageFromUnknownError } from '../../../utils/error.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';
@@ -25,12 +23,8 @@ export default defineCommand({
         name: z.string().optional().describe('Name of the channel.'),
         protected: z.boolean().optional().describe('Whether to protect the channel or not. Default is `false`.'),
     })),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId, expiresInDays, ignoreErrors, 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);
-        }
         // Calculate the expiration date
         let expiresAt;
         if (expiresInDays) {
@@ -44,32 +38,8 @@ export default defineCommand({
                 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 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 create 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 create a channel.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before creating 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 create the channel 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 });
         }
         // Validate the channel name
         if (!name) {
@@ -99,5 +69,5 @@ export default defineCommand({
                 throw error;
             }
         }
-    },
+    }),
 });

package/dist/commands/apps/channels/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, 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-create', () => {
     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(() => {
@@ -59,15 +61,6 @@ describe('apps-channels-create', () => {
         const channelId = 'channel-456';
         const testToken = 'test-token';
         const options = { name: channelName };
-        const orgsScope = nock(DEFAULT_API_BASE_URL)
-            .get('/v1/organizations')
-            .matchHeader('Authorization', `Bearer ${testToken}`)
-            .reply(200, [{ id: orgId, name: 'Org 1' }]);
-        const appsScope = nock(DEFAULT_API_BASE_URL)
-            .get('/v1/apps')
-            .query({ organizationId: orgId })
-            .matchHeader('Authorization', `Bearer ${testToken}`)
-            .reply(200, [{ id: appId, name: 'App 1' }]);
         const createScope = nock(DEFAULT_API_BASE_URL)
             .post(`/v1/apps/${appId}/channels`, {
             appId,
@@ -76,12 +69,9 @@ describe('apps-channels-create', () => {
         })
             .matchHeader('Authorization', `Bearer ${testToken}`)
             .reply(201, { id: channelId, name: channelName });
-        mockPrompt
-            .mockResolvedValueOnce(orgId) // organization selection
-            .mockResolvedValueOnce(appId); // app selection
+        mockPromptOrganizationSelection.mockResolvedValueOnce(orgId);
+        mockPromptAppSelection.mockResolvedValueOnce(appId);
         await createChannelCommand.action(options, undefined);
-        expect(orgsScope.isDone()).toBe(true);
-        expect(appsScope.isDone()).toBe(true);
         expect(createScope.isDone()).toBe(true);
         expect(mockConsola.success).toHaveBeenCalledWith('Channel created successfully.');
     });

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

@@ -1,8 +1,6 @@
 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 { 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';
@@ -21,43 +19,15 @@ export default defineCommand({
             .describe('Name of the channel. Either the ID or name of the channel must be provided.'),
         yes: z.boolean().optional().describe('Skip confirmation prompt.'),
     }), { y: 'yes' }),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId, channelId, 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 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 from which you want to delete 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 from which you want to delete a channel.');
-                process.exit(1);
-            }
-            const apps = await appsService.findAll({
-                organizationId,
-            });
-            if (!apps.length) {
-                consola.error('You must create an app before deleting 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 delete the channel from?', {
-                type: 'select',
-                options: apps.map((app) => ({ label: app.name, value: app.id })),
-            });
+            const organizationId = await promptOrganizationSelection();
+            appId = await promptAppSelection(organizationId);
         }
         // Prompt for channel ID or name if neither is provided
         if (!channelId && !name) {
@@ -93,5 +63,5 @@ export default defineCommand({
             name,
         });
         consola.success('Channel deleted successfully.');
-    },
+    }),
 });

package/dist/commands/apps/channels/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-channels-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(() => {
@@ -80,30 +82,16 @@ describe('apps-channels-delete', () => {
         const appId = 'app-1';
         const channelName = 'staging';
         const testToken = 'test-token';
-        const organization = { id: orgId, name: 'Org 1' };
-        const app = { id: appId, name: 'App 1' };
         const options = { name: channelName };
-        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}/channels`)
             .query({ name: channelName })
             .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 deleteChannelCommand.action(options, undefined);
-        expect(orgsScope.isDone()).toBe(true);
-        expect(appsScope.isDone()).toBe(true);
         expect(deleteScope.isDone()).toBe(true);
         expect(mockConsola.success).toHaveBeenCalledWith('Channel deleted successfully.');
     });

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

@@ -1,5 +1,5 @@
 import appChannelsService from '../../../services/app-channels.js';
-import authorizationService from '../../../services/authorization-service.js';
+import { withAuth } from '../../../utils/auth.js';
 import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
 import { z } from 'zod';
@@ -11,12 +11,8 @@ export default defineCommand({
         json: z.boolean().optional().describe('Output in JSON format.'),
         name: z.string().optional().describe('Name of the channel.'),
     })),
-    action: async (options, args) => {
+    action: withAuth(async (options, args) => {
         let { appId, channelId, json, 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) {
             consola.error('You must provide an app ID.');
             process.exit(1);
@@ -50,5 +46,5 @@ export default defineCommand({
             console.table(channel);
             consola.success('Channel retrieved successfully.');
         }
-    },
+    }),
 });

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.');
         }
-    },
+    }),
 });