@salesforcedevs/dx-components 1.2.6-avatar-button-3 → 1.2.6-avatar-button-5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.2.6-avatar-button-3",
+    "version": "1.2.6-avatar-button-5",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {

package/src/modules/dx/avatarButton/avatarButton.ts

@@ -12,9 +12,8 @@ const TBID_PROFILE_URL = `${TBID_BASE_URL}/id`;
 const TBID_IFRAME_URL = `${TBID_BASE_URL}/secur/logout.jsp`;
 
 // API URLs:
-const TBID_API_BASE_URL = `${
-    process.env.BASE_URL || "https://developer.salesforce.com"
-}/tbid`;
+// TODO: Switch this to env variable once we're out of dev
+const TBID_API_BASE_URL = "https://development.developer.salesforce.com/tbid";
 const TBID_API_LOGOUT_URL = `${TBID_API_BASE_URL}/logout`;
 const TBID_API_USERINFO_URL = `${TBID_API_BASE_URL}/userinfo`;
 const TBID_API_LOGIN_URL = `${TBID_API_BASE_URL}/dologin`;
@@ -312,38 +311,44 @@ export default class AvatarButton extends LightningElement {
             return;
         }
 
-        const nextUserInfo: UserInfo = {};
-        nextUserInfo.avatarImgSrc = userInfo.photos?.thumbnail;
-        nextUserInfo.firstName = userInfo.given_name;
-        nextUserInfo.lastName = userInfo.family_name;
-        nextUserInfo.username = userInfo.preferred_username;
-        nextUserInfo.id = userInfo.user_id;
-        nextUserInfo.orgId = userInfo.organization_id;
-        nextUserInfo.fullName =
-            nextUserInfo.firstName && nextUserInfo.lastName
-                ? `${nextUserInfo.firstName} ${nextUserInfo.lastName}`
-                : nextUserInfo.firstName || nextUserInfo.lastName || "";
+        const uncleanNextUserInfo: UserInfo = {};
+        uncleanNextUserInfo.avatarImgSrc = userInfo.photos?.thumbnail;
+        uncleanNextUserInfo.firstName = userInfo.given_name;
+        uncleanNextUserInfo.lastName = userInfo.family_name;
+        uncleanNextUserInfo.username = userInfo.preferred_username;
+        uncleanNextUserInfo.id = userInfo.user_id;
+        uncleanNextUserInfo.orgId = userInfo.organization_id;
+        uncleanNextUserInfo.fullName =
+            uncleanNextUserInfo.firstName && uncleanNextUserInfo.lastName
+                ? `${uncleanNextUserInfo.firstName} ${uncleanNextUserInfo.lastName}`
+                : uncleanNextUserInfo.firstName ||
+                  uncleanNextUserInfo.lastName ||
+                  "";
 
         if (userInfo.custom_attributes) {
             // ProfilePictureUrl updates earlier than photos.thumbnail, so we prefer it if it's available here.
-            nextUserInfo.avatarImgSrc =
+            uncleanNextUserInfo.avatarImgSrc =
                 userInfo.custom_attributes.ProfilePictureUrl ||
-                nextUserInfo.avatarImgSrc;
-            nextUserInfo.company = userInfo.custom_attributes.CompanyName;
-            nextUserInfo.relationship =
+                uncleanNextUserInfo.avatarImgSrc;
+            uncleanNextUserInfo.company =
+                userInfo.custom_attributes.CompanyName;
+            uncleanNextUserInfo.relationship =
                 userInfo.custom_attributes.RelationshipToSalesforce;
-            nextUserInfo.role = userInfo.custom_attributes.Role;
+            uncleanNextUserInfo.role = userInfo.custom_attributes.Role;
         }
 
-        // A little extra safety here just to make sure we aren't receiving/displaying any unsafe values...
-        const htmlSafeNextUserInfo: UserInfo = Object.fromEntries(
-            Object.entries(nextUserInfo).map(([key, val]) => [
-                key,
-                escapeHtml(val)
-            ])
-        );
+        const cleanUserInfo: UserInfo = {};
+        Object.entries(uncleanNextUserInfo).forEach(([key, val]) => {
+            if (val === "undefined") {
+                // Clean away bad JSON string data by skipping these.
+                return;
+            }
+            // Also just a little extra safety to make sure we aren't injecting anything unsafe...
+            cleanUserInfo[key as keyof UserInfo] = escapeHtml(val);
+        });
 
-        this.userInfo = defaults(htmlSafeNextUserInfo, this.userInfo);
+        // Keep the old info for any values not defined on `cleanUserInfo`
+        this.userInfo = defaults(cleanUserInfo, this.userInfo);
     };
 
     private requestUserInfo = async () => {