sfc-utils 1.4.141 → 1.4.142

package/accountswap.js

@@ -11,15 +11,16 @@ const pollForAccount = async function (i, isNav) {
   if (!i) {
     i = 0;
   }
-  // Add a click event to signin to load it with a return URL
-  //
+  // Add a click event to signin
   if (isNav) {
     const signinButton = document.querySelector(".hnp-signin");
     if (signinButton) {
-      // Change the href to include the return URL params
-      signinButton.href = `${
-        signinButton.href
-      }?prevousLocation=${encodeURIComponent(window.location.href)}`;
+      // Add event listener to signin button
+      signinButton.onclick = function (e) {
+        treg.realm.core.login();
+        e.preventDefault();
+        e.stopPropagation();
+      };
     }
   }
   // Safecheck for treg since it might not be global yet
@@ -31,18 +32,19 @@ const pollForAccount = async function (i, isNav) {
     }
     if (isNav) {
       // We got a valid entitlement! Let's see if the button exists and swap our new one in
-      const subButton = document.querySelector("#nav2-sub-box");
-      const subButtonText = document.querySelector("#nav2-sub-box div");
-      if (subButton && subButtonText) {
-        if (!subButtonText.innerText) {
+      const rightBlock = document.querySelector(".nav2-right");
+      if (rightBlock) {
+        if (!rightBlock.innerText) {
           // If there's no innerText, keep waiting
           await new Promise((resolve) => setTimeout(resolve, 1000));
           return await pollForAccount(i + 1, isNav);
         }
         // Change the inner HTML
-        subButton.innerHTML = `<div id="#nav2-sub-box" href="${accountURL}">Account</div>`;
+        rightBlock.innerHTML = `<div id="#nav2-sub-box" href="${accountURL}">Account</div>`;
         // Instead of having a true link, set click event to run treg.realm.iframeProfile.NavigateToIndex()
         if (window.treg.realm.iframeProfile) {
+          // Find the newly swapped button
+          const subButton = document.querySelector("#nav2-sub-box");
           subButton.onclick = function (e) {
             window.treg.realm.iframeProfile.NavigateToIndex();
             e.preventDefault();

package/brands3.js

@@ -48,8 +48,6 @@ let getBrands3 = function (market) {
         //subscribeLink: "https://www.sfchronicle.com/subproject",
         subscribeLink:
           "https://subscription.sfchronicle.com/checkout/684/1444?origin=button&ipid=project&variant=devhub",
-        signinLink:
-          "https://realm.hearstnp.com/aGRuLnNhbmZyYW5jaXNjbw==/c2ZjaHJvbmljbGUuY29t/1079/account/login",
         sailCustomer: "fca2a0390286f0e53120a668534d9529",
         sailSiteName: "san-francisco-chronicle",
         siteId: 35,
@@ -69,8 +67,6 @@ let getBrands3 = function (market) {
         invert: true,
         gaAccount: "UA-1616916-24",
         subscribeLink: "https://www.houstonchronicle.com/subproject",
-        signinLink:
-          "https://realm.hearstnp.com/aGRuLmhvdXN0b24=/aG91c3RvbmNocm9uaWNsZS5jb20=/1078/account/login",
         sailCustomer: "48e30b5083cf6bf47c519651453c9e8a",
         sailSiteName: "houston-chronicle",
         siteId: 33,
@@ -90,8 +86,6 @@ let getBrands3 = function (market) {
         invert: true,
         gaAccount: "UA-1616916-7",
         subscribeLink: "https://www.timesunion.com/subproject",
-        signinLink:
-          "https://realm.hearstnp.com/aGRuLmFsYmFueQ==/dGltZXN1bmlvbi5jb20=/1077/account/login",
         sailCustomer: "5bb9eee089bdc2e27cbd265535ad1f90",
         sailSiteName: "times-union",
         siteId: 3,
@@ -111,8 +105,6 @@ let getBrands3 = function (market) {
         invert: true,
         gaAccount: "UA-1616916-27",
         subscribeLink: "https://www.expressnews.com/subproject",
-        signinLink:
-          "https://realm.hearstnp.com/aGRuLnNhbmFudG9uaW8=/ZXhwcmVzc25ld3MuY29t/1080/account/login",
         sailCustomer: "aec52c4681ed63b5beab139a2584f0d4",
         sailSiteName: "san-antonio-express-news",
         siteId: 36,
@@ -132,8 +124,6 @@ let getBrands3 = function (market) {
         invert: true,
         gaAccount: "UA-1616916-99",
         subscribeLink: "https://www.ctinsider.com/subproject",
-        signinLink:
-          "https://realm.hearstnp.com/aGRuLmN0cHJlbWl1bQ==/Y3RpbnNpZGVyLmNvbQ==/1083/account/login",
         sailCustomer: "9b21160afa226c9f84d27b47c3d52364",
         sailSiteName: "ct-insider",
         siteId: 61,

package/nav2.js

@@ -27,7 +27,7 @@ let getNav2 = function (meta, urlAdd, forceColor, navLink, navArray) {
   }
 
   let {
-    attributes: { marketPrefix, invert, subscribeLink, signinLink },
+    attributes: { marketPrefix, invert, subscribeLink },
   } = getBrands3(meta.PROJECT.MARKET_KEY);
   // Handle various CT domains
   if (typeof window !== "undefined") {
@@ -145,15 +145,13 @@ let getNav2 = function (meta, urlAdd, forceColor, navLink, navArray) {
     </a>
   `;
 
-  // If there's a signin link, add it here
-  // if (signinLink) {
-  //   rightBlock =
-  //     `
-  //   <a id="nav2-sub-box" class="hnp-signin" style="margin: 0; font-weight: 700;" href="${signinLink}">
-  //     <span>Sign in</span>
-  //   </a>
-  //   <span style="font-size: 14px; padding: 2px 0 2px;">or</span>` + rightBlock;
-  // }
+  // Add sign-in here (we can comment this out if we want to remove this)
+  rightBlock =
+    `
+  <a id="nav2-sub-box" class="hnp-signin" style="margin: 0; font-weight: 700;" href="/realm">
+    <span>Sign in</span>
+  </a>
+  <span style="font-size: 14px; padding: 2px 0 2px;">or</span>` + rightBlock;
 
   let navHTML = `<nav class="nav2-container ${invertClass}">
     <div class="nav2-left">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sfc-utils",
-  "version": "1.4.141",
+  "version": "1.4.142",
   "author": "ewagstaff <evanjwagstaff@gmail.com>",
   "dependencies": {
     "archieml": "^0.4.2",