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

package/package.json

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

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

@@ -73,8 +73,9 @@ export default class AvatarButton extends LightningElement {
     private isLoading = false;
     private settingsUrl = TBID_SETTINGS_URL;
     private profileUrl = TBID_PROFILE_URL;
-    private _didReceiveUserInfo = false;
     private eventSource?: EventSource;
+    private _hasRendered = false;
+    private _didReceiveUserInfo = false;
 
     private get loginUrl() {
         return `${TBID_API_LOGIN_URL}?startURL=${encodeURIComponent(
@@ -90,14 +91,31 @@ export default class AvatarButton extends LightningElement {
         const searchParams = new URLSearchParams(window.location.search);
 
         if (searchParams.get("loginSuccess") === "true") {
-            // clear the query param
             this.isLoading = true;
+            // clear the query param
             searchParams.delete("loginSuccess");
-            window.location.search = searchParams.toString();
+            window.history.replaceState(
+                null,
+                "",
+                `${window.location.pathname}${
+                    window.location.hash
+                }${searchParams.toString()}`
+            );
         }
 
         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;
@@ -118,28 +136,18 @@ export default class AvatarButton extends LightningElement {
                     this.platformEventsSubscribe();
                     this.requestUserInfo();
                 }
-            }, 3000);
+            }, 1000);
         } else {
             if (this.isLoading) {
-                console.log('Subscribing to platform events!');
                 // This was a login.
-                setTimeout(() => this.platformEventsSubscribe(), 3000);
+                console.log("Subscribing to platform events!");
+                this.platformEventsSubscribe();
                 // this.trackLogin(); TODO: track only clicks
             }
             this.requestUserInfo();
         }
     }
 
-    renderedCallback() {
-        // TESTING
-        this.template.querySelector('img.avatar')?.addEventListener('click', this.platformEventsSubscribe);
-    }
-
-    disconnectedCallback() {
-        window.removeEventListener("tbid-login", this.handleSsoLogin);
-        window.removeEventListener("tbid-logout", this.handleSsoLogout);
-    }
-
     private handleUserDataChange = ({ data }: EventSourceEvent) => {
         let parsedEventData: any;
 
@@ -198,7 +206,7 @@ export default class AvatarButton extends LightningElement {
     };
 
     private platformEventsSubscribe = () => {
-        console.log('platform events subscribe');
+        console.log("platform events subscribe");
         this.teardownEventSource();
         this.setupEventSource();
     };