@earthlink/dotvault 0.14.0 → 0.14.2

package/dist/index.js

@@ -55,7 +55,7 @@ var AuthExpiredError = class extends EnvSyncError {
   }
 };
 var InvalidCredentialsError = class extends EnvSyncError {
-  constructor(msg = "Invalid email or password.") {
+  constructor(msg = "Invalid email or password. If you joined via an invite link and have not set a password yet, set one at https://app.dotvault.io/forgot-password, then run `dotvault login` again.") {
     super("INVALID_CREDENTIALS", msg, 3);
     this.name = "InvalidCredentialsError";
   }
@@ -757,22 +757,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 +1632,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 +1666,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 +1682,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 })
@@ -1799,7 +1797,10 @@ Example:
     `
 Example:
   $ dotvault login                       # prompts for email + password
-  $ dotvault login -e you@dotvault.io`
+  $ dotvault login -e you@dotvault.io
+
+Invited via a link? The invite is passwordless \u2014 before your first
+\`dotvault login\`, set a password at https://app.dotvault.io/forgot-password.`
   ).action(async (opts) => {
     const result = await loginCommand({ email: opts.email });
     const expiresIn = Math.max(0, result.expiresAt - Math.floor(Date.now() / 1e3));