@salesforcedevs/dx-components 1.2.7-avatar-button-2 → 1.2.7-avatar-button-4

package/package.json

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

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

@@ -227,39 +227,40 @@ 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 (!token) {
+            return;
+        }
 
-            // 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 {
-                const tokenResponse = await fetch(TBID_API_TOKEN_URL, {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json"
-                    },
-                    body: JSON.stringify({
-                        token
-                    })
-                });
-                if (tokenResponse.ok) {
-                    this.platformEventsSubscribe();
-                    this.trackLoginSuccess();
+        // 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 {
+            const tokenResponse = await fetch(TBID_API_TOKEN_URL, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({
+                    token
+                })
+            });
+
+            if (tokenResponse.ok) {
+                this.platformEventsSubscribe();
+                this.trackLoginSuccess();
+
+                if (!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();
                 }
-            } catch (ex) {
-                console.error(`Attempt to update token failed: ${ex}`);
             }
+        } catch (ex) {
+            console.error(`Attempt to update token failed: ${ex}`);
         }
-
-        if (userInfo) {
-            this.updateAvatarWithUserInfo(userInfo);
-            this._didReceiveUserInfo = true;
-        }
-
-        this.isLoading = false;
     };
 
     private handleComponentLogin = (event: MouseEvent) => {