Added Authorize Step in Main Script

scripts/clean-up-dry-runs.ts

@@ -6,7 +6,7 @@ import moment from "moment";
 import yargs from "yargs/yargs";
 
 // Internals
-import googleAuth from "./Helpers/google-auth";
+import googleAuth from "../src/Helpers/General/google-auth";
 import Logger from "../src/Helpers/Logger";
 
 const args = yargs(process.argv.slice(2)).option("all", {

scripts/upload-logs.ts

@@ -7,7 +7,7 @@ import { format } from "prettier";
 import moment from "moment";
 
 // Internals
-import googleAuth from "./Helpers/google-auth";
+import googleAuth from "../src/Helpers/General/google-auth";
 import Logger from "../src/Helpers/Logger";
 
 const uploadLogs = async () => {

scripts/Helpers/google-auth.ts → src/Helpers/General/google-auth.ts

@@ -8,8 +8,7 @@ import readline, { createInterface } from "readline";
 import { google, Auth } from "googleapis";
 
 // Internals
-import Logger from "../../src/Helpers/Logger";
-import keyfile from "../../credentials.json";
+import Logger from "../Logger";
 
 readline.Interface.prototype.question[promisify.custom] = function (
   prompt: string
@@ -24,13 +23,17 @@ readline.Interface.prototype.questionAsync = promisify(
   readline.Interface.prototype.question
 );
 
-const TOKEN_PATH = join(__dirname, "..", "..", "oauth-token.json");
+const CRED_PATH = join(__dirname, "..", "..", "..", "credentials.json");
+const TOKEN_PATH = join(__dirname, "..", "..", "..", "oauth-token.json");
 
 const googleAuth = async (): Promise<Auth.OAuth2Client> => {
+  const keyfile = await readFile(CRED_PATH, "utf-8");
+  const creds = JSON.parse(keyfile);
+
   const oAuth2Client = new google.auth.OAuth2(
-    keyfile.installed.client_id,
-    keyfile.installed.client_secret,
-    keyfile.installed.redirect_uris[0]
+    creds.installed.client_id,
+    creds.installed.client_secret,
+    creds.installed.redirect_uris[0]
   );
 
   Logger.log("Authorizing...");
@@ -47,7 +50,9 @@ const googleAuth = async (): Promise<Auth.OAuth2Client> => {
     });
 
     Logger.line();
-    Logger.log(`Authorize this app by visiting this url: ${authUrl}`);
+    Logger.log(
+      `${Logger.COLORS.FgBlue}Authorize by signing in with [email protected]${Logger.COLORS.Reset}: ${authUrl}`
+    );
 
     const rl = createInterface({
       input: process.stdin,

src/Helpers/General/index.ts

@@ -3,3 +3,4 @@ export { default as escapeRegex } from "./escape-regex";
 export { default as flattenFields } from "./flatten-fields";
 export { default as getTemplate } from "./get-template";
 export { default as normalizeDate } from "./normalize-date";
+export { default as googleAuth } from "./google-auth";

src/script.ts

@@ -17,7 +17,7 @@ import {
 } from "./Helpers/Checks";
 import { sendReminderEmail } from "./Helpers/Email";
 import { createGoogleForm } from "./Helpers/Forms";
-import { parseProject, flattenFields } from "./Helpers/General";
+import { parseProject, flattenFields, googleAuth } from "./Helpers/General";
 import Logger from "./Helpers/Logger";
 import { FIELDS } from "./Utils/constants";
 
@@ -42,6 +42,8 @@ const script = async () => {
 
   const logger = new Logger(dryRun);
   try {
+    await googleAuth();
+
     const table = Airtable.base(process.env.AIRTABLE_BASE_ID ?? "");
 
     const standardQuestions = await getStandardQuestions(table);