@salesforcedevs/dx-components 0.59.0-avatar-button-12 → 0.59.0-avatar-button-13

package/package.json

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

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

@@ -94,15 +94,15 @@ export default class AvatarButton extends LightningElement {
     }
 
     // This handles logout from within this component, rather than from SSO via the SFIDWidget.
-    private handleLogout = async (isSsoLogout: boolean) => {
+    private handleLogout = (isSsoLogout: boolean) => {
         this._didReceiveUserInfo = false;
         this.isLoading = false;
         this.updateAvatarWithUserInfo({}); // clear old info
 
-        if (!isSsoLogout && window.SFIDWidget) {
-            // If the SFIDWidget is around and logout was not *already* triggered by SSO logout,
-            // defer to the SFIDWidget. This will ensure that the SSO session is logged out as
-            // well.
+        if (!isSsoLogout && window.SFIDWidget?.openid_response) {
+            // If the SFIDWidget is around and has an access token, and if logout was not *already*
+            // triggered by SSO logout, defer to the SFIDWidget. This will ensure that the SSO
+            // session is logged out as well.
             window.SFIDWidget.logout();
         } else {
             // Always clear the session token; if not SSO logout, this will also revoke the token with
@@ -118,7 +118,8 @@ export default class AvatarButton extends LightningElement {
 
     // This will only be called for "seamless SSO" login by the embedded login widget (SFIDWidget) on the website, if it exists.
     private handleSsoLogin = async (event: Event) => {
-        const token = (event as CustomEvent).detail.userInfo?.access_token;
+        const { userInfo } = (event as CustomEvent).detail;
+        const token = userInfo?.access_token;
 
         // `token` should always be defined if an SSO login occurs, but we check for extra safety
         if (token) {
@@ -136,16 +137,14 @@ export default class AvatarButton extends LightningElement {
                         token
                     })
                 });
-
-                // 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();
             } catch (ex) {
-                // If the request fails for some reason, fall back to whatever we've got
-                this.updateAvatarWithUserInfo(this.userInfo);
-                console.error(ex);
+                console.error(`Attempt to update token failed: ${ex}`);
             }
         }
+
+        if (userInfo) {
+            this.updateAvatarWithUserInfo(userInfo);
+        }
     };
 
     private handleComponentLogin = () => {
@@ -183,7 +182,7 @@ export default class AvatarButton extends LightningElement {
             }
         } catch (ex) {
             // TODO: Something not directly related to auth went wrong. Unsure what to do here.
-            console.error("Invalid response received from TBID API, aborting.");
+            console.error(`Could not request user info: ${ex}`);
         }
 
         this.isLoading = false;