@salesforcedevs/dx-components 1.2.2-avatar-button-4 → 1.2.2-avatar-button-5

package/package.json

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

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

@@ -105,17 +105,6 @@ export default class AvatarButton extends LightningElement {
 
         window.addEventListener("tbid-login", this.handleSsoLogin);
         window.addEventListener("tbid-logout", this.handleSsoLogout);
-    }
-
-    disconnectedCallback() {
-        window.removeEventListener("tbid-login", this.handleSsoLogin);
-        window.removeEventListener("tbid-logout", this.handleSsoLogout);
-    }
-
-    renderedCallback() {
-        if (this._hasRendered) {
-            return;
-        }
 
         const isWidgetDisabled = window.SFIDWidget?.disabled;
         const isWidgetLoggedIn = window.SFIDWidget?.openid_response;
@@ -133,21 +122,24 @@ export default class AvatarButton extends LightningElement {
             setTimeout(() => {
                 if (!window.SFIDWidget?.openid_response) {
                     // this.trackLogin(); TODO: track only clicks
-                    this.platformEventsSubscribe();
                     this.requestUserInfo();
                 }
             }, 1000);
         } else {
             if (this.isLoading) {
                 // This was a login.
-                console.log("Subscribing to platform events!");
-                this.platformEventsSubscribe();
                 // this.trackLogin(); TODO: track only clicks
             }
             this.requestUserInfo();
         }
     }
 
+    disconnectedCallback() {
+        window.removeEventListener("tbid-login", this.handleSsoLogin);
+        window.removeEventListener("tbid-logout", this.handleSsoLogout);
+        this.teardownEventSource();
+    }
+
     private handleUserDataChange = ({ data }: EventSourceEvent) => {
         let parsedEventData: any;
 
@@ -206,7 +198,6 @@ export default class AvatarButton extends LightningElement {
     };
 
     private platformEventsSubscribe = () => {
-        console.log("platform events subscribe");
         this.teardownEventSource();
         this.setupEventSource();
     };
@@ -348,6 +339,9 @@ export default class AvatarButton extends LightningElement {
             const userInfoRes = await fetch(TBID_API_USERINFO_URL);
 
             if (userInfoRes.ok) {
+                if (!this.eventSource) {
+                    this.setupEventSource();
+                }
                 const userInfo = await userInfoRes.json();
                 this.updateAvatarWithUserInfo(userInfo);
                 this._didReceiveUserInfo = true;