niranzwp 0.8.5 → 0.8.6

package/bin/niranzwp.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { loginWithAppPassword, loginManual } from '../lib/auth.js';
+import { loginWithAppPassword, loginManual, credentialsFromEnv } from '../lib/auth.js';
 import { saveProfile, saveOAuthProfile, getProfile, listProfiles, deleteProfile, storageKind, configDir } from '../lib/store.js';
 import { discover, registerClient, startDeviceFlow, pollForToken } from '../lib/oauth.js';
 import { CliError } from '../lib/errors.js';
@@ -257,9 +257,31 @@ async function main() {
 		// password on its own success page and the user carries it here. The
 		// only route that works when the browser cannot reach this machine --
 		// SSH, a VPS, a phone browser against a CLI running elsewhere.
-		const creds = flags.manual === true
-			? await loginManual(site, { open: flags.open !== false })
-			: await loginWithAppPassword(site, { open: flags.open !== false });
+		/*
+		 * The environment first, and a refusal rather than a hang.
+		 *
+		 * Both routes below need a person -- one to approve in a browser, one
+		 * to type at a prompt -- and neither can tell you that. Given the
+		 * variables, this skips them entirely; without them, and with no
+		 * terminal to prompt at, it says so instead of waiting.
+		 */
+		const fromEnv = credentialsFromEnv();
+		let creds;
+
+		if (fromEnv) {
+			const info = await probe(site);
+			creds = { siteUrl: site.replace(/\/+$/, ''), ...fromEnv, info };
+		} else if (process.stdin.isTTY !== true && flags.manual !== true) {
+			throw new CliError(
+				'no_terminal',
+				'There is no terminal here to approve or type at, and no credentials in the environment.',
+				{ hint: 'Set NIRANZWP_USER and NIRANZWP_APP_PASSWORD, or pipe the two answers into --manual.' }
+			);
+		} else {
+			creds = flags.manual === true
+				? await loginManual(site, { open: flags.open !== false })
+				: await loginWithAppPassword(site, { open: flags.open !== false });
+		}
 
 		// A pasted credential can be mistyped, so prove it works before
 		// storing it. The loopback flow's credential came from WordPress

package/lib/auth.js

@@ -111,6 +111,27 @@ export async function loginWithAppPassword(siteUrl, { appName = 'NiranzWP CLI',
 			console.error('Approve this connection in your browser:');
 			console.error(`  ${authorize}`);
 			console.error('');
+			/*
+			 * Said before the wait, not after it.
+			 *
+			 * The callback is http://127.0.0.1, and WordPress accepts an
+			 * http:// redirect only when the site's own environment type is
+			 * "local" -- wp_is_authorize_application_redirect_url_valid()
+			 * exempts nothing by host, not loopback, not private ranges. On a
+			 * live site the browser is shown "The URL must be served over a
+			 * secure connection." and this listener, which cannot see that
+			 * page, waits out its five minutes in silence.
+			 *
+			 * Whether a given site will refuse is not knowable from here --
+			 * the environment type is not in the REST root, and a public site
+			 * can still be set to "local", wrongly but effectively. So this
+			 * does not guess. It says what that error means and what to do
+			 * about it, where it will be read.
+			 */
+			console.error('If the browser says "The URL must be served over a secure connection",');
+			console.error('this site will not hand the password back here. Stop and run:');
+			console.error(`  niranzwp auth login ${siteUrl} --manual`);
+			console.error('');
 			if (open) openBrowser(authorize.toString());
 		});
 	});
@@ -156,6 +177,30 @@ export async function loginManual(siteUrl, { appName = 'NiranzWP CLI', open = tr
 	return { siteUrl: siteUrl.replace(/\/+$/, ''), user: user.trim(), password: password.trim(), info };
 }
 
+/**
+ * Credentials from the environment, for anything with nobody sitting at it.
+ *
+ * Every other route here needs a person: a browser to approve in, or a
+ * terminal to type into. A script, a CI job or an agent has neither, and used
+ * to discover that by waiting five minutes for a callback that was never
+ * coming. Two variables connect directly:
+ *
+ *     NIRANZWP_USER=editor NIRANZWP_APP_PASSWORD='abcd efgh ...' \
+ *       niranzwp auth login https://example.com
+ *
+ * Deliberately not flags. A password given on the command line is written
+ * into shell history and shows up in `ps` to every other user on the machine.
+ * An environment variable does neither.
+ *
+ * @returns {{user: string, password: string} | null}
+ */
+export function credentialsFromEnv() {
+	const user = (process.env.NIRANZWP_USER || '').trim();
+	const password = (process.env.NIRANZWP_APP_PASSWORD || '').trim();
+
+	return user && password ? { user, password } : null;
+}
+
 /**
  * Both prompts on ONE readline interface.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "niranzwp",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "description": "A CLI for WordPress. Works on any site via Application Passwords, and unlocks Abilities where a site provides them.",
   "type": "module",
   "bin": {