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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.2.2-avatar-button-5",
+    "version": "1.2.2-avatar-button-7",
     "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,19 +89,11 @@ 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);
@@ -191,9 +184,7 @@ 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;
     };
 
@@ -316,20 +307,26 @@ export default class AvatarButton extends LightningElement {
             return;
         }
 
-        this.userInfo.avatarImgSrc = userInfo.photos?.thumbnail;
-        this.userInfo.firstName = userInfo.given_name;
-        this.userInfo.lastName = userInfo.family_name;
-        this.userInfo.username = userInfo.preferred_username;
-        this.userInfo.id = userInfo.user_id;
-        this.userInfo.orgId = userInfo.organization_id;
+        const nextUserInfo: Omit<UserInfo, 'fullName'> = {};
+        nextUserInfo.avatarImgSrc = userInfo.photos?.thumbnail;
+        nextUserInfo.firstName = userInfo.given_name;
+        nextUserInfo.lastName = userInfo.family_name;
+        nextUserInfo.username = userInfo.preferred_username;
+        nextUserInfo.id = userInfo.user_id;
+        nextUserInfo.orgId = userInfo.organization_id;
 
         if (userInfo.custom_attributes) {
-            this.userInfo.company = userInfo.custom_attributes.CompanyName;
-            this.userInfo.relationship =
+            nextUserInfo.company = userInfo.custom_attributes.CompanyName;
+            nextUserInfo.relationship =
                 userInfo.custom_attributes.RelationshipToSalesforce;
-            this.userInfo.role = userInfo.custom_attributes.Role;
+            nextUserInfo.role = userInfo.custom_attributes.Role;
         }
         // TODO: Consider displaying initials if no photo. Is there always a photo even if just a default one?
+
+        this.userInfo = {
+            ...this.userInfo,
+            ...nextUserInfo,
+        };
     };
 
     private requestUserInfo = async () => {