jvcs 1.1.1 → 1.1.3

package/config/drive-config.js

@@ -1,44 +1,35 @@
 const { google } = require("googleapis");
-const dotenv = require("dotenv")
-const fs = require("fs")
-const path = require("path")
-dotenv.config()
-
-const homedir = require("os").homedir()
-const credDir = path.join(homedir,".jvcs")
-const file = path.join(credDir,"config.json")
-
-let data = {}
-
-if(fs.existsSync(file)) {
-    data = JSON.parse(fs.readFileSync(file, "utf-8"))
-} 
-else {
-    console.warn("No credentials found. Please login/signup")
+const dotenv = require("dotenv");
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+const chalk = require("chalk");
+
+dotenv.config();
+
+const credDir = path.join(os.homedir(), ".jvcs");
+const credFile = path.join(credDir, "config.json");
+
+function getDriveClient() {
+    
+    if(!fs.existsSync(credFile)) {
+        console.log(chalk.red("No credentials found. Please login/signup."));
+        return null;
+    }
+
+    const data = JSON.parse(fs.readFileSync(credFile, "utf-8"));
+    const { CLIENT_ID, CLIENT_SECRET, REDIRECT_URI, REFRESH_TOKEN } = data;
+
+    if(!CLIENT_ID || !CLIENT_SECRET || !REFRESH_TOKEN) {
+        console.log(chalk.red("Incomplete credentials in ~/.jvcs/config.json"));
+        return null;
+    }
+
+    const oauth2client = new google.auth.OAuth2(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
+    oauth2client.setCredentials({ refresh_token: REFRESH_TOKEN });
+
+    const drive = google.drive({ version: "v3", auth: oauth2client });
+    return drive;
 }
-console.log(data)
-
-// Replace these with your own credentials from Google Cloud Console
-const CLIENT_ID = data.CLIENT_ID
-const CLIENT_SECRET = data.CLIENT_SECRET
-const REDIRECT_URI = data.REDIRECT_URI
-
-// Your generated refresh token from OAuth Playground or your OAuth flow
-const REFRESH_TOKEN = data.REFRESH_TOKEN
-console.log(REFRESH_TOKEN)
-const oauth2client = new google.auth.OAuth2(
-    CLIENT_ID,
-    CLIENT_SECRET,
-    REDIRECT_URI
-);
-
-
-// hello
-oauth2client.setCredentials({ refresh_token: REFRESH_TOKEN });
-
-const drive = google.drive({
-    version: 'v3',
-    auth: oauth2client
-});
-//hello
-module.exports = { drive };
+
+module.exports = { getDriveClient };

package/controllers/driveUtility.js

@@ -1,4 +1,5 @@
-const { drive } = require("../config/drive-config");
+const { getDriveClient } = require("../config/drive-config");
+const drive = getDriveClient()
 
 async function getDirectoryStructure(username,reponame,commitId) {
 

package/controllers/push.js

@@ -1,7 +1,8 @@
 const fs = require("fs")
 const path = require("path")
 const chalk = require("chalk")
-const { drive } = require("../config/drive-config")
+const { getDriveClient } = require("../config/drive-config");
+const drive = getDriveClient()
 const { getGlobalConfig, checkGlobalConfig, checkforjvcs } = require("./utility")
 const getDirectoryStructure = require("./driveUtility")
 const handleDbForRepo = require("../apicall/handleDbForRepo")

package/controllers/revert.js

@@ -2,7 +2,8 @@ const fs = require("fs");
 const path = require("path");
 const chalk = require("chalk");
 const { checkGlobalConfig, getGlobalConfig, checkforjvcs } = require("./utility");
-const drive = require("../config/drive-config")
+const { getDriveClient } = require("../config/drive-config");
+
 
 function copyDir(targetCommitFolder, destDir=process.cwd()) {
 
@@ -73,6 +74,13 @@ function deleteLocalCommits(commitDir,Ids) {
 
 async function deleteCommitsFromDrive(ids) {
 
+    const drive = getDriveClient();
+
+    if (!drive) {
+        console.log(chalk.red("Drive client not initialized. Please re-authenticate."));
+        return;
+    }
+
     let folderName = null
     try {
         for(const id of ids) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jvcs",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "bin": {
     "jvcs": "./index.js"
   },