sfc-utils 1.4.209 → 1.4.211

package/components/layout/layoutscript.mjs

@@ -42,9 +42,7 @@ const LayoutScript = ({ domain, marketingVer = 1 }) => {
       {marketingVer === 1 && (
         <script src="https://projects.sfchronicle.com/shared/js/jquery.min.js"></script>
       )}
-      {marketingVer === 1 && (
-        <script src="https://treg.hearstnp.com/treg.js"></script>
-      )}
+      <script src="https://treg.hearstnp.com/treg.js"></script>
     </>
   );
 };

package/copy/c2p_sheet.js

@@ -18,54 +18,42 @@ var path = require("path");
 
 let googleAuth = (configData) => {
   var auth = null;
-  authObj
-    .authenticate({ fallback: false })
+  return authObj
+    .authenticate()
     .then((resp) => {
       auth = resp;
-      createSheet(auth, false, configData).catch(() => {
-        // If the first attempt failed, then make another req using the fallback
-        authObj.authenticate({ fallback: true }).then((resp) => {
-          auth = resp;
-          createSheet(auth, true, configData);
-        });
-      });
+      return createSheet(auth, configData);
     })
-    .catch(() => {
-      // Failure if we fall back but there's no token
-      auth = authObj.task();
-      createSheet(auth, true, configData);
+    .catch((err) => {
+      throw err;
     });
 };
 
-let createSheet = (auth, fallback, configData) => {
+let createSheet = (auth, configData) => {
   return new Promise((resolveAll, rejectAll) => {
     let gmail;
-    if (!fallback) {
-      // Only need gmail to share if it's not a fallback
-      try {
-        let credsLocation = path.join(os.homedir(), ".credentials.json");
-        let credsData = JSON.parse(fs.readFileSync(credsLocation, "utf-8"));
-        gmail = credsData.gmail;
-      } catch (err) {
-        // If we had any trouble getting the gmail address, fail out
-        console.log(err);
-        rejectAll();
-        return;
-      }
-      if (!gmail) {
-        // If gmail is blank, fail out
-        console.log("'gmail' is blank in credentials file!");
-        rejectAll();
-        return;
-      }
+    try {
+      let credsLocation = path.join(os.homedir(), ".credentials.json");
+      let credsData = JSON.parse(fs.readFileSync(credsLocation, "utf-8"));
+      gmail = credsData.gmail;
+    } catch (err) {
+      // If we had any trouble getting the gmail address, fail out
+      console.log(err);
+      rejectAll(err);
+      return;
+    }
+    if (!gmail) {
+      // If gmail is blank, fail out
+      rejectAll(new Error("'gmail' is blank in credentials file!"));
+      return;
     }
 
     const drive = google.drive({ version: "v3", auth });
     const templateId = "1DUvYnFdxtBv1AXcDI9X00s_opUSu4uHJmd5LNemCN9E";
     const body = { title: "New C2P sheet", name: configData.PROJECT.SLUG };
-    if (configData.PROJECT.MARKET_KEY === "SFC"){
+    if (configData.PROJECT.MARKET_KEY === "SFC") {
       // If this is SFC, make sure it's created in the shared folder
-      body.parents = ['1_jnRs3xOYDxm27y7TZB9gkudzTRmcd7x'];
+      body.parents = ["1_jnRs3xOYDxm27y7TZB9gkudzTRmcd7x"];
     }
     const createOptions = {
       fileId: templateId, // Base template
@@ -76,6 +64,12 @@ let createSheet = (auth, fallback, configData) => {
     drive.files.copy(
       createOptions,
       (err, resp) => {
+        if (err) {
+          console.log("An error prevented the creation of this sheet!");
+          rejectAll(err);
+          return;
+        }
+
         // Make edits to the sheet to match the repo details
         let resources = {
           auth: auth,
@@ -116,71 +110,54 @@ let createSheet = (auth, fallback, configData) => {
         writeFile("project-config.json", JSON.stringify(configData, null, 2));
 
         // Okay, now give the team permissions
-        if (err) {
-          console.log("An error prevented the creation of this sheet!");
-          rejectAll();
-        } else {
-          // If this is a fallback, it was created with the user's account, so we shouldn't need to share it -- finish up
-          if (fallback) {
-            console.log(
-              "The above errors were a failure to create the new sheet with a service account! Your default token was used instead."
-            );
-            console.log(
-              "Your new C2P sheet should be live at this URL:",
-              `https://docs.google.com/spreadsheets/d/${resp.data.id}/edit`
-            );
-            resolveAll();
-          } else {
-            const permission = {
-              type: "user",
-              role: "writer",
-              emailAddress: gmail,
-            };
-            drive.permissions.create(
-              {
-                resource: permission,
-                fileId: resp.data.id, // Modify the created file
-              },
-              (permErr, permResp) => {
-                if (permErr) {
-                  console.log("An error prevented the sharing of this sheet!");
-                  rejectAll();
-                } else {
-                  console.log(
-                    "Your new C2P sheet should be live at this URL:",
-                    `https://docs.google.com/spreadsheets/d/${resp.data.id}/edit`
-                  );
-                  console.log(
-                    `NOTE: It may take a few seconds before your gmail, ${gmail}, has access`
-                  );
-                  // Now share with the service account
-                  const permission2 = {
-                    type: "user",
-                    role: "writer",
-                    emailAddress: "sfchronicle-gatsby@zinc-proton-250521.iam.gserviceaccount.com",
-                  };
-                  drive.permissions.create(
-                    {
-                      resource: permission2,
-                      fileId: resp.data.id, // Modify the created file
-                    },
-                    (permErr, permResp) => {
-                      if (permErr) {
-                        console.log("An error prevented the sharing of this sheet with the service account!");
-                        rejectAll();
-                      } else {
-                        console.log(
-                          `Sheet also shared with service account for quick deploying!`
-                        );
-                        resolveAll();
-                      }
-                    }
-                  )
+        const permission = {
+          type: "user",
+          role: "writer",
+          emailAddress: gmail,
+        };
+        drive.permissions.create(
+          {
+            resource: permission,
+            fileId: resp.data.id, // Modify the created file
+          },
+          (permErr, permResp) => {
+            if (permErr) {
+              console.log("An error prevented the sharing of this sheet!");
+              rejectAll(permErr);
+            } else {
+              console.log(
+                "Your new C2P sheet should be live at this URL:",
+                `https://docs.google.com/spreadsheets/d/${resp.data.id}/edit`
+              );
+              console.log(
+                `NOTE: It may take a few seconds before your gmail, ${gmail}, has access`
+              );
+              // Now share with the service account
+              const permission2 = {
+                type: "user",
+                role: "writer",
+                emailAddress: "sfchronicle-gatsby@zinc-proton-250521.iam.gserviceaccount.com",
+              };
+              drive.permissions.create(
+                {
+                  resource: permission2,
+                  fileId: resp.data.id, // Modify the created file
+                },
+                (permErr, permResp) => {
+                  if (permErr) {
+                    console.log("An error prevented the sharing of this sheet with the service account!");
+                    rejectAll(permErr);
+                  } else {
+                    console.log(
+                      `Sheet also shared with service account for quick deploying!`
+                    );
+                    resolveAll();
+                  }
                 }
-              }
-            );
+              )
+            }
           }
-        }
+        );
       }
     );
   });

package/copy/docs.js

@@ -21,22 +21,14 @@ var Entities = require("html-entities").AllHtmlEntities;
 
 let googleAuth = (config, directory = null, filenames = null, useID = null) => {
   var auth = null;
-  authObj
-    .authenticate({ fallback: false })
+  return authObj
+    .authenticate()
     .then((resp) => {
       auth = resp;
-      grabDocs(auth, config, directory, filenames, useID).catch(() => {
-        // If the first attempt failed, then make another req using the fallback
-        authObj.authenticate({ fallback: true }).then((resp) => {
-          auth = resp;
-          grabDocs(auth, config, directory, filenames, useID);
-        });
-      });
+      return grabDocs(auth, config, directory, filenames, useID);
     })
-    .catch(() => {
-      // Failure if we fall back but there's no token
-      auth = authObj.task();
-      grabDocs(auth, config, directory, filenames, useID);
+    .catch((err) => {
+      throw err;
     });
 };
 
@@ -72,9 +64,8 @@ let grabDocs = (
           .get({
             fileId,
           })
-          .catch(() => {
-            // Maybe service account we doesn't have permissions -- try with normal token
-            reject();
+          .catch((err) => {
+            reject(err);
           });
         if (!meta) {
           return;

package/copy/googleauth.js

@@ -1,64 +1,20 @@
 #!/usr/bin/env node
 
 var { google } = require("googleapis");
-var opn = require("opn");
 
-var http = require("http");
 var os = require("os");
 var path = require("path");
-var url = require("url");
 var fs = require("fs");
-var writeFile = require("write");
 
 // Prep the service account for drive
 var serviceAccountCreds = path.join(
   os.homedir(),
   "service-account-google-creds.json"
 );
-var tokenLocation = path.join(os.homedir(), ".google_oauth_token");
 
-var fallbackAuth = function () {
-  // If it's coming from EC2, pull from project
-  if (process.env.GOOGLE_OAUTH_SYSTEM === "EC2") {
-    tokenLocation = "../.google_oauth_token";
-  }
-
-  try {
-    var tokens = fs.readFileSync(tokenLocation, "utf-8");
-    tokens = JSON.parse(tokens);
-    auth = new google.auth.OAuth2(
-      process.env.GOOGLE_OAUTH_CLIENT_ID,
-      process.env.GOOGLE_OAUTH_CONSUMER_SECRET
-    );
-    auth.setCredentials(tokens);
-
-    auth.on("tokens", function (update) {
-      Object.assign(tokens, update);
-      fs.writeFileSync(tokenLocation, JSON.stringify(tokens, null, 2));
-    });
-  } catch (err) {
-    // If we error here, fire up local (as long as we're on on EC2)
-    if (process.env.GOOGLE_OAUTH_SYSTEM !== "EC2") {
-      task();
-    }
-  }
-  return auth;
-};
-
-var authenticate = function ({ fallback }) {
+var authenticate = function () {
   console.log("\n========== GOOGLEAUTH: authenticate() called ==========");
-  console.log("GOOGLEAUTH: fallback parameter =", fallback);
 
-  if (fallback) {
-    return new Promise((resolve, reject) => {
-      console.log("GOOGLEAUTH: Using fallback auth path");
-      console.log(
-        "Service account failed, falling back to regular token (to use the service account, share this sheet or doc with sfchronicle-gatsby@zinc-proton-250521.iam.gserviceaccount.com)"
-      );
-      resolve(fallbackAuth());
-    });
-  }
-  // Try to use the service account first
   return new Promise((resolve, reject) => {
     try {
       console.log("GOOGLEAUTH: Attempting service account authentication...");
@@ -96,7 +52,7 @@ var authenticate = function ({ fallback }) {
         if (err) {
           console.log("GOOGLEAUTH: Stage 1 error during jwtClient.authorize()");
           console.log("GOOGLEAUTH: Error details:", err.message || err);
-          resolve(fallbackAuth());
+          reject(err);
         } else {
           console.log("Successfully connected to service account!");
           console.log(
@@ -112,81 +68,14 @@ var authenticate = function ({ fallback }) {
         }
       });
     } catch (err) {
-      // It's ok if it errors, we have the fallback
       console.log("GOOGLEAUTH: Stage 2 error (catch block)");
       console.log("GOOGLEAUTH: Error details:", err.message || err);
-      resolve(fallbackAuth());
+      reject(err);
     }
   });
 };
 
-var task = function () {
-  // var done = this.async();
-
-  var clientID = process.env.GOOGLE_OAUTH_CLIENT_ID;
-  var secret = process.env.GOOGLE_OAUTH_CONSUMER_SECRET;
-
-  var client = new google.auth.OAuth2(
-    clientID,
-    secret,
-    "http://localhost:8000/authenticate/"
-  );
-  google.options({
-    auth: client,
-  });
-
-  var scopes = [
-    "https://www.googleapis.com/auth/drive",
-    "https://www.googleapis.com/auth/spreadsheets",
-  ];
-
-  var authURL = client.generateAuthUrl({
-    access_type: "offline",
-    scope: scopes.join(" "),
-    prompt: "consent",
-  });
-
-  var onRequest = function (request, response) {
-    response.setHeader("Connection", "close");
-    if (request.url.indexOf("authenticate") > -1) {
-      return onAuthenticated(request, response);
-    } else if (request.url.indexOf("authorize") > -1) {
-      response.setHeader("Location", authURL);
-      response.writeHead(302);
-    } else {
-      response.writeHead(404);
-    }
-    response.end();
-  };
-
-  var onAuthenticated = async function (request, response) {
-    var requestURL =
-      request.url[0] == "/" ? "localhost:8000" + request.url : request.url;
-    var query = new url.URL(requestURL).searchParams;
-    var code = query.get("code");
-    if (!code) return;
-    try {
-      var token = await client.getToken(code);
-      var tokens = token.tokens;
-      writeFile(tokenLocation, JSON.stringify(tokens, null, 2), function (err) {
-        if (err) {
-          console.log(err);
-        } else {
-          console.log("Authenticated");
-        }
-      });
-      response.end("Done! Now run your command again.");
-    } catch (err) {
-      response.end(err);
-    }
-  };
-
-  var server = http.createServer(onRequest);
-  server.listen(8000, () => opn("http://localhost:8000/authorize"));
-};
-
 let fullAuth = {
-  task: task,
   authenticate: authenticate,
 };
 module.exports = fullAuth;

package/copy/sheets.js

@@ -37,31 +37,17 @@ var cast = function (str, forceStr) {
 };
 
 let googleAuth = (project, directory = null, forceStr = false, options = {}) => {
-  return new Promise((resolveFinal) => {
+  return new Promise((resolveFinal, rejectFinal) => {
     var auth = null;
     authObj
-      .authenticate({ fallback: false })
+      .authenticate()
       .then((resp) => {
         auth = resp;
         grabSheets(auth, project, directory, forceStr, options)
           .then(() => resolveFinal())
-          .catch(() => {
-            // If the first attempt failed, then make another req using the fallback
-            authObj.authenticate({ fallback: true }).then((resp) => {
-              auth = resp;
-              grabSheets(auth, project, directory, forceStr, options).then(() =>
-                resolveFinal()
-              );
-            });
-          });
+          .catch((err) => rejectFinal(err));
       })
-      .catch(() => {
-        // Failure if we fall back but there's no token
-        auth = authObj.task();
-        grabSheets(auth, project, directory, forceStr, options).then(() =>
-          resolveFinal()
-        );
-      });
+      .catch((err) => rejectFinal(err));
   });
 };
 
@@ -74,10 +60,10 @@ let grabSheets = (auth, project, directory, forceStr, options = {}) => {
     }
 
     if (!sheetKeys || !sheetKeys.length) {
-      console.log(
-        "You must specify a spreadsheet key in project.json or auth.json!"
+      rejectAll(
+        new Error("You must specify a spreadsheet key in project.json or auth.json!")
       );
-      return false;
+      return;
     }
 
     let promiseStack = [];
@@ -123,9 +109,9 @@ let getSheet = async (
       auth,
       spreadsheetId,
     })
-    .catch(() => {
+    .catch((err) => {
       // This might fail if we don't have access
-      reject();
+      reject(err);
     });
   if (!output) {
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sfc-utils",
-  "version": "1.4.209",
+  "version": "1.4.211",
   "author": "ewagstaff <evanjwagstaff@gmail.com>",
   "dependencies": {
     "archieml": "^0.4.2",
@@ -8,7 +8,6 @@
     "googleapis": "59.0.0",
     "html-entities": "1.3.1",
     "htmlparser2": "4.1.0",
-    "opn": "^6.0.0",
     "prop-types": "^15.8.1",
     "react-helmet": "^6.1.0",
     "react-transition-group": "^4.4.5",