removed secretStuff directory, from now on sensitive info will be stored in .env file -- follow instructions in .env.example

Author: aleckslu

.env.example

@@ -0,0 +1,11 @@
+#DO NOT DELETE THIS FILE, and follow instructions:
+# Required for Slack Oauth features
+# Create a file named .env in this directory, and give it the following values
+# Any variable you create in .env, you must create an example for here in .env.example
+SLACK_CLIENT_SECRET = "ENTER_CLIENT_SECRET_HERE",
+SLACK_CLIENT_ID = "ENTER_CLIENT_ID_HERE"
+
+# https://www.npmjs.com/package/dotenv
+# https://www.npmjs.com/package/quasar-dotenv 
+# https://v1.quasar.dev/quasar-cli/handling-process-env
+# https://v1.quasar.dev/quasar-cli/quasar-conf-js#using-dotenv

package-lock.json

@@ -38,6 +38,7 @@
     "npm": "^6.14.14",
     "prismjs": "^1.24.1",
     "quasar": "^1.0.0",
+    "quasar-dotenv": "^1.0.5",
     "vue-custom-context-menu": "^3.0.1",
     "vue-drag-resize": "^1.3.2",
     "vue-draggable-nested-tree": "^2.2.17",

package.json

@@ -2,7 +2,7 @@
 // https://quasar.dev/quasar-cli/quasar-conf-js
 
 module.exports = function (ctx) {
-  console.log('webpack\'s context parameter: ', ctx)
+  const env = require('quasar-dotenv').config()
   return {
     // app boot file (/src/boot)
     // --> boot files are part of "main.js"
@@ -80,7 +80,7 @@ module.exports = function (ctx) {
     supportIE: false,
 
     build: {
-      scopeHoisting: true,
+      // scopeHoisting: true,
       // vueRouterMode: 'history',
       // vueCompiler: true,
       // gzip: true,
@@ -96,7 +96,8 @@ module.exports = function (ctx) {
         //     formatter: require('eslint').CLIEngine.getFormatter('stylish')
         //   }
         // })
-      }
+      },
+      env: env,
     },
 
     devServer: {

quasar.conf.js

@@ -3,13 +3,6 @@ import { Deeplink } from "electron-deeplink";
 import isDev from "electron-is-dev";
 import jwt_decode from 'jwt-decode';
 
-import slackApiStuff from "../../secretStuff/slackApiStuff";
-
-const clientId = slackApiStuff.clientId;
-const clientSecret = slackApiStuff.clientSecret;
-import dotenv from "dotenv";
-dotenv.config();
-
 /**
  * Set `__statics` path to static files in production;
  * The reason we are setting it here is that the path needs to be evaluated at runtime
@@ -22,7 +15,9 @@ if (process.env.PROD) {
 
 let mainWindow;
 let authCode;
+const protocol = isDev ? "overvuedev" : "overvue";
 
+// Used to console log for main process in production mode
 function logEverywhere(toBeLogged) {
   if (isDev) {
     console.log(toBeLogged);
@@ -36,69 +31,24 @@ function logEverywhere(toBeLogged) {
   }
 }
 
-const protocol = isDev ? "overvuedev" : "overvue";
 const deeplink = new Deeplink({
   app,
   mainWindow,
   protocol,
   isDev,
-  debugLogging: true,
-  electronPath: "../../node_modules/electron/dist/electron.exe"
+  debugLogging: true
 });
-// ipcMain.handle('slackAuth', slackAuth)
-
-// function customDeepLink() {
-//   let deeplinkingUrl;
-
-//   if (isDev && process.platform === 'win32') {
-//     // Set the path of electron.exe and your app.
-//     // These two additional parameters are only available on windows.
-//     // Setting this is required to get this working in dev mode.
-//     app.setAsDefaultProtocolClient('overvuedev', process.execPath, [
-//       resolve(process.argv[1])
-//     ]);
-//   } else {
-//     app.setAsDefaultProtocolClient('overvue');
-//   }
-
-//   app.on('open-url', function (event, url) {
-//     event.preventDefault();
-//     deeplinkingUrl = url;
-//   });
-
-//   // Force single application instance
-//   const gotTheLock = app.requestSingleInstanceLock();
-
-//   if (!gotTheLock) {
-//     app.quit();
-//     return;
-//   } else {
-//     app.on('second-instance', (e, argv) => {
-//       if (process.platform !== 'darwin') {
-//         // Find the arg that is our custom protocol url and store it
-//         deeplinkingUrl = argv.find((arg) => arg.startsWith('overvuedev://test'));
-//       }
-
-//       if (myWindow) {
-//         if (myWindow.isMinimized()) myWindow.restore();
-//         myWindow.focus();
-//       }
-//     })
-//   }
-// }
 
 function getSlackAuth() {
   logEverywhere("inside getSlackAuth");
-  // let chunkedTogether = ''
 
   const authData = {
-    client_id: clientId,
-    client_secret: clientSecret,
+    client_id: process.env.SLACK_CLIENT_ID,
+    client_secret: process.env.SLACK_CLIENT_SECRET,
     code: authCode,
     redirect_uri: isDev ? "overvuedev://test" : "overvue://slack"
   };
   logEverywhere(authData.code);
-  // https://slack.com/api/openid.connect.token?client_id=2696943977700.2696948669268&client_secret=6a6206cc93da2e49243ee9683f958438&code=2696943977700.2713919388452.23b787dec24adec68eeca105f6b7d6e517425de1033a1b6bc5ba3e116b933619&redirect_uri=overvue://slack
   const url =
     "https://slack.com/api/openid.connect.token?" +
     "client_id=" +
@@ -121,31 +71,16 @@ function getSlackAuth() {
   });
 
   request.on("response", response => {
-    logEverywhere(`STATUS: ${response.statusCode}`)
-    // logEverywhere(`HEADERS: ${JSON.stringify(response.headers)})`) //error
-    // let body;
-    logEverywhere("request.on response received");
-    // logEverywhere('SEND #1')
-    // mainWindow.webContents.send("tokenReceived", response);
-
-    // logEverywhere('STATUS: ', response.statusCode)
-    // logEverywhere(`HEADERS: ${JSON.stringify(response.headers)}`)
+    // logEverywhere("request.on response received");
     response.on("end", () => {
       logEverywhere("Response ended ");
     });
     response.on("data", data => {
-      // logEverywhere(`response.on datas CHUNK: ${chunk}`)
-      // logEverywhere("chunked");
-      // logEverywhere(`data.id_token: ${data.id_token}`);
-      // body = data;
       logEverywhere("res on data ");
       const decoded = JSON.parse(data.toString())
       decoded.id_token = jwt_decode(decoded.id_token)
-
-      // chunkedTogether += data
-
       // logEverywhere(data + ')'); //error
-      logEverywhere(`decoded: ${decoded}`)
+      logEverywhere(`decoded in response.on data: ${decoded}`)
       logEverywhere('SEND #2')
       mainWindow.webContents.send("tokenReceived", decoded);
     });
@@ -154,19 +89,19 @@ function getSlackAuth() {
 }
 
 function getSlackToken() {
+  logEverywhere(`process.env.SLACK_CLIENT_ID in electron-main:  ${process.env.SLACK_CLIENT_ID}`);
+  logEverywhere(`process.env.SLACK_CLIENT_SECRET in electron-main:  ${process.env.SLACK_CLIENT_SECRET}`);
   return deeplink.on("received", link => {
-    logEverywhere(`auth worked here link: ${link}`);
+    // logEverywhere(`auth worked here link: ${link}`);
     authCode = link.split("=")[1];
-    // authCode = link.split("=")[1].split(".")[2];
     getSlackAuth();
   });
 }
-// overvue://lkjasdgjkasdg-235235235.235235235.235235235235235235235235
 
 function createWindow() {
   /**
-   * Initial window options
-   */
+  * Initial window options
+  */
 
   mainWindow = new BrowserWindow({
     width: 1000,
@@ -178,7 +113,7 @@ function createWindow() {
     }
   });
 
-  logEverywhere(`current protocol ${deeplink.getProtocol()}`);
+  logEverywhere(`Current deeplink Protocol: ${deeplink.getProtocol()}`);
   mainWindow.loadURL(process.env.APP_URL);
 
   mainWindow.on("closed", () => {
@@ -189,7 +124,6 @@ function createWindow() {
 app.on("ready", () => {
   createWindow();
   getSlackToken();
-  logEverywhere(`process.env.CLIENT_ID:  ${process.env.CLIENT_ID}`);
 });
 
 app.on("window-all-closed", () => {
@@ -202,6 +136,5 @@ app.on("activate", () => {
   if (mainWindow === null) {
     createWindow();
     getSlackToken();
-    logEverywhere(`process.env:  ${process.env}`);
   }
 });

secretStuff/secretStuff_instructions.txt

@@ -35,14 +35,10 @@
   </div>
 </template>
 
-
-
-
 <script>
 // import { mapState, mapActions } from 'vuex'
 import localforage from 'localforage'
 import { shell, ipcRenderer } from 'electron'
-import slackApiStuff from '../../../secretStuff/slackApiStuff.js'
 
 export default {
   name: 'SlackLoginWindow',
@@ -54,32 +50,24 @@ export default {
   },
   created () {
     ipcRenderer.on('tokenReceived', (event, data) => {
-      // JSON.parse(data).then(output => {
-      //   console.log('PARSED DATA: ', output)
-      // })
       console.log('data in SlackLoginWindow: ', data)
     })
   },
   methods: {
     slackOauth: function () {
       const slackBaseUrl = 'https://slack.com/openid/connect/authorize'
-      // const slackBaseUrl = 'https://slack.com/oauth/v2/authorize'
       const responseType = 'code'
       const scope = 'openid profile'
-      const clientId = slackApiStuff.clientId
+      const clientId = process.env.SLACK_CLIENT_ID
       const redirectUri = process.env.DEV ? 'overvuedev://test' : 'overvue://slack'
-      // const redirectUri = 'overvue://slack'
 
       this.isAuthenticating = true;
 
       console.log('clicked')
-      // window.open(this.oauthURL, '_blank')
       shell.openExternal(
         `${slackBaseUrl}?response_type=${responseType}&scope=${scope}&client_id=${clientId}&redirect_uri=${redirectUri}`,
         { activate: true }
       )
-      // .then(data => console.log(data))
-      // .then(data => )
     },
     closeLogin: function () {
       this.showLogin = false