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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.2.2-avatar-button-4",
+    "version": "1.2.2-avatar-button-6",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -17,6 +17,7 @@
         "classnames": "^2.2.6",
         "coveo-search-ui": "^2.10082.5",
         "debounce": "^1.2.0",
+        "js-cookie": "^3.0.1",
         "lodash.get": "^4.4.2",
         "lodash.kebabcase": "^4.1.1",
         "microtip": "0.2.2",
@@ -25,6 +26,7 @@
     "devDependencies": {
         "@types/classnames": "^2.2.10",
         "@types/debounce": "^1.2.0",
+        "@types/js-cookie": "^3.0.2",
         "@types/lodash.get": "^4.4.6",
         "@types/lodash.kebabcase": "^4.1.7",
         "@types/vimeo__player": "^2.16.2"

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

@@ -1,4 +1,5 @@
 import { api, LightningElement } from "lwc";
+import Cookies from 'js-cookie';
 import { track } from "dxUtils/analytics";
 
 // TODO: move to environment variable
@@ -88,34 +89,15 @@ export default class AvatarButton extends LightningElement {
     }
 
     connectedCallback() {
-        const searchParams = new URLSearchParams(window.location.search);
+        const isLoginSuccessRedirect = Cookies.get('tbidLoginSuccess') === 'true';
 
-        if (searchParams.get("loginSuccess") === "true") {
+        if (isLoginSuccessRedirect) {
             this.isLoading = true;
-            // clear the query param
-            searchParams.delete("loginSuccess");
-            window.history.replaceState(
-                null,
-                "",
-                `${window.location.pathname}${
-                    window.location.hash
-                }${searchParams.toString()}`
-            );
+            Cookies.remove('tbidLoginSuccess'); // cleanup
         }
 
         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 +115,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;
 
@@ -199,14 +184,11 @@ export default class AvatarButton extends LightningElement {
             PlatformEventsType.UserMerge,
             this.handleSsoLogout
         );
-        if (this.eventSource.readyState !== 2 /* CLOSED */) {
-            this.eventSource.close();
-        }
+        this.eventSource.close();
         this.eventSource = undefined;
     };
 
     private platformEventsSubscribe = () => {
-        console.log("platform events subscribe");
         this.teardownEventSource();
         this.setupEventSource();
     };
@@ -348,6 +330,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;