dorky 2.3.2 → 2.3.4

package/README.md

@@ -89,10 +89,13 @@ Anyhow, we shall store it on a private storage, using **dorky**, that stores it
 [*] Update node version to latest LTS.
 [*] Ignore dorky files in dorky itself.
 [*] Update .gitignore automatically, to ignore .dorky/credentials.json.
-[ ] Handle reauthentication loop for google-drive.
-[ ] Extension for VS Code to list and highlight them like git.
-[ ] Unintialize dorky setup.
-[ ] MCP server.
-[ ] Encryption of files.
-[ ] Add stages for variables.
+[*] Handle reauthentication loop for google-drive. (Bug fix release)
+[ ] Fix error while adding a file that does not exist, it does give an error but still prints that an entry is added.
+[ ] Fix issue when the file is added again with the same contents, it still adds it, not checks it with the hash.
+[ ] Handle invalid access token for google-drive.
+[ ] Extension for VS Code to list and highlight them like git. (Major release)
+[ ] Unintialize dorky setup. (Bug fix release)
+[ ] MCP server. (Minor release)
+[ ] Encryption of files. (Minor release)
+[ ] Add stages for variables. (Major release)
 

package/bin/index.js

@@ -99,24 +99,101 @@ function updateGitIgnore() {
     }
 }
 
-async function authorizeGoogleDriveClient() {
+async function authorizeGoogleDriveClient(forceReauth = false) {
     async function loadSavedCredentialsIfExist() {
         try {
             const content = await fs.readFileSync(TOKEN_PATH);
-            const credentials = JSON.parse(content);
-            return google.auth.fromJSON(credentials);
+            const savedCredentials = JSON.parse(content);
+
+            // Check if this is OAuth2 credentials (has access_token, refresh_token, etc.)
+            if (!savedCredentials.access_token && !savedCredentials.refresh_token) {
+                return null;
+            }
+
+            // Load the client secrets to create an OAuth2 client
+            const keys = JSON.parse(fs.readFileSync(CREDENTIALS_PATH));
+            const key = keys.installed || keys.web;
+            const oAuth2Client = new google.auth.OAuth2(
+                key.client_id,
+                key.client_secret,
+                key.redirect_uris[0]
+            );
+
+            // Remove the 'storage' field and set credentials
+            const { storage, ...authCredentials } = savedCredentials;
+            oAuth2Client.setCredentials(authCredentials);
+
+            return oAuth2Client;
         } catch (err) {
             return null;
         }
     }
-    let client = await loadSavedCredentialsIfExist();
-    if (client) {
-        return client;
+
+    async function isTokenExpired(credentials) {
+        if (!credentials.expiry_date) {
+            return true;
+        }
+        // Both Date.now() and expiry_date are in milliseconds since Unix epoch (UTC)
+        // Check if token expires in less than 5 minutes (300000 ms)
+        const expiryBuffer = 300000;
+        const currentTimeUTC = Date.now();
+        const expiryTimeUTC = credentials.expiry_date;
+
+        // Token is expired if current time is past (expiry time - buffer)
+        return currentTimeUTC >= (expiryTimeUTC - expiryBuffer);
+    }
+
+    async function refreshAndSaveToken(client) {
+        try {
+            await client.getAccessToken();
+            const newCredentials = client.credentials;
+            const credentialsToSave = {
+                storage: "google-drive",
+                ...newCredentials
+            };
+            fs.writeFileSync(TOKEN_PATH, JSON.stringify(credentialsToSave, null, 2));
+            return client;
+        } catch (err) {
+            return null;
+        }
     }
+
+    // If not forcing reauth, try to load existing credentials
+    if (!forceReauth) {
+        let client = await loadSavedCredentialsIfExist();
+        if (client) {
+            const credentials = JSON.parse(fs.readFileSync(TOKEN_PATH));
+
+            // Ensure we're using the client's credentials which may have been updated
+            const clientCredentials = client.credentials || credentials;
+
+            if (await isTokenExpired(clientCredentials)) {
+                client = await refreshAndSaveToken(client);
+                if (client) {
+                    return client;
+                }
+                // If refresh failed, fall through to full reauth
+            } else {
+                return client;
+            }
+        }
+    }
+
+    // Perform full authentication
     client = await authenticate({
         scopes: SCOPES,
         keyfilePath: CREDENTIALS_PATH,
     });
+
+    // Save credentials after full authentication
+    if (client && client.credentials) {
+        const credentialsToSave = {
+            storage: "google-drive",
+            ...client.credentials
+        };
+        fs.writeFileSync(TOKEN_PATH, JSON.stringify(credentialsToSave, null, 2));
+    }
+
     return client;
 }
 
@@ -129,7 +206,7 @@ async function init(storage) {
             setupFilesAndFolders(metaData, credentials);
             break;
         case "google-drive":
-            const client = await authorizeGoogleDriveClient();
+            const client = await authorizeGoogleDriveClient(true); // Force reauth on init
             credentials = { storage: "google-drive", ...client.credentials };
             setupFilesAndFolders(metaData, credentials);
             break;
@@ -242,7 +319,7 @@ async function checkCredentials() {
             } else {
                 try {
                     let credentials;
-                    const client = await authorizeGoogleDriveClient();
+                    const client = await authorizeGoogleDriveClient(true); // Force reauth when creating new credentials
                     credentials = { storage: "google-drive", ...client.credentials };
                     fs.writeFileSync(".dorky/credentials.json", JSON.stringify(credentials, null, 2));
                     console.log(chalk.green("Credentials saved in .dorky/credentials.json"));
@@ -298,7 +375,7 @@ async function push() {
     }
     metaData["uploaded-files"] = metaData["stage-1-files"];
     fs.writeFileSync(".dorky/metadata.json", JSON.stringify(metaData, null, 2));
-    console.log(chalk.green("Pushed files to storage"));
+    console.log(chalk.green("Pushed the following files to storage:"));
 }
 
 function pushToS3(files, credentials) {
@@ -353,7 +430,15 @@ async function pushToGoogleDrive(files) {
         return parentId;
     }
     console.log("Uploading to google drive");
-    const client = await authorizeGoogleDriveClient();
+    const client = await authorizeGoogleDriveClient(false); // Use existing token if valid
+
+    // Update credentials file with potentially refreshed token
+    const credentialsToSave = {
+        storage: "google-drive",
+        ...client.credentials
+    };
+    fs.writeFileSync(TOKEN_PATH, JSON.stringify(credentialsToSave, null, 2));
+
     const drive = google.drive({ version: 'v3', auth: client });
     for (const file of files) {
         const rootFolder = path.basename(process.cwd());
@@ -436,7 +521,15 @@ async function pullFromGoogleDrive(files) {
         return { name: file, ...files[file] };
     });
 
-    const client = await authorizeGoogleDriveClient();
+    const client = await authorizeGoogleDriveClient(false); // Use existing token if valid
+
+    // Update credentials file with potentially refreshed token
+    const credentialsToSave = {
+        storage: "google-drive",
+        ...client.credentials
+    };
+    fs.writeFileSync(TOKEN_PATH, JSON.stringify(credentialsToSave, null, 2));
+
     const drive = google.drive({ version: "v3", auth: client });
     try {
         files.map(async (file) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dorky",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "DevOps Records Keeper.",
   "bin": {
     "dorky": "bin/index.js"

package/web-app/README.md

@@ -1,70 +0,0 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
-
-The page will reload when you make changes.\
-You may also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can't go back!**
-
-If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
-
-You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
-
-### Analyzing the Bundle Size
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
-
-### Making a Progressive Web App
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
-
-### Advanced Configuration
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
-
-### Deployment
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
-
-### `npm run build` fails to minify
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)