From 44cf5034cfc63da2cced695d5d47fef9ebcc4e01 Mon Sep 17 00:00:00 2001
From: Shane Gannon <gannons@cisco.com>
Date: Thu, 18 Apr 2019 11:41:56 +0100
Subject: [PATCH] feat(ediscovery): replace sslr.scr with scr.loc

---
 .../@webex/internal-plugin-ediscovery/src/index.js          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@webex/internal-plugin-ediscovery/src/index.js b/packages/node_modules/@webex/internal-plugin-ediscovery/src/index.js
index 3d178c06e20..3040c51cbec 100644
--- a/packages/node_modules/@webex/internal-plugin-ediscovery/src/index.js
+++ b/packages/node_modules/@webex/internal-plugin-ediscovery/src/index.js
@@ -297,7 +297,9 @@ registerInternalPlugin('ediscovery', EDiscovery, {
               for (let i = 0; i < shares.length; i += 1) {
                 const share = shares[i];
                 // Decrypt the share's display name
-                if (share.displayName && share.displayName !== 'NoName') { // files/whiteboards are given this displayname by the ED service in error situations, if unchecked it causes a parsing error
+                // Ignore display names for whiteboards which are unencrypted
+                // Ignore the unencrypted 'NoName' display name the ED service sets in error situations
+                if (share.displayName && (!activity.whiteboards || !activity.whiteboards.includes(share)) && share.displayName !== 'NoName') {
                   promises.push(
                     ctx.spark.internal.encryption.decryptText(activity.encryptionKeyUrl, share.displayName, {onBehalfOf: spaceParticipantId})
                       .then((decryptedDisplayName) => {
@@ -350,7 +352,7 @@ registerInternalPlugin('ediscovery', EDiscovery, {
                           share.scr = decryptedReference;
                         }
                         else {
-                          share.sslr = decryptedReference;
+                          share.sslr = decryptedReference.loc;
                         }
                       })
                       .catch((reason) => {