@theholocron/http-client 1.7.0 → 1.8.0

package/README.md

@@ -41,7 +41,13 @@ const data = await client.request<{ id: string }>("/widgets/42");
 
 ### `createResolveToken(config)`
 
-Factory for the standard 4-step token resolution used by all holocron plugins: `--token` flag → `HOLOCRON_*` env var → vendor env var → keyring.
+Factory for the standard token resolution used by all holocron plugins. Resolution order:
+
+1. `cliToken` — value from `--token` CLI flag
+2. `HOLOCRON_*` env var (e.g. `HOLOCRON_EXAMPLE_TOKEN`)
+3. Vendor env var (e.g. `EXAMPLE_TOKEN`)
+4. Keyring `<service>.<org>` — only when an org is active (see `ResolveTokenInput.org`)
+5. Keyring `<service>` — unnamespaced fallback; backward-compatible default
 
 ```ts
 import { createResolveToken, AuthError } from "@theholocron/http-client";
@@ -56,6 +62,15 @@ export const resolveToken = createResolveToken({
 });
 ```
 
+The returned `resolveToken(input?)` function accepts a `ResolveTokenInput`:
+
+| Field      | Type                                   | Description                                                                                                                                        |
+| ---------- | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `cliToken` | `string`                               | Token from `--token` CLI flag; takes highest priority                                                                                              |
+| `env`      | `NodeJS.ProcessEnv`                    | Env vars to consult; defaults to `process.env`                                                                                                     |
+| `keyring`  | `(provider: string) => string \| null` | Keyring lookup fn; defaults to the keyring injected by `@theholocron/cli`                                                                          |
+| `org`      | `string`                               | Active org name; tries `keyring("<service>.<org>")` before the unnamespaced fallback. Also auto-read from `env["HOLOCRON_ORG"]` when not provided. |
+
 ### `ProviderApiError`
 
 Thrown by `createRestClient` on non-2xx responses and transport failures. Carries `status` (HTTP code, `0` for transport failures) and `details` (raw response text).

package/dist/index.d.mts

@@ -9,6 +9,8 @@ interface ResolveTokenInput {
   env?: NodeJS.ProcessEnv;
   /** Keyring lookup fn; passed in for testability. */
   keyring?: (provider: string) => string | null;
+  /** Active org name — drives namespaced keyring lookup (`<service>.<org>`). */
+  org?: string;
 }
 interface ResolveTokenConfig {
   /** HOLOCRON_* env var (e.g. `"HOLOCRON_GH_TOKEN"`). */

package/dist/index.mjs

@@ -21,7 +21,8 @@ function createResolveToken(config) {
 	return function resolveToken(input = {}) {
 		const env = input.env ?? process.env;
 		const keyring = input.keyring ?? defaultKeyring;
-		const token = input.cliToken || env[config.envName] || env[config.vendorEnvName] || keyring(config.keyringService);
+		const org = input.org ?? env["HOLOCRON_ORG"];
+		const token = input.cliToken || env[config.envName] || env[config.vendorEnvName] || (org ? keyring(`${config.keyringService}.${org}`) : null) || keyring(config.keyringService);
 		if (!token) throw new AuthError(config.errorMessage);
 		return token;
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theholocron/http-client",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Shared HTTP primitives for theholocron — REST client factory, auth resolver, and error types",
   "homepage": "https://github.com/theholocron/clients/tree/main/packages/http-client#readme",
   "bugs": "https://github.com/theholocron/clients/issues",