Accept TRANSLOADIT_AUTH_* env vars in CLI

Author: kvz

src/cli/commands/BaseCommand.ts

@@ -4,6 +4,7 @@ import 'dotenv/config'
 import { Transloadit as TransloaditClient } from '../../Transloadit.ts'
 import type { IOutputCtl } from '../OutputCtl.ts'
 import OutputCtl, { LOG_LEVEL_DEFAULT, LOG_LEVEL_NAMES, parseLogLevel } from '../OutputCtl.ts'
+import { getEnvCredentials } from '../helpers.ts'
 
 export abstract class BaseCommand extends Command {
   logLevelOption = Option.String('-l,--log-level', {
@@ -31,7 +32,8 @@ export abstract class BaseCommand extends Command {
   }
 
   protected setupClient(): boolean {
-    if (!process.env.TRANSLOADIT_KEY || !process.env.TRANSLOADIT_SECRET) {
+    const creds = getEnvCredentials()
+    if (!creds) {
       this.output.error(
         'Please provide API authentication in the environment variables TRANSLOADIT_KEY and TRANSLOADIT_SECRET',
       )
@@ -40,11 +42,7 @@ export abstract class BaseCommand extends Command {
 
     const endpoint = this.endpoint || process.env.TRANSLOADIT_ENDPOINT
 
-    this.client = new TransloaditClient({
-      authKey: process.env.TRANSLOADIT_KEY,
-      authSecret: process.env.TRANSLOADIT_SECRET,
-      ...(endpoint && { endpoint }),
-    })
+    this.client = new TransloaditClient({ ...creds, ...(endpoint && { endpoint }) })
     return true
   }
 

src/cli/commands/auth.ts

@@ -8,6 +8,7 @@ import {
 } from '../../alphalib/types/template.ts'
 import type { OptionalAuthParams } from '../../apiTypes.ts'
 import { Transloadit } from '../../Transloadit.ts'
+import { getEnvCredentials } from '../helpers.ts'
 import { UnauthenticatedCommand } from './BaseCommand.ts'
 
 type UrlParamPrimitive = string | number | boolean
@@ -80,16 +81,7 @@ async function readStdin(): Promise<string> {
   return data
 }
 
-function getCredentials(): { authKey: string; authSecret: string } | null {
-  const authKey = process.env.TRANSLOADIT_KEY || process.env.TRANSLOADIT_AUTH_KEY
-  const authSecret = process.env.TRANSLOADIT_SECRET || process.env.TRANSLOADIT_AUTH_SECRET
-
-  if (!authKey || !authSecret) {
-    return null
-  }
-
-  return { authKey, authSecret }
-}
+const getCredentials = getEnvCredentials
 
 // Result type for signature operations
 type SigResult = { ok: true; output: string } | { ok: false; error: string }

src/cli/helpers.ts

@@ -3,6 +3,15 @@ import type { Readable } from 'node:stream'
 import type { APIError } from './types.ts'
 import { isAPIError } from './types.ts'
 
+export function getEnvCredentials(): { authKey: string; authSecret: string } | null {
+  const authKey = process.env.TRANSLOADIT_KEY ?? process.env.TRANSLOADIT_AUTH_KEY
+  const authSecret = process.env.TRANSLOADIT_SECRET ?? process.env.TRANSLOADIT_AUTH_SECRET
+
+  if (!authKey || !authSecret) return null
+
+  return { authKey, authSecret }
+}
+
 export function createReadStream(file: string): Readable {
   if (file === '-') return process.stdin
   return fs.createReadStream(file)