Address PR comments

Author: umair-ably

src/commands/auth/keys/current.ts

@@ -40,7 +40,7 @@ export default class KeysCurrentCommand extends ControlBaseCommand {
       this.fail(
         `No API key configured for app ${appId}. Use "ably auth keys switch" to select a key.`,
         flags,
-        "KeyCurrent",
+        "keyCurrent",
       );
     }
 
@@ -97,7 +97,7 @@ export default class KeysCurrentCommand extends ControlBaseCommand {
       this.fail(
         "ABLY_API_KEY environment variable is not set",
         flags,
-        "KeyCurrent",
+        "keyCurrent",
       );
     }
 

src/commands/auth/keys/revoke.ts

@@ -38,24 +38,12 @@ export default class KeysRevokeCommand extends ControlBaseCommand {
   async run(): Promise<void> {
     const { args, flags } = await this.parse(KeysRevokeCommand);
 
-    let appId: string | undefined;
     let keyId = args.keyName;
 
     const parsed = parseKeyIdentifier(args.keyName);
-    if (parsed.appId) appId = parsed.appId;
     keyId = parsed.keyId;
 
-    if (!appId) {
-      const resolved = await this.resolveAppId(flags);
-      if (!resolved) {
-        this.fail(
-          'No app specified. Use --app flag, provide APP_ID.KEY_ID as the argument, or select an app with "ably apps switch"',
-          flags,
-          "keyRevoke",
-        );
-      }
-      appId = resolved;
-    }
+    const appId = parsed.appId ?? (await this.requireAppId(flags));
 
     try {
       const controlApi = this.createControlApi(flags);

src/commands/auth/keys/switch.ts

@@ -33,26 +33,16 @@ export default class KeysSwitchCommand extends ControlBaseCommand {
   async run(): Promise<void> {
     const { args, flags } = await this.parse(KeysSwitchCommand);
 
-    let appId: string | undefined;
     let keyId: string | undefined = args.keyNameOrValue;
+    let extractedAppId: string | undefined;
 
     if (args.keyNameOrValue) {
       const parsed = parseKeyIdentifier(args.keyNameOrValue);
-      if (parsed.appId) appId = parsed.appId;
+      if (parsed.appId) extractedAppId = parsed.appId;
       keyId = parsed.keyId;
     }
 
-    if (!appId) {
-      const resolved = await this.resolveAppId(flags);
-      if (!resolved) {
-        this.fail(
-          'No app specified. Use --app flag, provide APP_ID.KEY_ID as the argument, or select an app with "ably apps switch"',
-          flags,
-          "keySwitch",
-        );
-      }
-      appId = resolved;
-    }
+    const appId = extractedAppId ?? (await this.requireAppId(flags));
 
     try {
       const controlApi = this.createControlApi(flags);

src/commands/auth/keys/update.ts

@@ -49,24 +49,12 @@ export default class KeysUpdateCommand extends ControlBaseCommand {
       );
     }
 
-    let appId: string | undefined;
     let keyId = args.keyName;
 
     const parsed = parseKeyIdentifier(args.keyName);
-    if (parsed.appId) appId = parsed.appId;
     keyId = parsed.keyId;
 
-    if (!appId) {
-      const resolved = await this.resolveAppId(flags);
-      if (!resolved) {
-        this.fail(
-          'No app specified. Use --app flag, provide APP_ID.KEY_ID as the argument, or select an app with "ably apps switch"',
-          flags,
-          "keyUpdate",
-        );
-      }
-      appId = resolved;
-    }
+    const appId = parsed.appId ?? (await this.requireAppId(flags));
 
     try {
       const controlApi = this.createControlApi(flags);