Make generateUserCertificate backwards compatible

TryQuiet · Apr 9, 2024 · 1ecce76 · 1ecce76
1 parent 27a1c84
commit 1ecce76
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/packages/identity/src/createUserCert.ts b/packages/identity/src/createUserCert.ts
@@ -75,9 +75,24 @@ async function generateUserCertificate({
   let altNames
 
   try {
-    nickname = attr?.[1].values[0].valueBlock.value
-    peerId = attr?.[2].values[0].valueBlock.value
-    onionAddress = attr?.[3].values[0].valueBlock.value
+    // MIGRATION: We removed dmPublicKey from the attributes at
+    // position 1. However, we maintain backwards compatibility for
+    // existing CSRs, if we ever need to re-issue certificates.
+    //
+    // TODO: Perhaps we should retreive values by their field type
+    // instead of their position.
+    if (attr?.length === 5) {
+      // publicKey = attr[0]
+      // dmPublicKey = attr[1]
+      nickname = attr?.[2].values[0].valueBlock.value
+      peerId = attr?.[3].values[0].valueBlock.value
+      onionAddress = attr?.[4].values[0].valueBlock.value
+    } else {
+      // publicKey = attr[0]
+      nickname = attr?.[1].values[0].valueBlock.value
+      peerId = attr?.[2].values[0].valueBlock.value
+      onionAddress = attr?.[3].values[0].valueBlock.value
+    }
     altNames = new GeneralNames({
       names: [
         new GeneralName({