@salesforcedevs/dx-components 0.59.0-avatar-button-6 → 0.59.0-avatar-button-9

package/package.json

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

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

@@ -91,23 +91,36 @@ export default class AvatarButton extends LightningElement {
     private handleComponentLogout = this.handleLogout.bind(this, false);
 
     // This will only be called for "seamless SSO" login by the embedded login widget (SFIDWidget) on the website, if it exists.
-    private handleSsoLogin = (event: Event) => {
-        const userInfo = (event as CustomEvent).detail;
-        if (userInfo) {
-            this.updateAvatarWithUserInfo(userInfo);
-            this._didReceiveUserInfo = true;
-            // userInfo.access_token should always exist if an SSO login occurs, but we just check
-            // for extra safety:
-            if (userInfo.access_token) {
-                // 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.
-                fetch(TBID_API_TOKEN_URL, {
+    private handleSsoLogin = async (event: Event) => {
+        const token = (event as CustomEvent).detail.userInfo?.access_token;
+
+        // `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, {
                     method: "POST",
-                    body: userInfo.access_token
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                    body: JSON.stringify({
+                        token
+                    })
                 });
+            } catch (ex) {
+                // If the request fails for some reason, fall back to whatever we've got
+                this.updateAvatarWithUserInfo(this.userInfo);
+                console.error(ex);
+                return;
             }
         }
+
+        // Unfortunately, the user info provided by the SFIDWidget on SSO login does not contain
+        // image URLs, so we also have to request it manually again
+        this.requestUserInfo();
     };
 
     private handleComponentLogin = () => {