sfc-utils 1.4.78 → 1.4.80

package/copy/googleauth.js

@@ -8,49 +8,57 @@ var os = require("os");
 var path = require("path");
 var url = require("url");
 var fs = require("fs");
-var writeFile = require('write');
+var writeFile = require("write");
 
 // Prep the service account for drive
-var serviceAccountCreds = path.join(os.homedir(), "service-account-google-creds.json");
+var serviceAccountCreds = path.join(
+  os.homedir(),
+  "service-account-google-creds.json"
+);
 var tokenLocation = path.join(os.homedir(), ".google_oauth_token");
 
-var fallbackAuth = function() {
+var fallbackAuth = function () {
   // If it's coming from EC2, pull from project
-  if (process.env.GOOGLE_OAUTH_SYSTEM === "EC2"){
+  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 = new google.auth.OAuth2(
+      process.env.GOOGLE_OAUTH_CLIENT_ID,
+      process.env.GOOGLE_OAUTH_CONSUMER_SECRET
+    );
     auth.setCredentials(tokens);
 
-    auth.on("tokens", function(update) {
+    auth.on("tokens", function (update) {
       Object.assign(tokens, update);
       fs.writeFileSync(tokenLocation, JSON.stringify(tokens, null, 2));
     });
-  } catch(err){
+  } 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()
+    if (process.env.GOOGLE_OAUTH_SYSTEM !== "EC2") {
+      task();
     }
   }
   return auth;
-}
+};
 
-var authenticate = function({fallback}) {
-  if (fallback){
+var authenticate = function ({ fallback }) {
+  if (fallback) {
     return new Promise((resolve, reject) => {
-      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)")
+      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 {
       // If it's coming from EC2, pull from project
-      if (process.env.GOOGLE_OAUTH_SYSTEM === "EC2"){
+      if (process.env.GOOGLE_OAUTH_SYSTEM === "EC2") {
         serviceAccountCreds = "../service-account-google-creds.json";
       }
 
@@ -63,52 +71,56 @@ var authenticate = function({fallback}) {
         null,
         serviceAccountJSON.private_key,
         [
-          'https://www.googleapis.com/auth/spreadsheets',
-          'https://www.googleapis.com/auth/drive'
+          "https://www.googleapis.com/auth/spreadsheets",
+          "https://www.googleapis.com/auth/drive",
         ]
       );
       //authenticate request
       jwtClient.authorize(function (err, tokens) {
-       if (err) {
-         console.log("Stage 1 error, fallback auth");
-         resolve(fallbackAuth());
-       } else {
-         console.log("Successfully connected to service account!");
-         // Return the jwtClient as auth
-         resolve(jwtClient);
-       }
+        if (err) {
+          console.log("Stage 1 error, fallback auth");
+          resolve(fallbackAuth());
+        } else {
+          console.log("Successfully connected to service account!");
+          // Return the jwtClient as auth
+          resolve(jwtClient);
+        }
       });
-    } catch (err){
+    } catch (err) {
       // It's ok if it errors, we have the fallback
       console.log("Stage 2 error, fallback auth");
       resolve(fallbackAuth());
     }
-  })
+  });
 };
 
-var task = function() {
+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/");
+  var client = new google.auth.OAuth2(
+    clientID,
+    secret,
+    "http://localhost:8000/authenticate/"
+  );
   google.options({
-    auth: client
+    auth: client,
   });
 
   var scopes = [
     "https://www.googleapis.com/auth/drive",
-    "https://www.googleapis.com/auth/spreadsheets"
+    "https://www.googleapis.com/auth/spreadsheets",
   ];
 
   var authURL = client.generateAuthUrl({
     access_type: "offline",
     scope: scopes.join(" "),
-    prompt: "consent"
+    prompt: "consent",
   });
 
-  var onRequest = function(request, response) {
+  var onRequest = function (request, response) {
     response.setHeader("Connection", "close");
     if (request.url.indexOf("authenticate") > -1) {
       return onAuthenticated(request, response);
@@ -121,15 +133,16 @@ var task = function() {
     response.end();
   };
 
-  var onAuthenticated = async function(request, response) {
-    var requestURL = request.url[0] == "/" ? "localhost:8000" + request.url : request.url;
+  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) {
+      writeFile(tokenLocation, JSON.stringify(tokens, null, 2), function (err) {
         if (err) {
           console.log(err);
         } else {
@@ -144,10 +157,10 @@ var task = function() {
 
   var server = http.createServer(onRequest);
   server.listen(8000, () => opn("http://localhost:8000/authorize"));
-}
+};
 
 let fullAuth = {
   task: task,
-  authenticate: authenticate
-}
+  authenticate: authenticate,
+};
 module.exports = fullAuth;

package/copy/sheets.js

@@ -12,16 +12,6 @@ var { google } = require("googleapis");
 var api = google.sheets("v4");
 var writeFile = require("write");
 var authObj = require("./googleauth");
-// Try to import story_settings.sheet.json
-let languageSwap;
-try {
-  const storySettings = require("../../../src/data/story_settings.sheet.json");
-  if (storySettings) {
-    languageSwap = storySettings[0].Language_Swap;
-  }
-} catch (err) {
-  // It's ok
-}
 
 var cast = function (str, forceStr) {
   if (!forceStr) {
@@ -93,7 +83,15 @@ let grabSheets = (auth, project, directory, forceStr) => {
     let promiseStack = [];
     for (var spreadsheetId of sheetKeys) {
       let promiseItem = new Promise((resolve, reject) => {
-        getSheet(resolve, reject, auth, spreadsheetId, directory, forceStr);
+        getSheet(
+          resolve,
+          reject,
+          auth,
+          spreadsheetId,
+          directory,
+          forceStr,
+          project
+        );
       });
       promiseStack.push(promiseItem);
     }
@@ -115,7 +113,8 @@ let getSheet = async (
   auth,
   spreadsheetId,
   directory,
-  forceStr
+  forceStr,
+  project
 ) => {
   let output = await api.spreadsheets
     .get({
@@ -131,78 +130,106 @@ let getSheet = async (
   }
   var book = output.data;
   var { sheets, spreadsheetId } = book;
+  console.log("SHEETS", sheets);
+  let languageSwap;
+  if (project.LANGUAGE_SWAP) {
+    languageSwap = project.LANGUAGE_SWAP;
+  }
+  console.log("language swap:", languageSwap);
+  // Process all other sheets with the language swap
   for (var sheet of sheets) {
     if (sheet.properties.title[0] == "_") continue;
-    var response = await api.spreadsheets.values.get({
+    await processSheetData(
       auth,
       spreadsheetId,
-      range: `${sheet.properties.title}!A:AAA`,
-      majorDimension: "ROWS",
-    });
-    var { values } = response.data;
-    var header = values.shift();
-    var swapIndexes = [];
-    if (languageSwap) {
-      for (var i = 0; i < header.length; i++) {
-        var lastIndex = header[i].lastIndexOf("_");
-        if (lastIndex > -1) {
-          // It has an underscore! Check for match
-          var substring = header[i].substring(lastIndex + 1).toLowerCase();
-          if (substring === languageSwap) {
-            // Match! Save the swap index
-            swapIndexes.push(i - 1);
-          }
+      sheet,
+      forceStr,
+      directory,
+      languageSwap
+    );
+  }
+  resolve("Complete");
+};
+
+const processSheetData = async (
+  auth,
+  spreadsheetId,
+  sheet,
+  forceStr,
+  directory,
+  languageSwap = null
+) => {
+  var response = await api.spreadsheets.values.get({
+    auth,
+    spreadsheetId,
+    range: `${sheet.properties.title}!A:AAA`,
+    majorDimension: "ROWS",
+  });
+  var { values } = response.data;
+  var header = values.shift();
+  var swapIndexes = [];
+  console.log("Swap type:", typeof languageSwap);
+  if (languageSwap) {
+    console.log("Running swap logic");
+    for (var i = 0; i < header.length; i++) {
+      var lastIndex = header[i].lastIndexOf("_");
+      if (lastIndex > -1) {
+        // It has an underscore! Check for match
+        var substring = header[i].substring(lastIndex + 1).toLowerCase();
+        if (substring === languageSwap) {
+          // Match! Save the swap index
+          swapIndexes.push(i - 1);
         }
       }
     }
-    var isKeyed = header.indexOf("key") > -1;
-    var isValued = header.indexOf("value") > -1;
-    var out = isKeyed ? {} : [];
-    for (var row of values) {
-      // skip blank rows
-      if (!row.length) continue;
-      var obj = {};
-      var rowSkip = true;
-      row.forEach(function (value, i) {
-        var key = header[i];
-        // Handle language swap
-        if (swapIndexes.indexOf(i) > -1) {
-          // If we have a swap index, swap the value
-          // NOTE: This assumes the translation is ALWAYS one cell to the right
-          try {
-            if (row[i + 1]) {
-              value = row[i + 1];
-            }
-          } catch (err) {
-            // Not great but ok
+  }
+  var isKeyed = header.indexOf("key") > -1;
+  var isValued = header.indexOf("value") > -1;
+  var out = isKeyed ? {} : [];
+  for (var row of values) {
+    // skip blank rows
+    if (!row.length) continue;
+    var obj = {};
+    var rowSkip = true;
+    row.forEach(function (value, i) {
+      var key = header[i];
+      // Handle language swap
+      if (swapIndexes.indexOf(i) > -1) {
+        // If we have a swap index, swap the value
+        // NOTE: This assumes the translation is ALWAYS one cell to the right
+        // If we ever want to have MULTIPLE translations for a single key, we'll need seek out the actual matching key
+        try {
+          if (row[i + 1]) {
+            value = row[i + 1];
           }
+        } catch (err) {
+          // Not great but ok
         }
-        obj[key] = cast(value, forceStr);
-        if (value && value !== "FALSE") {
-          rowSkip = false;
-        }
-      });
-      // If only values in row are garbage or blank-ish, skip
-      if (rowSkip) continue;
-      // Handle actual value
-      if (isKeyed) {
-        out[obj.key] = isValued ? obj.value : obj;
-      } else {
-        out.push(obj);
       }
+      obj[key] = cast(value, forceStr);
+      if (value && value !== "FALSE") {
+        rowSkip = false;
+      }
+    });
+    // If only values in row are garbage or blank-ish, skip
+    if (rowSkip) continue;
+    // Handle actual value
+    if (isKeyed) {
+      out[obj.key] = isValued ? obj.value : obj;
+    } else {
+      out.push(obj);
     }
-
-    //set alternate dir if we have it
-    directory = directory || "src/data/";
-    var file_path = `${directory}${sheet.properties.title.replace(
-      /\s+/g,
-      "_"
-    )}.sheet.json`;
-    console.log(`Saving sheet to ${file_path}`);
-    // grunt.file.write(filename, JSON.stringify(out, null, 2));
-    writeFile(file_path, JSON.stringify(out, null, 2));
   }
-  resolve("Complete");
+
+  //set alternate dir if we have it
+  directory = directory || "src/data/";
+  var file_path = `${directory}${sheet.properties.title.replace(
+    /\s+/g,
+    "_"
+  )}.sheet.json`;
+  console.log(`Saving sheet to ${file_path}`);
+  // grunt.file.write(filename, JSON.stringify(out, null, 2));
+  writeFile(file_path, JSON.stringify(out, null, 2));
 };
 
 module.exports = { googleAuth };

package/package.json

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