Update

TryQuiet · Nov 15, 2023 · c6bcdf9 · c6bcdf9
1 parent 111adc8
commit c6bcdf9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 151 deletions.
diff --git a/packages/backend/src/nest/storage/acc.ts b/packages/backend/src/nest/storage/acc.ts
diff --git a/packages/backend/src/nest/storage/certificatesRequestStore.spec.ts b/packages/backend/src/nest/storage/certificatesRequestStore.spec.ts
diff --git a/packages/backend/src/nest/storage/certificatesRequestsStore.ts b/packages/backend/src/nest/storage/certificatesRequestsStore.ts
@@ -1,4 +1,4 @@
-import { CertificationRequest, getCrypto } from 'pkijs'
+import { getCrypto } from 'pkijs'
 import { EventEmitter } from 'events'
 import EventStore from 'orbit-db-eventstore'
 import OrbitDB from 'orbit-db'
@@ -38,6 +38,8 @@ export class CertificatesRequestsStore {
     this.orbitDb = orbitDb
   }
 
+  // Lock replicated event until previous event is processed by registration service
+
   public resetCsrReplicatedMapAndId() {
     this.csrReplicatedPromiseMap = new Map()
     this.csrReplicatedPromiseId = 0
@@ -117,14 +119,15 @@ export class CertificatesRequestsStore {
     await this.store.load({ fetchEntryTimeout: 15000 })
   }
 
-  public getAddress() {
-    return this.store?.address
-  }
 
   public async close() {
     await this.store?.close()
   }
 
+  public getAddress() {
+    return this.store?.address
+  }
+
   public async addUserCsr(csr: string) {
     logger('Adding user csr')
     await this.store.add(csr)
@@ -140,7 +143,7 @@ export class CertificatesRequestsStore {
       }
       const parsedCsr = await loadCSR(csr)
       await parsedCsr.verify()
-      await this.validateCsr(csr)
+      await this.validateCsrFormat(csr)
 
       // Validate fields
 
@@ -151,7 +154,7 @@ export class CertificatesRequestsStore {
     return true
   }
 
-  private async validateCsr(csr: string) {
+  private async validateCsrFormat(csr: string) {
     const userData = new UserCsrData()
     userData.csr = csr
     const validationErrors = await validate(userData)