Replace source of pubKey to CSR

CHANGELOG.md

@@ -6,4 +6,6 @@
 
 * Fixed bug with changing joining community/create community screens with required field.
 
-* Fixed bug with displaying incorrect default settings tab.
+* Fixed bug with displaying incorrect default settings tab.
+
+* Replaced source of publicKey in sendMessage saga to CSR

packages/identity/src/extractPubKey.ts

@@ -22,6 +22,12 @@ export const keyFromCertificate = (certificate: Certificate | CertificationReque
   return Buffer.from(certificate.subjectPublicKeyInfo.subjectPublicKey.valueBlock.valueHex).toString('base64')
 }
 
+export const pubKeyFromCsr = (csr: string) => {
+  const parsedCsr = parseCertificationRequest(csr)
+  const derBuffer = Buffer.from(parsedCsr.subjectPublicKeyInfo.subjectPublicKey.valueBlock.valueHex).toString('base64')
+  return derBuffer
+}
+
 export const keyObjectFromString = async (pubKeyString: string, crypto: SubtleCrypto | null): Promise<CryptoKey> => {
   if (!crypto) throw new NoCryptoEngineError()
   let keyArray = new ArrayBuffer(0)

packages/identity/src/index.ts

@@ -5,6 +5,7 @@ import {
   keyFromCertificate,
   keyObjectFromString,
   extractPubKeyString,
+  pubKeyFromCsr,
 } from './extractPubKey'
 import { verifyUserCert } from './verifyUserCertificate'
 import { verifySignature } from './verification'
@@ -36,7 +37,7 @@ import {
 
 export { createRootCA }
 export type { RootCA }
-export { extractPubKey, parseCertificate, keyFromCertificate, keyObjectFromString, extractPubKeyString }
+export { extractPubKey, parseCertificate, keyFromCertificate, keyObjectFromString, extractPubKeyString, pubKeyFromCsr }
 export { verifyUserCert }
 export { verifySignature }
 export { sign }

packages/state-manager/src/sagas/messages/sendMessage/sendMessage.saga.test.ts

@@ -1,4 +1,4 @@
-import { setupCrypto, keyFromCertificate, loadPrivateKey, parseCertificate, sign } from '@quiet/identity'
+import { setupCrypto, keyFromCertificate, loadPrivateKey, parseCertificate, sign, pubKeyFromCsr } from '@quiet/identity'
 import { type Store } from '../../store.types'
 import { getFactory } from '../../..'
 import { prepareStore, reducers } from '../../../utils/tests/prepareStore'
@@ -74,8 +74,7 @@ describe('sendMessageSaga', () => {
       .withReducer(reducer)
       .withState(store.getState())
       .provide([
-        [call.fn(parseCertificate), 'certificate'],
-        [call.fn(keyFromCertificate), 'publicKey'],
+        [call.fn(pubKeyFromCsr), 'publicKey'],
         [call.fn(loadPrivateKey), 'privateKey'],
         [call.fn(sign), jest.fn() as unknown as ArrayBuffer],
         [call.fn(arrayBufferToString), 'signature'],
@@ -113,8 +112,7 @@ describe('sendMessageSaga', () => {
       .withReducer(reducer)
       .withState(store.getState())
       .provide([
-        [call.fn(parseCertificate), 'certificate'],
-        [call.fn(keyFromCertificate), 'publicKey'],
+        [call.fn(pubKeyFromCsr), 'publicKey'],
         [call.fn(loadPrivateKey), 'privateKey'],
         [call.fn(sign), jest.fn() as unknown as ArrayBuffer],
         [call.fn(arrayBufferToString), 'signature'],
@@ -165,8 +163,7 @@ describe('sendMessageSaga', () => {
       .withReducer(reducer)
       .withState(store.getState())
       .provide([
-        [call.fn(parseCertificate), 'certificate'],
-        [call.fn(keyFromCertificate), 'publicKey'],
+        [call.fn(pubKeyFromCsr), 'publicKey'],
         [call.fn(loadPrivateKey), 'privateKey'],
         [call.fn(sign), jest.fn() as unknown as ArrayBuffer],
         [call.fn(arrayBufferToString), 'signature'],

packages/state-manager/src/sagas/messages/sendMessage/sendMessage.saga.ts

@@ -1,6 +1,6 @@
 import { type Socket, applyEmitParams } from '../../../types'
 import { type PayloadAction } from '@reduxjs/toolkit'
-import { keyFromCertificate, parseCertificate, sign, loadPrivateKey } from '@quiet/identity'
+import { sign, loadPrivateKey, pubKeyFromCsr } from '@quiet/identity'
 import { call, select, apply, put } from 'typed-redux-saga'
 import { arrayBufferToString } from 'pvutils'
 import { config } from '../../users/const/certFieldTypes'
@@ -15,12 +15,9 @@ export function* sendMessageSaga(
   action: PayloadAction<ReturnType<typeof messagesActions.sendMessage>['payload']>
 ): Generator {
   const identity = yield* select(identitySelectors.currentIdentity)
-  if (!identity?.userCsr || !identity.userCertificate) return
+  if (!identity?.userCsr) return
 
-  const certificate = identity.userCertificate
-
-  const parsedCertificate = yield* call(parseCertificate, certificate)
-  const pubKey = yield* call(keyFromCertificate, parsedCertificate)
+  const pubKey = yield* call(pubKeyFromCsr, identity.userCsr.userCsr)
   const keyObject = yield* call(loadPrivateKey, identity.userCsr.userKey, config.signAlg)
   const signatureArrayBuffer = yield* call(sign, action.payload.message, keyObject)
   const signature = yield* call(arrayBufferToString, signatureArrayBuffer)