feat: enhance keyrings management with roles and new commands

- Added roles property to ApiSession and KeyringsCreateDto for better role management.
- Implemented KeyringsListCommand and KeyringsDeleteCommand for listing and deleting keyrings.
- Updated error handling in console.ts to exit gracefully on help command.

Author: tacxou

apps/api/src/_common/data/api-session.ts

@@ -3,6 +3,7 @@ export class ApiSession {
   public readonly username: string;
   public readonly displayName: string;
   public readonly token: string;
+  public readonly roles: string[];
 
   public constructor(data: Partial<ApiSession>) {
     for (const key in data) {

apps/api/src/console.ts

@@ -51,6 +51,9 @@ import { InternalLogger } from './core/logger/internal.logger'
     const app = await CommandFactory.runWithoutClosing(AppModule, {
       logger,
       errorHandler: (err) => {
+        if (err instanceof Error && 'code' in err && err.code === 'commander.help') {
+          process.exit(0)
+        }
         console.error(err)
         process.exit(1)
       },

apps/api/src/core/keyrings/_dto/keyrings.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsDateString, IsIP, IsMongoId, IsNotEmpty, IsString } from 'class-validator';
+import { IsDateString, IsIP, IsMongoId, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 import { CustomFieldsDto } from '~/_common/abstracts/dto/custom-fields.dto';
 
 export class KeyringsCreateDto extends CustomFieldsDto {
@@ -19,6 +19,10 @@ export class KeyringsCreateDto extends CustomFieldsDto {
 
   @IsDateString()
   public suspendedAt?: Date;
+
+  @IsString({ each: true })
+  @IsOptional()
+  public roles?: string[];
 }
 
 export class KeyringsDto extends KeyringsCreateDto {

apps/api/src/core/keyrings/_schemas/keyrings.schema.ts

@@ -24,6 +24,12 @@ export class Keyrings extends AbstractSchema {
   })
   public allowedNetworks?: string[];
 
+  @Prop({
+    type: [String],
+    default: [],
+  })
+  public roles?: string[];
+
   @Prop({ type: Date })
   public suspendedAt?: Date;
 }

apps/api/src/core/keyrings/keyrings.command.ts

@@ -15,6 +15,20 @@ export class KeyringsCreateQuestions {
   parseName(val: string) {
     return val;
   }
+
+  @Question({
+    message: 'Roles (separés par une virgule, si vide: "admin") ?',
+    name: 'roles',
+  })
+  parseRoles(val: string) {
+    const roles = val?.split(',').map((role) => role.trim()).filter((role) => role !== '');
+
+    if (roles.length === 0) {
+      return ['admin'];
+    }
+
+    return roles;
+  }
 }
 
 @SubCommand({ name: 'create' })
@@ -48,6 +62,7 @@ export class KeyringsCreateCommand extends CommandRunner {
           username: key.name,
           displayName: key.name,
           token: key.token,
+          roles: key.roles,
         }),
         false,
         options,
@@ -59,7 +74,60 @@ export class KeyringsCreateCommand extends CommandRunner {
   }
 }
 
-@Command({ name: 'keyrings', arguments: '<task>', subCommands: [KeyringsCreateCommand] })
+@SubCommand({ name: 'list' })
+export class KeyringsListCommand extends CommandRunner {
+  public constructor(
+    protected moduleRef: ModuleRef,
+    private readonly keyringsService: KeyringsService,
+  ) {
+    super();
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async run(inputs: string[], options: any): Promise<void> {
+    try {
+      const keyrings = (await this.keyringsService.find<Keyrings>({})) as unknown as Keyrings[];
+      console.table(
+        keyrings.map((keyring) => ({
+          name: keyring.name,
+          suspendedAt: keyring.suspendedAt ?? null,
+          allowedNetworks: keyring.allowedNetworks ?? [],
+        })),
+      );
+    } catch (error) {
+      console.error('Error listing keyrings', error);
+    }
+  }
+}
+
+@SubCommand({ name: 'delete' })
+export class KeyringsDeleteCommand extends CommandRunner {
+  public constructor(
+    protected moduleRef: ModuleRef,
+    private readonly keyringsService: KeyringsService,
+  ) {
+    super();
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async run(inputs: string[], options: any): Promise<void> {
+    const name = inputs[0];
+    if (!name) {
+      console.error('Missing keyring name. Usage: console keyrings delete <name>');
+      return;
+    }
+
+    try {
+      const keyring = (await this.keyringsService.findOne<Keyrings>({ name })) as unknown as Keyrings;
+      await this.keyringsService.delete<Keyrings>(keyring._id);
+      console.log(`Keyring "${name}" deleted successfully`);
+    } catch (error) {
+      console.error(`Error deleting keyring "${name}"`, error);
+    }
+  }
+}
+
+@Command({ name: 'keyrings', arguments: '<task>', subCommands: [KeyringsCreateCommand, KeyringsListCommand, KeyringsDeleteCommand] })
 export class KeyringsCommand extends CommandRunner {
   public constructor(protected moduleRef: ModuleRef) {
     super();