@earthlink/dotvault 0.14.1 → 0.14.3

package/dist/index.js

@@ -61,14 +61,18 @@ var InvalidCredentialsError = class extends EnvSyncError {
   }
 };
 var PermissionDeniedError = class extends EnvSyncError {
-  constructor(project, env) {
-    super("PERMISSION_DENIED", `You do not have permission for project '${project}' env '${env}'. Ask an org admin to grant access at https://app.dotvault.io.`, 4);
+  constructor(project, env, serverMessage) {
+    const scope = project !== void 0 && env !== void 0 ? ` for project '${project}' env '${env}'` : "";
+    const detail = serverMessage !== void 0 && serverMessage.length > 0 ? ` (server: ${serverMessage})` : "";
+    super("PERMISSION_DENIED", `You do not have permission${scope}${detail}. Ask an org admin to grant access at https://app.dotvault.io.`, 4);
     this.name = "PermissionDeniedError";
   }
 };
 var ProjectNotFoundError = class extends EnvSyncError {
-  constructor(project, env) {
-    super("PROJECT_NOT_FOUND", `No secrets found for project '${project}' env '${env}'. Check the names \u2014 they are case-sensitive \u2014 and that the project exists in the admin console.`, 5);
+  constructor(project, env, serverMessage) {
+    const scope = project !== void 0 && env !== void 0 ? ` for project '${project}' env '${env}'` : "";
+    const detail = serverMessage !== void 0 && serverMessage.length > 0 ? ` (server: ${serverMessage})` : "";
+    super("PROJECT_NOT_FOUND", `No secrets found${scope}${detail}. Check the names \u2014 they are case-sensitive \u2014 and that the project exists in the admin console.`, 5);
     this.name = "ProjectNotFoundError";
   }
 };
@@ -607,16 +611,10 @@ async function handleResponse(res, ctx) {
     throw new AuthRequiredError(message);
   }
   if (res.status === 403) {
-    throw new PermissionDeniedError(
-      ctx?.project ?? "(unknown project)",
-      ctx?.env ?? "(unknown env)"
-    );
+    throw new PermissionDeniedError(ctx?.project, ctx?.env, parsed?.message);
   }
   if (res.status === 404) {
-    throw new ProjectNotFoundError(
-      ctx?.project ?? "(unknown project)",
-      ctx?.env ?? "(unknown env)"
-    );
+    throw new ProjectNotFoundError(ctx?.project, ctx?.env, parsed?.message);
   }
   throw new EnvSyncError(code, message, 99);
 }
@@ -757,22 +755,24 @@ async function globalDropCommand(opts) {
   );
 }
 async function resolve2(opts) {
+  if (opts.project !== void 0) {
+    const http2 = opts.http ?? createHttpClient(await resolveApiUrl(opts.cwd));
+    const authedFetch2 = await buildAuthedFetch(http2);
+    return { http: http2, project: opts.project, authedFetch: authedFetch2 };
+  }
   const cfg = await loadProjectConfig(opts.cwd);
-  const project = opts.project ?? cfg.name;
   const http = opts.http ?? createHttpClient(cfg.proxy.apiUrl);
   const authedFetch = await buildAuthedFetch(http);
-  return { http, project, authedFetch };
+  return { http, project: cfg.name, authedFetch };
 }
 async function resolvePool(opts) {
-  const cfg = await loadProjectConfig(opts.cwd);
-  const http = opts.http ?? createHttpClient(cfg.proxy.apiUrl);
+  const http = opts.http ?? createHttpClient(await resolveApiUrl(opts.cwd));
   const authedFetch = await buildAuthedFetch(http);
   return { http, orgId: opts.orgId, authedFetch };
 }
 async function resolvePoolWithEnv(opts) {
-  const cfg = await loadProjectConfig(opts.cwd);
   const env = opts.env ?? GLOBAL_ALL_ENV;
-  const http = opts.http ?? createHttpClient(cfg.proxy.apiUrl);
+  const http = opts.http ?? createHttpClient(await resolveApiUrl(opts.cwd));
   const authedFetch = await buildAuthedFetch(http);
   return { http, orgId: opts.orgId, env, authedFetch };
 }
@@ -1630,8 +1630,7 @@ async function fileExists(path) {
 
 // src/commands/project.ts
 async function projectCreateCommand(opts) {
-  const cfg = await loadProjectConfig(opts.cwd);
-  const http = createHttpClient(cfg.proxy.apiUrl);
+  const http = createHttpClient(await resolveApiUrl(opts.cwd));
   const body = {
     name: opts.name,
     ...opts.orgId !== void 0 ? { owning_org_id: opts.orgId } : {}
@@ -1665,14 +1664,12 @@ async function buildAuthedFetch4(http) {
 
 // src/commands/token.ts
 async function tokenListCommand(opts) {
-  const cfg = await loadProjectConfig(opts.cwd);
-  const http = createHttpClient(cfg.proxy.apiUrl);
+  const http = createHttpClient(await resolveApiUrl(opts.cwd));
   const authedFetch = await buildAuthedFetch5(http);
   return authedFetch((bearer) => http.adminTokensList(bearer, { orgId: opts.orgId }));
 }
 async function tokenCreateCommand(opts) {
-  const cfg = await loadProjectConfig(opts.cwd);
-  const http = createHttpClient(cfg.proxy.apiUrl);
+  const http = createHttpClient(await resolveApiUrl(opts.cwd));
   const authedFetch = await buildAuthedFetch5(http);
   const body = {
     name: opts.name,
@@ -1683,8 +1680,7 @@ async function tokenCreateCommand(opts) {
   return authedFetch((bearer) => http.adminTokensCreate(bearer, { orgId: opts.orgId }, body));
 }
 async function tokenRevokeCommand(opts) {
-  const cfg = await loadProjectConfig(opts.cwd);
-  const http = createHttpClient(cfg.proxy.apiUrl);
+  const http = createHttpClient(await resolveApiUrl(opts.cwd));
   const authedFetch = await buildAuthedFetch5(http);
   await authedFetch(
     (bearer) => http.adminTokensRevoke(bearer, { orgId: opts.orgId, tokenId: opts.tokenId })