@salesforcedevs/dx-components 1.3.54 → 1.3.56

package/LICENSE

@@ -0,0 +1,12 @@
+Copyright (c) 2020, Salesforce.com, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.3.54",
+    "version": "1.3.56",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -39,5 +39,6 @@
         "@types/vimeo__player": "^2.16.2",
         "eventsourcemock": "^2.0.0",
         "luxon": "^3.1.0"
-    }
+    },
+    "gitHead": "8270531b83c9d652a58a7e5cd8088c0ec554b649"
 }

package/src/modules/dx/cardBlogPost/cardBlogPost.html

@@ -10,6 +10,7 @@
         label={label}
         target={target}
         title={title}
+        content-type="blogs"
     >
         <dx-formatted-date-time
             if:true={_datetime}

package/src/modules/dx/cardContent/cardContent.ts

@@ -19,11 +19,15 @@ export default class CardContent extends LightningElement {
     @api target?: string | null = null;
     @api title!: string;
     @api hrefClick: any = null;
+    @api contentType: string | null = null;
     @api
     get authors() {
         if (this._authors && this._authors.length) {
             return this._authors!.map((author, index) => ({
-                ...author,
+                ...{
+                    ...author,
+                    href: author.href || this.getAuthorLink(author.name)
+                },
                 imgSrc: author.image_src,
                 key: index
             }));
@@ -87,4 +91,10 @@ export default class CardContent extends LightningElement {
             this.hrefClick(e);
         }
     }
+
+    private getAuthorLink(name: any): string {
+        return `/content-archive?authors=${name.split(" ").join("-").trim()}${
+            this.contentType ? `&content-type=${this.contentType}` : ``
+        }`;
+    }
 }

package/src/modules/dx/tbidAvatarButton/tbidAvatarButton.ts

@@ -41,6 +41,11 @@ const enum PlatformEventsType {
     UserMerge = "UserMerge"
 }
 
+// TODO: We probably should rewrite the logic of this component once the new identity stuff is released,
+// especially because SSO should work in all browsers at that point, and we won't need to do any weird
+// checking for the presence of SFIDWidget (and all the associated pain from trying to "time" the triggering of login
+// events due to logins coming via two distinct routes in Chrome).
+
 // This component handles the core Salesforce OAuth 2.0 flow used by TBID for login, rendering a
 // simple Login button or avatar icon depending on login status. It should be reusable in any case
 // where TBID login is needed.
@@ -56,6 +61,7 @@ export default class TbidAvatarButton extends LightningElement {
     private eventSource?: EventSource;
     private _isRequestingUserInfo = false;
     private _didReceiveUserInfo = false;
+    private _didDispatchLoginSuccess = false;
 
     // _didReceiveUserInfo is a proxy for "isLoggedIn" because we only want to show the UI corresponding
     // to logged-in state when user info has been received (avoids flashes of weird content)
@@ -155,8 +161,12 @@ export default class TbidAvatarButton extends LightningElement {
     // then this method waits a maximum of 1 second for the widget to finish logging in. If it does
     // *not* respond quickly, the method resolves early so that we can stop waiting pointlessly.
     private waitForSFIDWidget = async () => {
+        const millisecondsFor30fps = 33;
         const widgetNotAlivePromise = new Promise<boolean>((resolve) => {
-            const timeoutId = setTimeout(() => resolve(false), 100);
+            const timeoutId = setTimeout(
+                () => resolve(false),
+                5 * millisecondsFor30fps // give SFIDWidget roughly 5 chances to load
+            );
             window.SFIDWidget?.isAlive({
                 // If the widget responds as expected, this promise will fail to resolve and thus
                 // we will continue to wait on the other promise, below.
@@ -165,7 +175,7 @@ export default class TbidAvatarButton extends LightningElement {
         });
         const widgetLoggedInPromise = pollUntil(
             () => Boolean(window.SFIDWidget?.openid_response),
-            100,
+            millisecondsFor30fps,
             1000
         );
         const success = await Promise.race([
@@ -279,12 +289,13 @@ export default class TbidAvatarButton extends LightningElement {
                 // on SSO login. For some reason, the user info on SSO login lacks the user's photo URLs, so we
                 // have to re-request it. Maybe something to bring up with the TBID team.
                 await this.requestUserInfo();
-                this.dispatchLoginSuccess();
+                this.dispatchLoginSuccess(true);
             } else if (
                 tokenResponse.status === 409 &&
-                !this._didReceiveUserInfo
+                !this._didReceiveUserInfo &&
+                !this._isRequestingUserInfo // don't duplicate requests when we already have this token and a request is on-going
             ) {
-                // Valid token received, but we still need to grab userInfo. This could happen in certain edge cases
+                // Valid but duplicate token received, but we still need to grab userInfo. This could happen in certain edge cases
                 // involving "seamless SSO" (e.g., you might be sitting on our page in more than one tab, then log in
                 // on one of them; in that case, our back-end will receive the token from one tab, end up _rejecting_ it
                 // as a duplicate on other tabs where the login event occurs, and yet still need to request user info
@@ -384,11 +395,6 @@ export default class TbidAvatarButton extends LightningElement {
     };
 
     private requestUserInfo = async () => {
-        if (this._isRequestingUserInfo) {
-            // prevent duplicate requests
-            return;
-        }
-
         this._isRequestingUserInfo = true;
 
         try {
@@ -422,12 +428,16 @@ export default class TbidAvatarButton extends LightningElement {
         );
     };
 
-    private dispatchLoginSuccess = () => {
-        this.dispatchEvent(
-            new CustomEvent("tbidloginsuccess", {
-                bubbles: true
-            })
-        );
+    private dispatchLoginSuccess = (receivedNewToken = false) => {
+        // Receiving a new token should be treated as a new (SSO) login.
+        if (!this._didDispatchLoginSuccess || receivedNewToken) {
+            this._didDispatchLoginSuccess = true;
+            this.dispatchEvent(
+                new CustomEvent("tbidloginsuccess", {
+                    bubbles: true
+                })
+            );
+        }
     };
 
     private dispatchLogoutSuccess = () => {