@salesforcedevs/dx-components 1.2.7-avatar-button-3 → 1.2.7-avatar-button-5

package/package.json

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

package/src/modules/dx/avatarButton/avatarButton.html

@@ -97,7 +97,7 @@
                         <span class="login-section-title">Products</span>
                         <ul>
                             <li class="login-list-item">
-                                <a href="#" class="login-link" target="_blank">
+                                <a href="https://www.salesforce.com" class="login-link" target="_blank">
                                     <span class="login-link-label">
                                         Salesforce
                                     </span>
@@ -114,7 +114,7 @@
                                 </a>
                             </li>
                             <li class="login-list-item">
-                                <a href="#" class="login-link" target="_blank">
+                                <a href={marketingCloudUrl} class="login-link" target="_blank">
                                     <span class="login-link-label">
                                         Marketing Cloud
                                     </span>
@@ -145,7 +145,7 @@
                                 </div>
                             </li>
                             <li class="login-list-item">
-                                <a href="#" class="login-link" target="_blank">
+                                <a href="https://developer.salesforce.com/forums" class="login-link" target="_blank">
                                     <span class="login-link-label">
                                         Developer Forums
                                     </span>

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

@@ -20,6 +20,8 @@ const TBID_API_LOGIN_URL = `${TBID_API_BASE_URL}/dologin`;
 const TBID_API_TOKEN_URL = `${TBID_API_BASE_URL}/token`;
 const TBID_API_PLATFORM_EVENTS_URL = `${TBID_API_BASE_URL}/platform-events`;
 
+const DSC_BASE_URL = process.env.BASE_URL || "https://developer.salesforce.com";
+
 declare global {
     interface Window {
         SFIDWidget?: {
@@ -73,9 +75,12 @@ export default class AvatarButton extends LightningElement {
     private settingsUrl = TBID_SETTINGS_URL;
     private profileUrl = TBID_PROFILE_URL;
     private eventSource?: EventSource;
-    private _hasRendered = false;
     private _didReceiveUserInfo = false;
 
+    private get marketingCloudUrl() {
+        return `${DSC_BASE_URL}/developer-centers/marketing-cloud`;
+    }
+
     private get loginUrl() {
         return `${TBID_API_LOGIN_URL}?startUrl=${encodeURIComponent(
             window.location.href
@@ -108,9 +113,12 @@ export default class AvatarButton extends LightningElement {
         // user info immediately. The check prevents duplicate requests.
         if (
             this.isLoading &&
-            (!window.SFIDWidget || (!isWidgetDisabled && !isWidgetLoggedIn)) &&
+            !isWidgetDisabled &&
+            !isWidgetLoggedIn &&
             document.querySelector('script[src*="authProviderEmbeddedLogin"]')
         ) {
+            // Try to give SFIDWidget time to update any tokens it may have access to before
+            // completing initiation. It has 1 second maximum.
             setTimeout(() => {
                 if (!window.SFIDWidget?.openid_response) {
                     // SFIDWidget not responding in time; handle login ourselves.
@@ -119,6 +127,7 @@ export default class AvatarButton extends LightningElement {
                 }
             }, 1000);
         } else {
+            // No SFIDWidget, proceed to normal initiation.
             if (this.isLoading) {
                 // This is a successful login; track it.
                 this.trackLoginSuccess();
@@ -227,41 +236,37 @@ export default class AvatarButton extends LightningElement {
     private handleSsoLogin = async (event: Event) => {
         const { userInfo } = (event as CustomEvent).detail;
         const token = userInfo?.access_token;
-        const isAlreadyLoading = this.isLoading;
 
         // `token` should always be defined if an SSO login occurs, but we check for extra safety
-        if (token) {
-            this.isLoading = true;
-
-            // If an SSO login occurred and we have an SSO access token, we want to start using
-            // it rather than some other non-linked access token, for the "seamless SSO"
-            // experience
-            try {
-                const tokenResponse = await fetch(TBID_API_TOKEN_URL, {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json"
-                    },
-                    body: JSON.stringify({
-                        token
-                    })
-                });
-                if (tokenResponse.ok) {
-                    this.platformEventsSubscribe();
-                    this.trackLoginSuccess();
-                }
-            } catch (ex) {
-                console.error(`Attempt to update token failed: ${ex}`);
-            }
+        if (!token) {
+            return;
         }
 
-        if (userInfo && !isAlreadyLoading) {
-            // TODO: This sucks and we will have to raise an issue with the TBID team, but for some reason the
-            // SSO login userInfo payload is missing photos for the user, so we have to re-request it on login.
-            this.requestUserInfo();
-        }
+        // If an SSO login occurred and we have an SSO access token, we want to start using
+        // it rather than some other non-linked access token, for the "seamless SSO"
+        // experience
+        try {
+            const tokenResponse = await fetch(TBID_API_TOKEN_URL, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({
+                    token
+                })
+            });
 
-        this.isLoading = false;
+            if (tokenResponse.ok) {
+                this.platformEventsSubscribe();
+                this.trackLoginSuccess();
+                // TODO: This sucks and we will have to raise an issue with the TBID team, but for some reason the
+                // SSO login userInfo payload is missing photos for the user, so we have to re-request it on login.
+                // We only want to do this if we aren't already requesting it, of course.
+                this.requestUserInfo();
+            }
+        } catch (ex) {
+            console.error(`Attempt to update token failed: ${ex}`);
+        }
     };
 
     private handleComponentLogin = (event: MouseEvent) => {