@deephaven-enterprise/auth-nodejs 1.20240723.107-alpha-auth-nodejs.23563 → 1.20240723.110-beta

package/dist/keyPairUtils.d.ts

@@ -1,5 +1,4 @@
-import type { EnterpriseDhType as DheType } from '@deephaven-enterprise/jsapi-types';
-import type { Base64KeyPair, Base64Nonce, Base64PrivateKey, Base64PublicKey, Base64Signature, KeyPairType, PasswordCredentials } from './types.js';
+import type { AuthenticatedClient, Base64KeyPair, Base64Nonce, Base64PrivateKey, Base64PublicKey, Base64Signature, KeyPairType, Username } from './types.js';
 /**
  * Generate a base64 encoded asymmetric key pair using eliptic curve.
  * @returns The base64 encoded public and private keys.
@@ -22,34 +21,30 @@ export declare function keyWithSentinel(type: KeyPairType, key: Base64PublicKey
 export declare function signWithPrivateKey(nonce: Base64Nonce, privateKey: Base64PrivateKey): Base64Signature;
 /**
  * Delete a list of public keys for a user.
- * @param dhe The JsApi to use.
- * @param serverUrl The DHE server URL.
- * @param credentials The credentials to use for authentication.
+ * @param dheClient An authenticated DHE client to use for the request.
+ * @param userName The user name to delete the keys for.
  * @param publicKeys The list of public keys to delete.
  * @param type The algorithm type used to generate the key.
  * @returns A promise that resolves when the keys have been deleted.
  */
-export declare function deletePublicKeys({ dhe, serverUrl, credentials, publicKeys, type, }: {
-    dhe: DheType;
-    serverUrl: URL;
-    credentials: PasswordCredentials;
+export declare function deletePublicKeys({ dheClient, userName, publicKeys, type, }: {
+    dheClient: AuthenticatedClient;
+    userName: Username;
     publicKeys: Base64PublicKey[];
     type: KeyPairType;
 }): Promise<void>;
 /**
  * Upload a public key to a DHE server.
- * @param dhe The DHE Jsapi to use.
- * @param serverUrl The DHE server URL.
- * @param credentials The credentials to use for authentication.
+ * @param dheClient An authenticated DHE client to use for the request.
+ * @param userName The user name to associate with the key.
  * @param publicKey The base64 encoded public key.
  * @param comment A comment to associate with the key.
  * @param type The type of key pair.
  * @returns The response from the server.
  */
-export declare function uploadPublicKey({ dhe, serverUrl, credentials, publicKey, comment, type, }: {
-    dhe: DheType;
-    serverUrl: URL;
-    credentials: PasswordCredentials;
+export declare function uploadPublicKey({ dheClient, userName, publicKey, comment, type, }: {
+    dheClient: AuthenticatedClient;
+    userName: Username;
     comment: string;
     publicKey: Base64PublicKey;
     type: KeyPairType;

package/dist/keyPairUtils.js

@@ -1,5 +1,4 @@
 import { generateKeyPairSync, sign } from 'node:crypto';
-import { createClient } from './clientUtils.js';
 /*
  * Named curve to use for generating key pairs.
  * Note that 'prime256v1' is synonymous with 'secp256r1'.
@@ -58,19 +57,16 @@ export function signWithPrivateKey(nonce, privateKey) {
 }
 /**
  * Delete a list of public keys for a user.
- * @param dhe The JsApi to use.
- * @param serverUrl The DHE server URL.
- * @param credentials The credentials to use for authentication.
+ * @param dheClient An authenticated DHE client to use for the request.
+ * @param userName The user name to delete the keys for.
  * @param publicKeys The list of public keys to delete.
  * @param type The algorithm type used to generate the key.
  * @returns A promise that resolves when the keys have been deleted.
  */
-export async function deletePublicKeys({ dhe, serverUrl, credentials, publicKeys, type, }) {
-    const dheClient = await createClient(dhe, serverUrl);
-    await dheClient.login(credentials);
+export async function deletePublicKeys({ dheClient, userName, publicKeys, type, }) {
     const { dbAclWriterHost, dbAclWriterPort } = await dheClient.getServerConfigValues();
     const encodedAlgorithm = encodeURIComponent(type.toUpperCase());
-    const encodedUserName = encodeURIComponent(credentials.username);
+    const encodedUserName = encodeURIComponent(userName);
     const authToken = await dheClient.createAuthToken('DbAclWriteServer');
     const apiUrl = `https://${dbAclWriterHost}:${dbAclWriterPort}/acl/publickey/${encodedUserName}`;
     const deletePromises = publicKeys.map(publicKey => {
@@ -89,20 +85,17 @@ export async function deletePublicKeys({ dhe, serverUrl, credentials, publicKeys
 }
 /**
  * Upload a public key to a DHE server.
- * @param dhe The DHE Jsapi to use.
- * @param serverUrl The DHE server URL.
- * @param credentials The credentials to use for authentication.
+ * @param dheClient An authenticated DHE client to use for the request.
+ * @param userName The user name to associate with the key.
  * @param publicKey The base64 encoded public key.
  * @param comment A comment to associate with the key.
  * @param type The type of key pair.
  * @returns The response from the server.
  */
-export async function uploadPublicKey({ dhe, serverUrl, credentials, publicKey, comment, type, }) {
-    const dheClient = await createClient(dhe, serverUrl);
-    await dheClient.login(credentials);
+export async function uploadPublicKey({ dheClient, userName, publicKey, comment, type, }) {
     const { dbAclWriterHost, dbAclWriterPort } = await dheClient.getServerConfigValues();
     const body = {
-        user: credentials.username,
+        user: userName,
         encodedStr: keyWithSentinel(type, publicKey),
         algorithm: type.toUpperCase(),
         comment,

package/dist/loginUtils.js

@@ -1,8 +1,4 @@
-// Have to use full path with extension in order to get type safety.
-// deephaven/web-client-ui/issues/2273 to address the underlying issue.
-import Log from '@deephaven/log/dist/Log.js';
 import { keyWithSentinel, signWithPrivateKey } from './keyPairUtils.js';
-const logger = Log.module('@deephaven-enterprise/auth-nodejs:loginUtils');
 /**
  * Authenticate a given client with username and password. Return the
  * authenticated client.
@@ -11,14 +7,7 @@ const logger = Log.module('@deephaven-enterprise/auth-nodejs:loginUtils');
  * @returns The authenticated client.
  */
 export async function loginClientWithPassword(dheClient, credentials) {
-    logger.debug('Login with username / password:', credentials.username);
-    try {
-        await dheClient.login(credentials);
-    }
-    catch (err) {
-        logger.error('An error occurred when signing in with username / password', err);
-        throw err;
-    }
+    await dheClient.login(credentials);
     return dheClient;
 }
 /**
@@ -28,17 +17,10 @@ export async function loginClientWithPassword(dheClient, credentials) {
  * @returns The authenticated client.
  */
 export async function loginClientWithKeyPair(dheClient, credentials) {
-    logger.debug('Login with private key:', credentials.username);
     const { username, keyPair, operateAs = username } = credentials;
     const { type, publicKey, privateKey } = keyPair;
-    try {
-        const { nonce } = await dheClient.getChallengeNonce();
-        const signedNonce = signWithPrivateKey(nonce, privateKey);
-        await dheClient.challengeResponse(signedNonce, keyWithSentinel(type, publicKey), username, operateAs);
-    }
-    catch (err) {
-        logger.error('An error occurred when signing in with public / private key', err);
-        throw err;
-    }
+    const { nonce } = await dheClient.getChallengeNonce();
+    const signedNonce = signWithPrivateKey(nonce, privateKey);
+    await dheClient.challengeResponse(signedNonce, keyWithSentinel(type, publicKey), username, operateAs);
     return dheClient;
 }

package/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@deephaven-enterprise/auth-nodejs",
-  "version": "1.20240723.107-alpha-auth-nodejs.23563",
+  "version": "1.20240723.110-beta",
   "description": "Deephaven Enterprise Auth Utils for NodeJS",
   "author": "Deephaven Data Labs LLC",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/deephaven-ent/iris.git",
+    "directory": "web/client-ui/packages/auth-nodejs"
+  },
   "private": false,
   "source": "src/index.ts",
   "main": "dist/index.js",
@@ -17,11 +22,11 @@
     "build": "tsc --build"
   },
   "dependencies": {
-    "@deephaven/log": "^0.97.0",
-    "@deephaven/utils": "^0.97.0",
-    "@deephaven-enterprise/jsapi-types": "file:../jsapi-types"
+    "@deephaven-enterprise/jsapi-types": "^1.20240723.110-beta",
+    "@deephaven/utils": "^0.97.0"
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "gitHead": "860c04760627d9da25263781b9b1ba3f02fc2c78"
 }