@salesforcedevs/dx-components 1.2.2-avatar-button-8 → 1.2.2-avatar-button-10

package/package.json

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

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

@@ -1,5 +1,5 @@
 import { api, LightningElement } from "lwc";
-import Cookies from 'js-cookie';
+import Cookies from "js-cookie";
 import { track } from "dxUtils/analytics";
 import { defaults } from "lodash";
 
@@ -37,7 +37,7 @@ export interface UserInfo {
     relationship?: string;
     role?: string;
     username?: string;
-    readonly fullName: string;
+    fullName?: string;
 }
 
 interface EventSourceEvent extends Event {
@@ -64,14 +64,7 @@ const trackableUserInfo = new Set([
 export default class AvatarButton extends LightningElement {
     @api size: "small" | "medium" | "large" = "medium";
 
-    private userInfo: UserInfo = {
-        get fullName() {
-            if (this.firstName && this.lastName) {
-                return `${this.firstName} ${this.lastName}`;
-            }
-            return this.firstName || this.lastName || "";
-        }
-    };
+    private userInfo: UserInfo = {};
     private isLoading = false;
     private settingsUrl = TBID_SETTINGS_URL;
     private profileUrl = TBID_PROFILE_URL;
@@ -90,11 +83,12 @@ export default class AvatarButton extends LightningElement {
     }
 
     connectedCallback() {
-        const isLoginSuccessRedirect = Cookies.get('tbidLoginSuccess') === 'true';
+        const isLoginSuccessRedirect =
+            Cookies.get("tbidLoginSuccess") === "true";
 
         if (isLoginSuccessRedirect) {
             this.isLoading = true;
-            Cookies.remove('tbidLoginSuccess'); // cleanup
+            Cookies.remove("tbidLoginSuccess"); // cleanup
         }
 
         window.addEventListener("tbid-login", this.handleSsoLogin);
@@ -157,10 +151,6 @@ export default class AvatarButton extends LightningElement {
             // eslint-disable-next-line no-undef
             this.handleUserDataChange as EventListener
         );
-        this.eventSource.addEventListener(
-            PlatformEventsType.UserPhotoChange,
-            this.requestUserInfo
-        );
         this.eventSource.addEventListener(
             PlatformEventsType.UserMerge,
             this.handleSsoLogout
@@ -177,10 +167,6 @@ export default class AvatarButton extends LightningElement {
             // eslint-disable-next-line no-undef
             this.handleUserDataChange as EventListener
         );
-        this.eventSource.removeEventListener(
-            PlatformEventsType.UserPhotoChange,
-            this.requestUserInfo
-        );
         this.eventSource.removeEventListener(
             PlatformEventsType.UserMerge,
             this.handleSsoLogout
@@ -308,15 +294,23 @@ export default class AvatarButton extends LightningElement {
             return;
         }
 
-        const nextUserInfo: Omit<UserInfo, 'fullName'> = {};
+        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 || "";
 
         if (userInfo.custom_attributes) {
+            // ProfilePictureUrl updates earlier than photos.thumbnail, so we prefer it if it's available here.
+            nextUserInfo.avatarImgSrc =
+                userInfo.custom_attributes.ProfilePictureUrl ||
+                nextUserInfo.avatarImgSrc;
             nextUserInfo.company = userInfo.custom_attributes.CompanyName;
             nextUserInfo.relationship =
                 userInfo.custom_attributes.RelationshipToSalesforce;