From d946678d59c83e902b141a02077fd52918fda777 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 18 Jun 2020 14:20:40 +1000
Subject: [PATCH] fix encryption type for rawMessage

---
 ts/session/utils/Messages.ts                |  8 ++-
 ts/test/session/messages/RawMessage_test.ts | 59 +++++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 ts/test/session/messages/RawMessage_test.ts

diff --git a/ts/session/utils/Messages.ts b/ts/session/utils/Messages.ts
index 04ae0f815..07b7ff0b9 100644
--- a/ts/session/utils/Messages.ts
+++ b/ts/session/utils/Messages.ts
@@ -1,5 +1,5 @@
 import { RawMessage } from '../types/RawMessage';
-import { ContentMessage } from '../messages/outgoing';
+import { ContentMessage, SessionRequestMessage } from '../messages/outgoing';
 import { EncryptionType, PubKey } from '../types';
 
 export function toRawMessage(
@@ -9,6 +9,10 @@ export function toRawMessage(
   const ttl = message.ttl();
   const timestamp = message.timestamp;
   const plainTextBuffer = message.plainTextBuffer();
+  const encryption =
+    message instanceof SessionRequestMessage
+      ? EncryptionType.SessionRequest
+      : EncryptionType.Signal;
 
   // tslint:disable-next-line: no-unnecessary-local-variable
   const rawMessage: RawMessage = {
@@ -17,7 +21,7 @@ export function toRawMessage(
     timestamp,
     device: device.key,
     ttl,
-    encryption: EncryptionType.Signal,
+    encryption,
   };
 
   return rawMessage;
diff --git a/ts/test/session/messages/RawMessage_test.ts b/ts/test/session/messages/RawMessage_test.ts
new file mode 100644
index 000000000..0c772c935
--- /dev/null
+++ b/ts/test/session/messages/RawMessage_test.ts
@@ -0,0 +1,59 @@
+import { expect } from 'chai';
+import { beforeEach } from 'mocha';
+
+import {
+  DeviceUnlinkMessage,
+  SessionRequestMessage,
+} from '../../../session/messages/outgoing';
+import { SignalService } from '../../../protobuf';
+import { toRawMessage } from '../../../session/utils/Messages';
+import { EncryptionType, PubKey, RawMessage } from '../../../session/types';
+import { TestUtils } from '../../test-utils';
+import { TextEncoder } from 'util';
+
+describe('toRawMessage', () => {
+  let message: DeviceUnlinkMessage;
+  const pubkey: PubKey = TestUtils.generateFakePubkey();
+  let raw: RawMessage;
+
+  beforeEach(() => {
+    const timestamp = Date.now();
+    message = new DeviceUnlinkMessage({ timestamp });
+    raw = toRawMessage(pubkey, message);
+  });
+
+  it('copied fields are set', () => {
+    expect(raw).to.have.property('ttl', message.ttl());
+    expect(raw)
+      .to.have.property('plainTextBuffer')
+      .to.be.deep.equal(message.plainTextBuffer());
+    expect(raw).to.have.property('timestamp', message.timestamp);
+    expect(raw).to.have.property('identifier', message.identifier);
+    expect(raw).to.have.property('device', pubkey.key);
+  });
+
+  it('encryption is set to SESSION_REQUEST if message is of instance SessionRequestMessage', () => {
+    const preKeyBundle = {
+      deviceId: 123456,
+      preKeyId: 654321,
+      signedKeyId: 111111,
+      preKey: new TextEncoder().encode('preKey'),
+      signature: new TextEncoder().encode('signature'),
+      signedKey: new TextEncoder().encode('signedKey'),
+      identityKey: new TextEncoder().encode('identityKey'),
+    };
+    const sessionRequest = new SessionRequestMessage({
+      timestamp: Date.now(),
+      preKeyBundle,
+    });
+    const sessionRequestRaw = toRawMessage(pubkey, sessionRequest);
+    expect(sessionRequestRaw).to.have.property(
+      'encryption',
+      EncryptionType.SessionRequest
+    );
+  });
+
+  it('encryption is set to Signal if message is not of instance SessionRequestMessage', () => {
+    expect(raw).to.have.property('encryption', EncryptionType.Signal);
+  });
+});