@truenas/api-client 9.0.1 → 9.0.3

package/dist/{chunk-K7BL6J3Z.js → chunk-K5ICTA2D.js}

@@ -2191,9 +2191,16 @@ var AuthErrorCode = /* @__PURE__ */ ((AuthErrorCode2) => {
   return AuthErrorCode2;
 })(AuthErrorCode || {});
 var AuthError = class _AuthError extends Error {
-  constructor(code, message) {
+  /**
+   * @param response - the answer middleware refused the login with, when there was one.
+   * Its `response_type` is what tells `EXPIRED`, `DENIED` and `REDIRECT` apart from
+   * `AUTH_ERR`; the code alone says only which mechanism failed. Absent when the login
+   * never got an answer of that kind (an error frame, or a superseded login).
+   */
+  constructor(code, message, response) {
     super(message);
     this.code = code;
+    this.response = response;
     this.name = "AuthError";
     Object.setPrototypeOf(this, _AuthError.prototype);
   }
@@ -2731,7 +2738,7 @@ function getWebSocketPath(version) {
 // src/auth/truenas-authenticator.ts
 var throwOnAuthenticationFailure = (code, message) => switchMap((response) => {
   if (response.response_type === "AUTH_ERR" /* AuthErr */) {
-    return throwError(() => new AuthError(code, message));
+    return throwError(() => new AuthError(code, message, response));
   }
   return of(response);
 });
@@ -2868,7 +2875,8 @@ var TrueNasAuthenticator = class _TrueNasAuthenticator {
     }
     this.authenticating$.next(false);
   }
-  loginWithUserPass(username, password) {
+  loginWithUserPass(username, password, options = {}) {
+    const { rememberPassword = true } = options;
     const { sentDuring, callerInitiated } = this.beginLogin();
     let answered = false;
     const message = createJsonRpcMessage("auth.login_ex", [
@@ -2904,9 +2912,11 @@ var TrueNasAuthenticator = class _TrueNasAuthenticator {
       tap((res) => {
         if (res.response_type === "SUCCESS" /* Success */) {
           this.assertNotSuperseded(sentDuring);
-          this.credentials = { username, password, key: "" };
+          this.credentials = rememberPassword ? { username, password, key: "" } : { username: "", password: "", key: "" };
           this.sessionLifetime = res.user_info?.attributes?.preferences?.lifetime ?? _TrueNasAuthenticator.DefaultSessionLifetime;
           this.authenticated$.next(true);
+        } else if (res.response_type === "OTP_REQUIRED" /* OtpRequired */ && !rememberPassword && this.authEpoch === sentDuring) {
+          this.credentials = { username: "", password: "", key: "" };
         }
       }),
       finalize(() => {
@@ -3004,7 +3014,8 @@ var TrueNasAuthenticator = class _TrueNasAuthenticator {
         if (res.response_type !== "SUCCESS" /* Success */) {
           throw new AuthError(
             "TOKEN_AUTH_FAILED" /* TokenAuthFailed */,
-            `TrueNAS token authentication failed (${res.response_type}). The token may have expired or been used, or the account may no longer be permitted to log in.`
+            `TrueNAS token authentication failed (${res.response_type}). The token may have expired or been used, or the account may no longer be permitted to log in.`,
+            res
           );
         }
         return res;
@@ -4295,6 +4306,11 @@ async function createTrueNasClient(opts) {
       `Cannot create client for system ${uuid}: hostnames array is empty`
     );
   }
+  if (opts.websocketPath !== void 0 && !opts.websocketPath.startsWith("/")) {
+    throw new Error(
+      `Cannot create client for system ${uuid}: websocketPath must be an absolute path, got '${opts.websocketPath}'.`
+    );
+  }
   logger.info("Creating versioned API client", {
     uuid: uuid.slice(0, 8),
     hostnames: hostnames.join(", "),
@@ -4324,7 +4340,7 @@ async function createTrueNasClient(opts) {
     logger.info("API version supplied by the caller, skipping discovery", {
       uuid: uuid.slice(0, 8),
       version: known.version,
-      websocketPath: known.websocketPath
+      websocketPath: opts.websocketPath ?? known.websocketPath
     });
     return instantiateClientForVersion(known, opts, logger);
   }
@@ -4343,7 +4359,7 @@ async function createTrueNasClient(opts) {
       // of them anyway.
       hostname: winner.hostname,
       version: version.version,
-      websocketPath: version.websocketPath
+      websocketPath: opts.websocketPath ?? version.websocketPath
     });
   } catch (error) {
     const errorMessage = errorMessageOrDefault(error, "Unknown error");
@@ -4469,6 +4485,7 @@ function clientClassFor(version) {
 function instantiateClientForVersion(version, opts, logger) {
   const { uuid, hostnames, enabled, systemName } = opts;
   const versionKey = clientVersionKey(version);
+  const endpoint = opts.websocketPath === void 0 ? version : { ...version, websocketPath: opts.websocketPath };
   const Client = CLIENT_BY_VERSION_KEY[versionKey];
   if (!Client) {
     logger.error("No client implementation for version", {
@@ -4483,12 +4500,13 @@ function instantiateClientForVersion(version, opts, logger) {
   logger.info(`Instantiating ${Client.name}`, {
     uuid: uuid.slice(0, 8),
     version: version.version,
-    versionKey
+    versionKey,
+    websocketPath: endpoint.websocketPath
   });
   return new Client(
     uuid,
     hostnames,
-    version,
+    endpoint,
     enabled,
     systemName,
     logger,
@@ -4513,5 +4531,5 @@ var UserRole = /* @__PURE__ */ ((UserRole2) => {
 })(UserRole || {});
 
 export { AppState, AuthError, AuthErrorCode, AuthResponseType, InvalidVersionResponseError, JobState, NoCompatibleVersionsError, SUPPORTED_API_VERSIONS, TrueNasApiClient, TrueNasApiClientV2510, TrueNasApiClientV27, TrueNasApiClientV28, TrueNasApiError, TrueNasAuthMechanism, TrueNasAuthenticator, TrueNasConnection, UserRole, VersionCompatibility, VersionDiscovery, VersionDiscoveryError, VersionDiscoveryNetworkError, VersionDiscoveryTimeoutError, VersionEndpointNotFoundError, VersionTooNewError, VersionTooOldError, clientClassFor, consoleLogger, createTrueNasClient, getApiErrorMessage, getCloseMessage, isJobFinished, noopLogger, parseApiVersion, policyViolationCloseCode, subscriptionName, v25_10_0_exports, v25_10_1_exports, v25_10_2_exports, v25_10_3_exports, v25_10_4_exports, v25_10_5_exports, v27_0_0_exports, v28_0_0_exports };
-//# sourceMappingURL=chunk-K7BL6J3Z.js.map
-//# sourceMappingURL=chunk-K7BL6J3Z.js.map
+//# sourceMappingURL=chunk-K5ICTA2D.js.map
+//# sourceMappingURL=chunk-K5ICTA2D.js.map