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

package/package.json

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

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

@@ -14,6 +14,8 @@ declare global {
         SFIDWidget?: {
             logout(): void;
             login(): void;
+            openid_response: any;
+            disabled: boolean;
         };
     }
 }
@@ -53,13 +55,37 @@ export default class AvatarButton extends LightningElement {
     }
 
     connectedCallback() {
+        if (
+            new URLSearchParams(window.location.search).get("loginSuccess") ===
+            "true"
+        ) {
+            this.isLoading = true;
+        }
+
         window.addEventListener("tbid-login", this.handleSsoLogin);
         window.addEventListener("tbid-logout", this.handleSsoLogout);
 
-        // Whenever this component is added to the DOM, immediately request user info; if the user is logged in
-        // and we receive the info, this component will display the avatar UI; otherwise, it will display the login
-        // button.
-        this.requestUserInfo();
+        const isWidgetDisabled = window.SFIDWidget?.disabled;
+        const isWidgetLoggedIn = window.SFIDWidget?.openid_response;
+
+        // If the component loads and (1) we are logging in and (2) the embedded login widget script
+        // is in the DOM but (3) the widget has either not loaded or not completed login yet, we
+        // defer the userInfo request in order to allow the SFIDWidget the time to trigger it (via
+        // it's own login handler) after SSO login. If any of (1) - (3) are false, then we request
+        // user info immediately. The check prevents duplicate requests.
+        if (
+            this.isLoading &&
+            (!window.SFIDWidget || (!isWidgetDisabled && !isWidgetLoggedIn)) &&
+            document.querySelector('script[src*="authProviderEmbeddedLogin"]')
+        ) {
+            setTimeout(() => {
+                if (!window.SFIDWidget?.openid_response) {
+                    this.requestUserInfo();
+                }
+            }, 1000);
+        } else {
+            this.requestUserInfo();
+        }
     }
 
     disconnectedCallback() {
@@ -78,11 +104,11 @@ export default class AvatarButton extends LightningElement {
             // 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
+            // TBID; if SSO logout, that step is already taken care of
+            fetch(`${TBID_API_LOGOUT_URL}?isSsoLogout=${isSsoLogout}`); // no need to await this
         }
-
-        // Always clear the session token; if not SSO logout, this will also revoke the token with
-        // TBID; if SSO logout, that step is already taken care of
-        fetch(`${TBID_API_LOGOUT_URL}?isSsoLogout=${isSsoLogout}`); // no need to await this
     };
 
     // This will only be called for "seamless SSO" login by the embedded login widget (SFIDWidget) on the website, if it exists.
@@ -110,17 +136,16 @@ 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);
-                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 = () => {