@salesforcedevs/dx-components 1.2.6-avatar-button-1 → 1.2.6-avatar-button-3

package/package.json

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

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

@@ -4,13 +4,17 @@ import { track } from "dxUtils/analytics";
 import defaults from "lodash.defaults";
 import escapeHtml from "escape-html";
 
-// TODO: move to environment variable
+// TBID Page URLs:
+// TODO: Switch this to env variable once we're out of dev
 const TBID_BASE_URL = "https://dev1-trailblazer-identity.cs192.force.com";
 const TBID_SETTINGS_URL = `${TBID_BASE_URL}/settings`;
 const TBID_PROFILE_URL = `${TBID_BASE_URL}/id`;
 const TBID_IFRAME_URL = `${TBID_BASE_URL}/secur/logout.jsp`;
-// TODO: move to environment variable
-const TBID_API_BASE_URL = "https://development.developer.salesforce.com/tbid";
+
+// API URLs:
+const TBID_API_BASE_URL = `${
+    process.env.BASE_URL || "https://developer.salesforce.com"
+}/tbid`;
 const TBID_API_LOGOUT_URL = `${TBID_API_BASE_URL}/logout`;
 const TBID_API_USERINFO_URL = `${TBID_API_BASE_URL}/userinfo`;
 const TBID_API_LOGIN_URL = `${TBID_API_BASE_URL}/dologin`;
@@ -196,11 +200,11 @@ export default class AvatarButton extends LightningElement {
             window.SFIDWidget.logout();
         } else {
             // Always clear the session token; if not SSO logout, this will also revoke the token with
-            // TBID; if SSO logout, that step is already taken care of
+            // TBID; if SSO logout, that step is already taken care of. No need to await this.
             fetch(`${TBID_API_LOGOUT_URL}?isSsoLogout=${isSsoLogout}`, {
-                method: 'DELETE',
-                credentials: 'same-origin'
-            }); // no need to await this
+                method: "DELETE",
+                credentials: "same-origin"
+            });
 
             if (!isSsoLogout) {
                 // Dropping an iframe is required to fully get TBID to destroy the session; this is
@@ -330,12 +334,12 @@ export default class AvatarButton extends LightningElement {
                 userInfo.custom_attributes.RelationshipToSalesforce;
             nextUserInfo.role = userInfo.custom_attributes.Role;
         }
-        // TODO: Consider displaying initials if no photo. Is there always a photo even if just a default one?
 
+        // A little extra safety here just to make sure we aren't receiving/displaying any unsafe values...
         const htmlSafeNextUserInfo: UserInfo = Object.fromEntries(
             Object.entries(nextUserInfo).map(([key, val]) => [
                 key,
-                escapeHtml(encodeURIComponent(val))
+                escapeHtml(val)
             ])
         );
 
@@ -357,7 +361,7 @@ export default class AvatarButton extends LightningElement {
                 this._didReceiveUserInfo = true;
             }
         } catch (ex) {
-            // TODO: Something not directly related to auth went wrong. Unsure what to do here.
+            // Something not directly related to auth went wrong. Unsure what to do here.
             console.error(`Could not request user info: ${ex}`);
         }