@salesforcedevs/dx-components 1.2.7-avatar-button-1 → 1.2.7-avatar-button-3

package/package.json

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

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

@@ -227,15 +227,17 @@ export default class AvatarButton extends LightningElement {
     private handleSsoLogin = async (event: Event) => {
         const { userInfo } = (event as CustomEvent).detail;
         const token = userInfo?.access_token;
+        const isAlreadyLoading = this.isLoading;
 
         // `token` should always be defined if an SSO login occurs, but we check for extra safety
         if (token) {
             this.isLoading = true;
+
             // If an SSO login occurred and we have an SSO access token, we want to start using
             // it rather than some other non-linked access token, for the "seamless SSO"
             // experience
             try {
-                await fetch(TBID_API_TOKEN_URL, {
+                const tokenResponse = await fetch(TBID_API_TOKEN_URL, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json"
@@ -244,17 +246,19 @@ export default class AvatarButton extends LightningElement {
                         token
                     })
                 });
-                this.platformEventsSubscribe();
+                if (tokenResponse.ok) {
+                    this.platformEventsSubscribe();
+                    this.trackLoginSuccess();
+                }
             } catch (ex) {
                 console.error(`Attempt to update token failed: ${ex}`);
             }
-
-            this.trackLoginSuccess();
         }
 
-        if (userInfo) {
-            this.updateAvatarWithUserInfo(userInfo);
-            this._didReceiveUserInfo = true;
+        if (userInfo && !isAlreadyLoading) {
+            // TODO: This sucks and we will have to raise an issue with the TBID team, but for some reason the
+            // SSO login userInfo payload is missing photos for the user, so we have to re-request it on login.
+            this.requestUserInfo();
         }
 
         this.isLoading = false;
@@ -342,7 +346,17 @@ export default class AvatarButton extends LightningElement {
             // uncleanUserInfo may have undefined values which we don't want in the final product
             if (val && val !== "undefined") {
                 // Also a little extra safety to make sure we aren't injecting anything unsafe...
-                cleanUserInfo[key as keyof UserInfo] = escapeHtml(val);
+                let cleanVal = escapeHtml(val);
+
+                if (key === "username" && typeof val === "string") {
+                    // Design requests that we not show the @trailblazer.me part of the username
+                    const regExpMatch = val.match("(.*)@trailblazer.me$");
+                    if (regExpMatch && regExpMatch[1]) {
+                        cleanVal = regExpMatch[1];
+                    }
+                }
+
+                cleanUserInfo[key as keyof UserInfo] = cleanVal;
             }
         });