From de5943a5fbfa8249fdb4ff68e32dab014d24f8c9 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Thu, 25 Mar 2021 14:05:55 -0500
Subject: [PATCH] Fix bug where we'd remove profileKeyCredentials incorrectly

---
 ts/models/conversations.ts | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 796bf70de7..3233f6677b 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -3,6 +3,7 @@
 
 /* eslint-disable class-methods-use-this */
 /* eslint-disable camelcase */
+import { ProfileKeyCredentialRequestContext } from 'zkgroup';
 import {
   MessageModelCollectionType,
   WhatIsThis,
@@ -4363,8 +4364,10 @@ export class ConversationModel extends window.Backbone.Model<
       const profileKeyVersionHex = c.get('profileKeyVersion')!;
       const existingProfileKeyCredential = c.get('profileKeyCredential');
 
-      let profileKeyCredentialRequestHex;
-      let profileCredentialRequestContext;
+      let profileKeyCredentialRequestHex: undefined | string;
+      let profileCredentialRequestContext:
+        | undefined
+        | ProfileKeyCredentialRequestContext;
 
       if (
         profileKey &&
@@ -4512,15 +4515,17 @@ export class ConversationModel extends window.Backbone.Model<
         c.unset('capabilities');
       }
 
-      if (profileCredentialRequestContext && profile.credential) {
-        const profileKeyCredential = handleProfileKeyCredential(
-          clientZkProfileCipher,
-          profileCredentialRequestContext,
-          profile.credential
-        );
-        c.set({ profileKeyCredential });
-      } else {
-        c.unset('profileKeyCredential');
+      if (profileCredentialRequestContext) {
+        if (profile.credential) {
+          const profileKeyCredential = handleProfileKeyCredential(
+            clientZkProfileCipher,
+            profileCredentialRequestContext,
+            profile.credential
+          );
+          c.set({ profileKeyCredential });
+        } else {
+          c.unset('profileKeyCredential');
+        }
       }
     } catch (error) {
       switch (error?.code) {