feat(cli): surface env-var credentials in logout and whoami (#1363)

* feat(cli): surface env-var credentials in logout and whoami

login already warns when CHECKLY_API_KEY/CHECKLY_ACCOUNT_ID are set,
since they override any persisted session. logout and whoami stayed
silent, so clearing the local session or running whoami after logout
still looked authenticated with no explanation.

Extract login's message into common-messages and reuse it so logout
warns that env vars keep you authenticated, and whoami notes when the
account is resolved from the environment.

* test(cli): normalize oclif warning wrap in logout e2e

oclif's this.warn() word-wraps the message and prefixes continuation
lines with ` › `, splitting "still authenticated through them" across
a line break. Strip the markers and collapse whitespace before matching
so the assertion is independent of terminal width.

* test(cli): assert logout warning with wrap-safe substring

Match the substring style used by the login e2e instead of normalizing
oclif's line wrapping. "authenticated" appears only in the logout
suffix and is a single word, so it can't be split across a wrapped
line.

* test(cli): drop redundant logout warning substring assertion

* test(cli): trim verbose comments in auth e2e tests

Author: stefanjudis

packages/cli/e2e/__tests__/logout.spec.ts

@@ -21,6 +21,7 @@ describe('logout', () => {
     })
 
     expect(stdout).toContain('See you soon! 👋')
-    expect(stderr).toBe('')
+    // env credentials are set, so logout warns the session clear didn't log us out
+    expect(stderr).toContain('are configured (via shell or .env file)')
   })
 })

packages/cli/e2e/__tests__/whoami.spec.ts

@@ -19,5 +19,7 @@ describe('whomai', () => {
     const { stdout } = await runCheckly(fixt, ['whoami'])
     expect(stdout).toContain(config.get('accountName'))
     expect(stdout).toContain('Plan:')
+    // env credentials are set, so whoami notes the account comes from the environment
+    expect(stdout).toContain('resolved from your environment')
   })
 })

packages/cli/src/commands/login.ts

@@ -6,6 +6,7 @@ import config from '../services/config.js'
 import * as api from '../rest/api.js'
 import type { Account } from '../rest/accounts.js'
 import { AuthContext } from '../auth/index.js'
+import commonMessages from '../messages/common-messages.js'
 
 export const selectAccount = async (
   accounts: Array<Account>, { onCancel }: { onCancel: () => void }): Promise<Account> => {
@@ -30,8 +31,7 @@ export default class Login extends BaseCommand {
 
   private _checkExistingCredentials = async () => {
     if (config.hasEnvVarsConfigured()) {
-      this.warn('`CHECKLY_API_KEY` '
-        + 'or `CHECKLY_ACCOUNT_ID` environment variables are configured (via shell or .env file). You must delete them to use `npx checkly login`.')
+      this.warn(`${commonMessages.envCredentialsConfigured} You must delete them to use \`npx checkly login\`.`)
       this.exit(0)
     }
 

packages/cli/src/commands/logout.ts

@@ -39,5 +39,9 @@ export default class Logout extends BaseCommand {
 
     config.clear()
     this.log('See you soon! 👋')
+
+    if (config.hasEnvVarsConfigured()) {
+      this.warn(`${commonMessages.envCredentialsConfigured} You are still authenticated through them until you remove them.`)
+    }
   }
 }

packages/cli/src/commands/whoami.ts

@@ -1,4 +1,6 @@
 import * as api from '../rest/api.js'
+import config from '../services/config.js'
+import commonMessages from '../messages/common-messages.js'
 import { AuthCommand } from './authCommand.js'
 
 export default class Whoami extends AuthCommand {
@@ -18,5 +20,9 @@ export default class Whoami extends AuthCommand {
     if (addonNames.length > 0) {
       this.log(`Add-ons: ${addonNames.join(', ')}`)
     }
+    if (config.hasEnvVarsConfigured()) {
+      this.log()
+      this.log(`This account is resolved from your environment, not a \`checkly login\` session. ${commonMessages.envCredentialsConfigured}`)
+    }
   }
 }

packages/cli/src/messages/common-messages.ts

@@ -2,6 +2,8 @@ const commonMessages = {
   forceMode: 'Force mode. Skips the confirmation dialog.',
   configFile: 'The Checkly CLI configuration file. If not passed, uses the checkly.config.ts|js file in the current'
     + ' directory.',
+  envCredentialsConfigured: '`CHECKLY_API_KEY` or `CHECKLY_ACCOUNT_ID` environment variables are configured'
+    + ' (via shell or .env file).',
 }
 
 export default commonMessages