@tdxvolt/volt-client-grpc 0.16.0-beta.2 → 0.16.0-beta.4

package/lib/index.cjs

@@ -1775,7 +1775,7 @@ function findDIDDocumentService(document, serviceType) {
   return matches;
 }
 
-async function authenticateInternal(createDID = true) {
+async function authenticateInternal(useDID = true) {
   try {
     // Check if we need to resolve a Relay volt.
     if (
@@ -1812,7 +1812,9 @@ async function authenticateInternal(createDID = true) {
     }
 
     const keyPair = this._credential.getKey();
-    const publicKeyPem = pki.publicKeyToPem(keyPair.publicKey);
+    const publicKeyPem = removeCarriageReturn(
+      pki.publicKeyToPem(keyPair.publicKey)
+    );
 
     if (!this._credential.cache.bindIp) {
       // Default the IP address if none is specified. This is used to set the SAN in the
@@ -1839,13 +1841,11 @@ async function authenticateInternal(createDID = true) {
       );
     }
 
-    if (!createDID) {
+    if (!useDID) {
       authenticateRequest.public_key = publicKeyPem;
-    } else {
-      if (!this._credential.cache.identity_id) {
-        // If we don't have an identity id, then we need to create a DID.
-        this._credential.cache.identity_id = `did:volt:${uuid.v4()}`;
-      }
+    } else if (!this._credential.cache.identity_id) {
+      // If we don't have an identity id, then we need to create a DID.
+      this._credential.cache.identity_id = `did:volt:${uuid.v4()}`;
 
       const did = this._credential.cache.identity_id;
 
@@ -1901,6 +1901,8 @@ async function authenticateInternal(createDID = true) {
 
       log$1("did document is %s", authenticateRequest.did_document);
       log$1("did signature is %s", authenticateRequest.did_document_signature);
+    } else {
+      authenticateRequest.did = this._credential.cache.identity_id;
     }
 
     log$1("authenticate TTL is ", this._config.bindRequestTTL);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.16.0-beta.2",
+  "version": "0.16.0-beta.4",
   "description": "tdx Volt library for nodejs clients",
   "type": "module",
   "exports": {

package/src/volt-client-internal.js

@@ -91,7 +91,7 @@ function findDIDDocumentService(document, serviceType) {
   return matches;
 }
 
-export async function authenticateInternal(createDID = true) {
+export async function authenticateInternal(useDID = true) {
   try {
     // Check if we need to resolve a Relay volt.
     if (
@@ -128,7 +128,9 @@ export async function authenticateInternal(createDID = true) {
     }
 
     const keyPair = this._credential.getKey();
-    const publicKeyPem = pki.publicKeyToPem(keyPair.publicKey);
+    const publicKeyPem = voltUtils.removeCarriageReturn(
+      pki.publicKeyToPem(keyPair.publicKey)
+    );
 
     if (!this._credential.cache.bindIp) {
       // Default the IP address if none is specified. This is used to set the SAN in the
@@ -155,13 +157,11 @@ export async function authenticateInternal(createDID = true) {
       );
     }
 
-    if (!createDID) {
+    if (!useDID) {
       authenticateRequest.public_key = publicKeyPem;
-    } else {
-      if (!this._credential.cache.identity_id) {
-        // If we don't have an identity id, then we need to create a DID.
-        this._credential.cache.identity_id = `did:volt:${generateId()}`;
-      }
+    } else if (!this._credential.cache.identity_id) {
+      // If we don't have an identity id, then we need to create a DID.
+      this._credential.cache.identity_id = `did:volt:${generateId()}`;
 
       const did = this._credential.cache.identity_id;
 
@@ -217,6 +217,8 @@ export async function authenticateInternal(createDID = true) {
 
       log("did document is %s", authenticateRequest.did_document);
       log("did signature is %s", authenticateRequest.did_document_signature);
+    } else {
+      authenticateRequest.did = this._credential.cache.identity_id;
     }
 
     log("authenticate TTL is ", this._config.bindRequestTTL);