From c96a14c881ea28d820a53a38fa9360814dcb6385 Mon Sep 17 00:00:00 2001
From: Skitty1238 <157652284+Skitty1238@users.noreply.github.com>
Date: Tue, 3 Jun 2025 22:41:11 -0400
Subject: gcal task addition route added -- problems with
 fetchOrGenerateAccessToken

---
 src/client/apis/GoogleAuthenticationManager.tsx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/client/apis/GoogleAuthenticationManager.tsx')

diff --git a/src/client/apis/GoogleAuthenticationManager.tsx b/src/client/apis/GoogleAuthenticationManager.tsx
index 94ce42d8d..46581397d 100644
--- a/src/client/apis/GoogleAuthenticationManager.tsx
+++ b/src/client/apis/GoogleAuthenticationManager.tsx
@@ -41,6 +41,8 @@ export class GoogleAuthenticationManager extends React.Component<object> {
         if (new RegExp(AuthenticationUrl).test(response)) {
             this.isOpen = true;
             this.authenticationLink = response;
+
+            // GETS STUCK AT THIS PROMISE!!
             return new Promise<string>(resolve => {
                 this.disposer?.();
                 this.disposer = reaction(
-- 
cgit v1.2.3-70-g09d2


From 645df1d00f953524c6da22103d26c38ae4331cd6 Mon Sep 17 00:00:00 2001
From: Skitty1238 <157652284+Skitty1238@users.noreply.github.com>
Date: Wed, 4 Jun 2025 13:59:34 -0400
Subject: partial google calendar task integration + fix with dark mode colors
 for task nodes so that text is still visible

---
 src/client/apis/GoogleAuthenticationManager.tsx    | 35 ++++++-----
 src/client/views/MainViewModal.tsx                 |  2 +-
 src/client/views/nodes/TaskBox.scss                | 11 +++-
 src/client/views/nodes/TaskBox.tsx                 | 69 ++++++++++----------
 src/server/ApiManagers/FireflyManager.ts           | 11 +++-
 src/server/ApiManagers/GeneralGoogleManager.ts     | 73 +++++++++++++---------
 src/server/apis/google/GoogleApiServerUtils.ts     | 39 +++++++-----
 .../apis/google/google_project_credentials.json    |  6 +-
 src/server/authentication/DashUserModel.ts         |  6 ++
 9 files changed, 153 insertions(+), 99 deletions(-)

(limited to 'src/client/apis/GoogleAuthenticationManager.tsx')

diff --git a/src/client/apis/GoogleAuthenticationManager.tsx b/src/client/apis/GoogleAuthenticationManager.tsx
index 46581397d..1b1d6f734 100644
--- a/src/client/apis/GoogleAuthenticationManager.tsx
+++ b/src/client/apis/GoogleAuthenticationManager.tsx
@@ -1,4 +1,4 @@
-import { action, IReactionDisposer, observable, reaction, runInAction } from 'mobx';
+import { action, IReactionDisposer, makeObservable, observable, reaction, runInAction } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import { Opt } from '../../fields/Doc';
@@ -6,12 +6,13 @@ import { Networking } from '../Network';
 import { ScriptingGlobals } from '../util/ScriptingGlobals';
 import { MainViewModal } from '../views/MainViewModal';
 import './GoogleAuthenticationManager.scss';
+import { ObservableReactComponent } from '../views/ObservableReactComponent';
 
 const AuthenticationUrl = 'https://accounts.google.com/o/oauth2/v2/auth';
 const prompt = 'Paste authorization code here...';
 
 @observer
-export class GoogleAuthenticationManager extends React.Component<object> {
+export class GoogleAuthenticationManager extends ObservableReactComponent<object> {
     // eslint-disable-next-line no-use-before-define
     public static Instance: GoogleAuthenticationManager;
     private authenticationLink: Opt<string> = undefined;
@@ -23,6 +24,12 @@ export class GoogleAuthenticationManager extends React.Component<object> {
     @observable private credentials: { user_info: { name: string; picture: string }; access_token: string } | undefined = undefined;
     private disposer: Opt<IReactionDisposer>;
 
+    constructor(props: object) {
+        super(props);
+        makeObservable(this);
+        GoogleAuthenticationManager.Instance = this;
+    }
+
     private set isOpen(value: boolean) {
         runInAction(() => (this.openState = value));
     }
@@ -49,14 +56,15 @@ export class GoogleAuthenticationManager extends React.Component<object> {
                     () => this.authenticationCode,
                     async authenticationCode => {
                         if (authenticationCode && /\d{1}\/[\w-]{55}/.test(authenticationCode)) {
+                            resolve(authenticationCode);
                             this.disposer?.();
-                            const response2 = await Networking.PostToServer('/writeGoogleAccessToken', { authenticationCode });
-                            runInAction(() => {
-                                this.success = true;
-                                this.credentials = response2 as { user_info: { name: string; picture: string }; access_token: string };
-                            });
+                            // const response2 = await Networking.PostToServer('/writeGoogleAccessToken', { authenticationCode });
+                            // runInAction(() => {
+                            //     this.success = true;
+                            //     this.credentials = response2 as { user_info: { name: string; picture: string }; access_token: string };
+                            // });
+                            // resolve((response2 as { access_token: string }).access_token);
                             this.resetState();
-                            resolve((response2 as { access_token: string }).access_token);
                         }
                     }
                 );
@@ -109,11 +117,6 @@ export class GoogleAuthenticationManager extends React.Component<object> {
         }
     });
 
-    constructor(props: object) {
-        super(props);
-        GoogleAuthenticationManager.Instance = this;
-    }
-
     private get renderPrompt() {
         return (
             <div className={'authorize-container'}>
@@ -153,7 +156,11 @@ export class GoogleAuthenticationManager extends React.Component<object> {
     }
 
     render() {
-        return <MainViewModal isDisplayed={this.openState} interactive={true} contents={this.renderPrompt} dialogueBoxStyle={this.dialogueBoxStyle} overlayStyle={{ zIndex: 1001 }} closeOnExternalClick={action(() => (this.isOpen = false))} />;
+        return (
+            <div className="hell">
+                <MainViewModal isDisplayed={this.openState} interactive={true} contents={this.renderPrompt} dialogueBoxStyle={this.dialogueBoxStyle} overlayStyle={{ zIndex: 1001 }} closeOnExternalClick={action(() => (this.isOpen = false))} />
+            </div>
+        );
     }
 }
 
diff --git a/src/client/views/MainViewModal.tsx b/src/client/views/MainViewModal.tsx
index b05292c47..d7640dc72 100644
--- a/src/client/views/MainViewModal.tsx
+++ b/src/client/views/MainViewModal.tsx
@@ -41,7 +41,7 @@ export class MainViewModal extends React.Component<MainViewOverlayProps> {
                     className="overlay"
                     onClick={this.props?.closeOnExternalClick}
                     style={{
-                        backgroundColor: isDark(SnappingManager.userColor) ? '#DFDFDF30' : '#32323230',
+                        backgroundColor: isDark(SnappingManager.userColor ?? '') ? '#DFDFDF30' : '#32323230',
                         ...(p.overlayStyle || {}),
                     }}
                 />
diff --git a/src/client/views/nodes/TaskBox.scss b/src/client/views/nodes/TaskBox.scss
index 0fcc2f955..6ef0c6454 100644
--- a/src/client/views/nodes/TaskBox.scss
+++ b/src/client/views/nodes/TaskBox.scss
@@ -6,6 +6,15 @@
     width: 100%;
     height: 100%;
     box-sizing: border-box;
+
+    input,
+    textarea,
+    select,
+    button {
+        background-color: #fff !important;
+        color: #000 !important;
+        border-color: #ccc !important;
+    }
 }
 
 .task-manager-title {
@@ -69,4 +78,4 @@ input[type="datetime-local"] {
     border: 1px solid #ccc;
     border-radius: 6px;
     box-sizing: border-box;
-}
+}
\ No newline at end of file
diff --git a/src/client/views/nodes/TaskBox.tsx b/src/client/views/nodes/TaskBox.tsx
index 1c7aeeb82..3990356b9 100644
--- a/src/client/views/nodes/TaskBox.tsx
+++ b/src/client/views/nodes/TaskBox.tsx
@@ -270,43 +270,38 @@ export class TaskBox extends React.Component<TaskBoxProps> {
                 )}
 
                 {/** test button */}
-            <button
-            className="task-manager-google"
-            onClick={async () => {
-                console.log('GT button clicked');
-                const token = await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken();
-                console.log('Got token', token);
-
-                try {
-                const response = await fetch('/googleTasks/create', {
-                    method: 'POST',
-                    headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${token}`,
-                    },
-                    body: JSON.stringify({
-                    title: taskTitle || 'Untitled Task',
-                    notes: taskDesc,
-                    due: allDay
-                        ? String(doc.$task_dateRange)?.split('|')[0] + 'T23:59:00Z'
-                        : (doc.$task_endTime instanceof DateField && doc.$task_endTime.date?.toISOString()) || undefined,
-                    }),
-                });
-
-                const result = await response.json();
-                console.log("📬 Google Task result:", result);
-                alert(result?.id ? 'Task sent to Google Tasks!' : `Failed: ${result?.error?.message || 'Unknown error'}`);
-                } catch (err) {
-                console.error("Fetch error:", err);
-                alert("Fetch failed: ");
-                }
-            }}
-            >
-            GT
-            </button>
-
-
-
+                <button
+                    className="task-manager-google"
+                    onClick={async () => {
+                        console.log('GT button clicked');
+                        const token = await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken();
+                        console.log('Got token', token);
+
+                        try {
+                            const response = await fetch('/googleTasks/create', {
+                                method: 'POST',
+                                credentials: 'include',
+                                headers: {
+                                    'Content-Type': 'application/json',
+                                    Authorization: `Bearer ${token}`,
+                                },
+                                body: JSON.stringify({
+                                    title: taskTitle || 'Untitled Task',
+                                    notes: taskDesc,
+                                    due: allDay ? String(doc.$task_dateRange)?.split('|')[0] + 'T23:59:00Z' : (doc.$task_endTime instanceof DateField && doc.$task_endTime.date?.toISOString()) || undefined,
+                                }),
+                            });
+
+                            const result = await response.text();
+                            console.log('Google Task result:', result);
+                            alert(result?.id ? 'Task sent to Google Tasks!' : `Failed: ${result?.error?.message || 'Unknown error'}`);
+                        } catch (err) {
+                            console.error('Fetch error:', err);
+                            alert('Fetch failed: ');
+                        }
+                    }}>
+                    GT
+                </button>
             </div>
         );
     }
diff --git a/src/server/ApiManagers/FireflyManager.ts b/src/server/ApiManagers/FireflyManager.ts
index 07ef271a1..6393a1f74 100644
--- a/src/server/ApiManagers/FireflyManager.ts
+++ b/src/server/ApiManagers/FireflyManager.ts
@@ -23,7 +23,16 @@ export default class FireflyManager extends ApiManager {
             return undefined;
         });
 
-    generateImageFromStructure = (prompt: string = 'a realistic illustration of a cat coding', width: number = 2048, height: number = 2048, structureUrl: string, strength: number = 50, styles: string[], styleUrl: string | undefined, variations: number = 4) =>
+    generateImageFromStructure = (
+        prompt: string = 'a realistic illustration of a cat coding',
+        width: number = 2048,
+        height: number = 2048,
+        structureUrl: string,
+        strength: number = 50,
+        styles: string[],
+        styleUrl: string | undefined,
+        variations: number = 4
+    ) =>
         this.getBearerToken().then(response =>
             response?.json().then((data: { access_token: string }) =>
                 //prettier-ignore
diff --git a/src/server/ApiManagers/GeneralGoogleManager.ts b/src/server/ApiManagers/GeneralGoogleManager.ts
index aa06ca1b3..e8debfc12 100644
--- a/src/server/ApiManagers/GeneralGoogleManager.ts
+++ b/src/server/ApiManagers/GeneralGoogleManager.ts
@@ -1,11 +1,10 @@
 import ApiManager, { Registration } from './ApiManager';
-import { Method } from '../RouteManager';
+import { Method, _success } from '../RouteManager';
 import { GoogleApiServerUtils } from '../apis/google/GoogleApiServerUtils';
 import RouteSubscriber from '../RouteSubscriber';
 import { Database } from '../database';
 import { google } from 'googleapis';
 
-
 const EndpointHandlerMap = new Map<GoogleApiServerUtils.Action, GoogleApiServerUtils.ApiRouter>([
     ['create', (api, params) => api.create(params)],
     ['retrieve', (api, params) => api.get(params)],
@@ -18,9 +17,10 @@ export default class GeneralGoogleManager extends ApiManager {
             method: Method.GET,
             subscription: '/readGoogleAccessToken',
             secureHandler: async ({ user, res }) => {
-                const { credentials } = await GoogleApiServerUtils.retrieveCredentials(user.id);
+                const { credentials } = await GoogleApiServerUtils.retrieveCredentials(user);
                 if (!credentials?.access_token) {
-                    return res.send(GoogleApiServerUtils.generateAuthenticationUrl());
+                    const url = GoogleApiServerUtils.generateAuthenticationUrl();
+                    return res.send(url);
                 }
                 return res.send(credentials);
             },
@@ -49,7 +49,7 @@ export default class GeneralGoogleManager extends ApiManager {
             secureHandler: async ({ req, res, user }) => {
                 const sector: GoogleApiServerUtils.Service = req.params.sector as GoogleApiServerUtils.Service;
                 const action: GoogleApiServerUtils.Action = req.params.action as GoogleApiServerUtils.Action;
-                const endpoint = await GoogleApiServerUtils.GetEndpoint(GoogleApiServerUtils.Service[sector], user.id);
+                const endpoint = await GoogleApiServerUtils.GetEndpoint(GoogleApiServerUtils.Service[sector], user);
                 const handler = EndpointHandlerMap.get(action);
                 if (endpoint && handler) {
                     try {
@@ -70,31 +70,48 @@ export default class GeneralGoogleManager extends ApiManager {
             method: Method.POST,
             subscription: new RouteSubscriber('googleTasks').add('create'),
             secureHandler: async ({ req, res, user }) => {
-              try {
-                const { credentials } = await GoogleApiServerUtils.retrieveCredentials(user.id);
-                if (!credentials?.access_token) {
-                  return res.status(401).send('Google access token not found.');
+                try {
+                    const { credentials } = await GoogleApiServerUtils.retrieveCredentials(user.id);
+                    const access_token = user.googleToken || credentials?.access_token; // if googleToken expires, we need to renew it.
+
+                    if (!access_token) {
+                        return res.status(401).send('Google access token not found.');
+                    }
+
+                    const auth = new google.auth.OAuth2();
+                    auth.setCredentials({ access_token: access_token });
+
+                    const tasks = google.tasks({ version: 'v1', auth });
+
+                    const { title, notes, due } = req.body;
+                    const result = await tasks.tasks.insert({
+                        tasklist: '@default',
+                        requestBody: { title, notes, due },
+                    });
+
+                    res.status(200).send(result.data);
+                } catch (err) {
+                    console.error('Google Tasks error:', err);
+                    res.status(500).send('Failed to create task.');
                 }
-          
-                const auth = new google.auth.OAuth2();
-                auth.setCredentials({ access_token: credentials.access_token });
-          
-                const tasks = google.tasks({ version: 'v1', auth });
-          
-                const { title, notes, due } = req.body;
-                const result = await tasks.tasks.insert({
-                  tasklist: '@default',
-                  requestBody: { title, notes, due },
-                });
-          
-                res.status(200).send(result.data);
-              } catch (err) {
-                console.error('Google Tasks error:', err);
-                res.status(500).send('Failed to create task.');
-              }
             },
-          });
+        });
 
-        
+        register({
+            method: Method.GET,
+            subscription: '/refreshGoogle',
+            secureHandler: async ({ user, req, res }) => {
+                const code = req.query.code as string;
+                _success(res, code);
+                user.googleToken = code;
+                user.save();
+
+                // const response2 = await Networking.PostToServer('/writeGoogleAccessToken', { authenticationCode });
+                // runInAction(() => {
+                //     this.success = true;
+                //     this.credentials = response2 as { user_info: { name: string; picture: string }; access_token: string };
+                // });
+            },
+        });
     }
 }
diff --git a/src/server/apis/google/GoogleApiServerUtils.ts b/src/server/apis/google/GoogleApiServerUtils.ts
index 7373df473..75f904331 100644
--- a/src/server/apis/google/GoogleApiServerUtils.ts
+++ b/src/server/apis/google/GoogleApiServerUtils.ts
@@ -6,6 +6,7 @@ import * as request from 'request-promise';
 import { Opt } from '../../../fields/Doc';
 import { Database } from '../../database';
 import { GoogleCredentialsLoader } from './CredentialsLoader';
+import { DashUserModel } from '../../authentication/DashUserModel';
 
 /**
  * Scopes give Google users fine granularity of control
@@ -13,7 +14,7 @@ import { GoogleCredentialsLoader } from './CredentialsLoader';
  * This is the somewhat overkill list of what Dash requests
  * from the user.
  */
-const scope = ['documents.readonly', 'documents', 'presentations', 'presentations.readonly', 'drive', 'drive.file', 'photoslibrary', 'photoslibrary.appendonly', 'photoslibrary.sharing', 'userinfo.profile'].map(
+const scope = ['tasks', 'documents.readonly', 'documents', 'presentations', 'presentations.readonly', 'drive', 'drive.file', 'photoslibrary', 'photoslibrary.appendonly', 'photoslibrary.sharing', 'userinfo.profile'].map(
     relative => `https://www.googleapis.com/auth/${relative}`
 );
 
@@ -118,8 +119,9 @@ export namespace GoogleApiServerUtils {
      * @param userId the id of the Dash user making the request to the API
      * @returns the relevant 'googleapis' wrapper, if any
      */
-    export async function GetEndpoint(sector: string, userId: string): Promise<Endpoint | void> {
-        const auth = await retrieveOAuthClient(userId);
+    export async function GetEndpoint(sector: string, user: DashUserModel): Promise<Endpoint | void> {
+        if (!user.googleToken) await retrieveOAuthClient(user);
+        const auth = user.googleToken; // await retrieveOAuthClient(user);
         if (!auth) {
             return;
         }
@@ -145,14 +147,14 @@ export namespace GoogleApiServerUtils {
      * npm-installed API wrappers that use authenticated client instances rather than access codes for
      * security.
      */
-    export async function retrieveOAuthClient(userId: string): Promise<OAuth2Client | void> {
-        const { credentials, refreshed } = await retrieveCredentials(userId);
+    export async function retrieveOAuthClient(user: DashUserModel): Promise<OAuth2Client | void> {
+        const { credentials, refreshed } = await retrieveCredentials(user);
         if (!credentials) {
             return;
         }
-        let client = authenticationClients.get(userId);
+        let client = authenticationClients.get(user.id);
         if (!client) {
-            authenticationClients.set(userId, (client = generateClient(credentials)));
+            authenticationClients.set(user.id, (client = generateClient(credentials)));
         } else if (refreshed) {
             client.setCredentials(credentials);
         }
@@ -181,7 +183,16 @@ export namespace GoogleApiServerUtils {
      * @returns the newly generated url to the authentication landing page
      */
     export function generateAuthenticationUrl(): string {
-        return worker.generateAuthUrl({ scope, access_type: 'offline' });
+        const oauth2Client = new google.auth.OAuth2(
+            '838617994486-a28072lirm8uk8cm78t7ic4krp0rgkgv.apps.googleusercontent.com',
+            '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',
+            'http://localhost:1050/refreshGoogle' // Ensure this matches the redirect URI in Google Cloud Console
+        );
+
+        return oauth2Client.generateAuthUrl({
+            access_type: 'offline',
+            scope: ['https://www.googleapis.com/auth/tasks'],
+        });
     }
 
     /**
@@ -267,15 +278,15 @@ export namespace GoogleApiServerUtils {
      * @returns the credentials, or undefined if the user has no stored associated credentials,
      * and a flag indicating whether or not they were refreshed during retrieval
      */
-    export async function retrieveCredentials(userId: string): Promise<{ credentials: Opt<EnrichedCredentials>; refreshed: boolean }> {
-        let credentials = await Database.Auxiliary.GoogleAccessToken.Fetch(userId);
+    export async function retrieveCredentials(user: DashUserModel): Promise<{ credentials: Opt<EnrichedCredentials>; refreshed: boolean }> {
+        let credentials = await Database.Auxiliary.GoogleAccessToken.Fetch(user.id);
         let refreshed = false;
         if (!credentials) {
             return { credentials: undefined, refreshed };
         }
         // check for token expiry
         if (credentials.expiry_date! <= new Date().getTime()) {
-            credentials = { ...credentials, ...(await refreshAccessToken(credentials, userId)) };
+            credentials = { ...credentials, ...(await refreshAccessToken(credentials, user)) };
             refreshed = true;
         }
         return { credentials, refreshed };
@@ -291,11 +302,11 @@ export namespace GoogleApiServerUtils {
      * his/her credentials be refreshed
      * @returns the updated credentials
      */
-    async function refreshAccessToken(credentials: Credentials, userId: string): Promise<Credentials> {
+    async function refreshAccessToken(credentials: Credentials, user: DashUserModel): Promise<Credentials> {
         const headerParameters = { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } };
         const { client_id, client_secret } = GoogleCredentialsLoader.ProjectCredentials;
         const params = new URLSearchParams({
-            refresh_token: credentials.refresh_token!,
+            refresh_token: credentials.refresh_token!, // AARAV use user.googleToken 
             client_id,
             client_secret,
             grant_type: 'refresh_token',
@@ -306,7 +317,7 @@ export namespace GoogleApiServerUtils {
         });
         // expires_in is in seconds, but we're building the new expiry date in milliseconds
         const expiry_date = new Date().getTime() + expires_in * 1000;
-        await Database.Auxiliary.GoogleAccessToken.Update(userId, access_token, expiry_date);
+        await Database.Auxiliary.GoogleAccessToken.Update(user.id, access_token, expiry_date);
         // update the relevant properties
         credentials.access_token = access_token;
         credentials.expiry_date = expiry_date;
diff --git a/src/server/apis/google/google_project_credentials.json b/src/server/apis/google/google_project_credentials.json
index 955c5a3c1..738e13647 100644
--- a/src/server/apis/google/google_project_credentials.json
+++ b/src/server/apis/google/google_project_credentials.json
@@ -1,11 +1,11 @@
 {
     "installed": {
-        "client_id": "343179513178-ud6tvmh275r2fq93u9eesrnc66t6akh9.apps.googleusercontent.com",
-        "project_id": "quickstart-1565056383187",
+        "client_id": "838617994486-a28072lirm8uk8cm78t7ic4krp0rgkgv.apps.googleusercontent.com",
+        "project_id": "gtasks-test-dash",
         "auth_uri": "https://accounts.google.com/o/oauth2/auth",
         "token_uri": "https://oauth2.googleapis.com/token",
         "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-        "client_secret": "w8KIFSc0MQpmUYHed4qEzn8b",
+        "client_secret": "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",
         "redirect_uris": ["urn:ietf:wg:oauth:2.0:oob", "http://localhost"]
     }
 }
\ No newline at end of file
diff --git a/src/server/authentication/DashUserModel.ts b/src/server/authentication/DashUserModel.ts
index debeef60c..4397e2bd4 100644
--- a/src/server/authentication/DashUserModel.ts
+++ b/src/server/authentication/DashUserModel.ts
@@ -9,9 +9,14 @@ export type DashUserModel = mongoose.Document & {
     passwordResetToken?: string;
     passwordResetExpires?: Date;
 
+
+    // AARAV ADD
+    googleToken?: string;
+    
     dropboxRefresh?: string;
     dropboxToken?: string;
 
+
     userDocumentId: string;
     sharingDocumentId: string;
     linkDatabaseId: string;
@@ -40,6 +45,7 @@ const userSchema = new mongoose.Schema(
         passwordResetToken: String,
         passwordResetExpires: Date,
 
+        googleToken: String,
         dropboxRefresh: String,
         dropboxToken: String,
         userDocumentId: String, // id that identifies a document which hosts all of a user's account data
-- 
cgit v1.2.3-70-g09d2


From 09be9002b5aa8f5ad7c602bcef6b53bbe0398cd3 Mon Sep 17 00:00:00 2001
From: Skitty1238 <157652284+Skitty1238@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:28:35 -0400
Subject: fixed google authentication + linking and task creation via GT button

---
 src/client/apis/GoogleAuthenticationManager.tsx    | 98 ++++++++++++++--------
 src/client/views/nodes/TaskBox.tsx                 | 57 ++++++++++++-
 src/server/ApiManagers/GeneralGoogleManager.ts     | 50 +++++++----
 src/server/apis/google/GoogleApiServerUtils.ts     | 10 ++-
 .../apis/google/google_project_credentials.json    |  2 +-
 5 files changed, 161 insertions(+), 56 deletions(-)

(limited to 'src/client/apis/GoogleAuthenticationManager.tsx')

diff --git a/src/client/apis/GoogleAuthenticationManager.tsx b/src/client/apis/GoogleAuthenticationManager.tsx
index 1b1d6f734..a93e03e60 100644
--- a/src/client/apis/GoogleAuthenticationManager.tsx
+++ b/src/client/apis/GoogleAuthenticationManager.tsx
@@ -42,46 +42,72 @@ export class GoogleAuthenticationManager extends ObservableReactComponent<object
         this.openState && this.resetState(0, 0);
     }
 
-    public fetchOrGenerateAccessToken = async (displayIfFound = false) => {
-        const response = await Networking.FetchFromServer('/readGoogleAccessToken');
-        // if this is an authentication url, activate the UI to register the new access token
-        if (new RegExp(AuthenticationUrl).test(response)) {
-            this.isOpen = true;
-            this.authenticationLink = response;
-
-            // GETS STUCK AT THIS PROMISE!!
-            return new Promise<string>(resolve => {
-                this.disposer?.();
-                this.disposer = reaction(
-                    () => this.authenticationCode,
-                    async authenticationCode => {
-                        if (authenticationCode && /\d{1}\/[\w-]{55}/.test(authenticationCode)) {
-                            resolve(authenticationCode);
-                            this.disposer?.();
-                            // const response2 = await Networking.PostToServer('/writeGoogleAccessToken', { authenticationCode });
-                            // runInAction(() => {
-                            //     this.success = true;
-                            //     this.credentials = response2 as { user_info: { name: string; picture: string }; access_token: string };
-                            // });
-                            // resolve((response2 as { access_token: string }).access_token);
-                            this.resetState();
-                        }
-                    }
-                );
-            });
-        }
+    // public fetchOrGenerateAccessToken = async (displayIfFound = false) => {
+    //     const response = await Networking.FetchFromServer('/readGoogleAccessToken');
+    //     // if this is an authentication url, activate the UI to register the new access token
+
+    //     if (new RegExp(AuthenticationUrl).test(response)) {
+    //         this.isOpen = true;
+    //         this.authenticationLink = response;
 
-        // otherwise, we already have a valid, stored access token and user info
-        const response2 = JSON.parse(response) as { user_info: { name: string; picture: string }; access_token: string };
-        if (displayIfFound) {
+    //         // GETS STUCK AT THIS PROMISE!!
+    //         return new Promise<string>(resolve => {
+    //             this.disposer?.();
+    //             this.disposer = reaction(
+    //                 () => this.authenticationCode,
+    //                 async authenticationCode => {
+    //                     if (authenticationCode && /\d{1}\/[\w-]{55}/.test(authenticationCode)) {
+    //                         resolve(authenticationCode);
+    //                         this.disposer?.();
+    //                         // const response2 = await Networking.PostToServer('/writeGoogleAccessToken', { authenticationCode });
+    //                         // runInAction(() => {
+    //                         //     this.success = true;
+    //                         //     this.credentials = response2 as { user_info: { name: string; picture: string }; access_token: string };
+    //                         // });
+    //                         // resolve((response2 as { access_token: string }).access_token);
+    //                         this.resetState();
+    //                     }
+    //                 }
+    //             );
+    //         });
+    //     }
+
+    //     // otherwise, we already have a valid, stored access token and user info
+    //     const response2 = JSON.parse(response) as { user_info: { name: string; picture: string }; access_token: string };
+    //     if (displayIfFound) {
+    //         runInAction(() => {
+    //             this.success = true;
+    //             this.credentials = response2;
+    //         });
+    //         this.resetState(-1, -1);
+    //         this.isOpen = true;
+    //     }
+    //     return (response2 as { access_token: string }).access_token;
+    // };
+
+    public fetchOrGenerateAccessToken = async (): Promise<string> => {
+        const response = await Networking.FetchFromServer('/readGoogleAccessToken');
+    
+        // This will return a JSON object with { access_token, user_info } if already linked
+        try {
+            const parsed = JSON.parse(response) as { access_token: string; user_info: { name: string; picture: string } };
+    
             runInAction(() => {
                 this.success = true;
-                this.credentials = response2;
+                this.credentials = parsed;
             });
-            this.resetState(-1, -1);
-            this.isOpen = true;
+    
+            return parsed.access_token;
+        } catch (err) {
+            console.warn('Not linked yet or invalid JSON. Redirecting to auth...');
+            // This is an auth URL — redirect the user to /refreshGoogle
+            if (typeof response === 'string' && response.startsWith('http')) {
+                window.location.href = response;
+                return ''; // Won’t be used — this page will reload anyway
+            }
+    
+            throw new Error('Unable to fetch Google access token.');
         }
-        return (response2 as { access_token: string }).access_token;
     };
 
     resetState = action((visibleForMS: number = 3000, fadesOutInMS: number = 500) => {
@@ -132,7 +158,7 @@ export class GoogleAuthenticationManager extends ObservableReactComponent<object
                     </button>
                 ) : null}
                 {this.showPasteTargetState ? <input className={'paste-target'} onChange={action(e => (this.authenticationCode = e.currentTarget.value))} placeholder={prompt} /> : null}
-                {this.credentials ? (
+                {this.credentials?.user_info?.picture ? (
                     <>
                         <img className={'avatar'} src={this.credentials.user_info.picture} />
                         <span className={'welcome'}>Welcome to Dash, {this.credentials.user_info.name}</span>
diff --git a/src/client/views/nodes/TaskBox.tsx b/src/client/views/nodes/TaskBox.tsx
index 3990356b9..8855e43c8 100644
--- a/src/client/views/nodes/TaskBox.tsx
+++ b/src/client/views/nodes/TaskBox.tsx
@@ -6,6 +6,7 @@ import { DocumentType } from '../../documents/DocumentTypes';
 import { FieldView } from './FieldView';
 import { DateField } from '../../../fields/DateField';
 import { Doc } from '../../../fields/Doc';
+import { Networking } from '../../Network';
 
 import './TaskBox.scss';
 import { GoogleAuthenticationManager } from '../../apis/GoogleAuthenticationManager';
@@ -270,7 +271,7 @@ export class TaskBox extends React.Component<TaskBoxProps> {
                 )}
 
                 {/** test button */}
-                <button
+                {/* <button
                     className="task-manager-google"
                     onClick={async () => {
                         console.log('GT button clicked');
@@ -301,6 +302,60 @@ export class TaskBox extends React.Component<TaskBoxProps> {
                         }
                     }}>
                     GT
+                </button> */}
+
+                {/* <button
+                className="task-manager-google"
+                onClick={async () => {
+                    console.log('GT button clicked');
+                    const url = await Networking.FetchFromServer('/readGoogleAccessToken');
+                    console.log('🔗 Redirecting to Google auth:', url);
+                    window.location.href = url; // Redirect user to authenticate
+                }}
+                >
+                GT
+                </button> */}
+
+                <button
+                    className="task-manager-google"
+                    onClick={async event => {
+                        event.preventDefault();
+
+                        console.log('GT button clicked');
+                        try {
+                            const token = await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken();
+                            console.log('Got token', token);
+
+                            const response = await fetch('/googleTasks/create', {
+                                method: 'POST',
+                                credentials: 'include',
+                                headers: {
+                                    'Content-Type': 'application/json',
+                                    Authorization: `Bearer ${token}`,
+                                },
+                                body: JSON.stringify({
+                                    title: taskTitle || 'Untitled Task',
+                                    notes: taskDesc,
+                                    due: allDay ? String(doc.$task_dateRange)?.split('|')[0] + 'T23:59:00Z' : (doc.$task_endTime instanceof DateField && doc.$task_endTime.date?.toISOString()) || undefined,
+                                    status: doc.$task_completed ? 'completed' : 'needsAction',
+                                    completed: doc.$task_completed ? new Date().toISOString() : undefined,
+                                }),
+                            });
+
+                            const result = await response.json();
+                            console.log('Google Task result:', result);
+
+                            if (result?.id) {
+                                alert('✅ Task sent to Google Tasks!');
+                            } else {
+                                alert(`❌ Failed: ${result?.error?.message || 'Unknown error'}`);
+                            }
+                        } catch (err) {
+                            console.error('Fetch error:', err);
+                            alert('❌ Task creation failed.');
+                        }
+                    }}>
+                    GT
                 </button>
             </div>
         );
diff --git a/src/server/ApiManagers/GeneralGoogleManager.ts b/src/server/ApiManagers/GeneralGoogleManager.ts
index e8debfc12..25589ccb5 100644
--- a/src/server/ApiManagers/GeneralGoogleManager.ts
+++ b/src/server/ApiManagers/GeneralGoogleManager.ts
@@ -71,24 +71,20 @@ export default class GeneralGoogleManager extends ApiManager {
             subscription: new RouteSubscriber('googleTasks').add('create'),
             secureHandler: async ({ req, res, user }) => {
                 try {
-                    const { credentials } = await GoogleApiServerUtils.retrieveCredentials(user.id);
-                    const access_token = user.googleToken || credentials?.access_token; // if googleToken expires, we need to renew it.
-
-                    if (!access_token) {
-                        return res.status(401).send('Google access token not found.');
+                    const auth = await GoogleApiServerUtils.retrieveOAuthClient(user);
+            
+                    if (!auth) {
+                        return res.status(401).send('Google credentials missing or invalid.');
                     }
-
-                    const auth = new google.auth.OAuth2();
-                    auth.setCredentials({ access_token: access_token });
-
+            
                     const tasks = google.tasks({ version: 'v1', auth });
-
-                    const { title, notes, due } = req.body;
+            
+                    const { title, notes, due, status, completed } = req.body;
                     const result = await tasks.tasks.insert({
                         tasklist: '@default',
-                        requestBody: { title, notes, due },
+                        requestBody: { title, notes, due, status, completed},
                     });
-
+            
                     res.status(200).send(result.data);
                 } catch (err) {
                     console.error('Google Tasks error:', err);
@@ -102,9 +98,31 @@ export default class GeneralGoogleManager extends ApiManager {
             subscription: '/refreshGoogle',
             secureHandler: async ({ user, req, res }) => {
                 const code = req.query.code as string;
-                _success(res, code);
-                user.googleToken = code;
-                user.save();
+                console.log('/refreshGoogle hit with code:', code);
+
+                try {
+                    const enriched = await GoogleApiServerUtils.processNewUser(user.id, code);
+
+                    if (enriched.refresh_token) {
+                        console.log('Enriched credentials:', enriched);
+
+                        if (enriched.refresh_token) {
+                            user.googleToken = enriched.refresh_token;
+                            await user.save();
+                            console.log('Saved refresh token to user model');
+                        } else {
+                            console.warn('No refresh token returned');
+                        }
+                    }
+
+                    // await user.save();
+                    // _success(res, 'Google account successfully linked!');
+                    res.redirect('/home');
+
+                } catch (err) {
+                    console.error('Failed to process Google code:', err);
+                    res.status(500).send('Error linking Google account');
+                }
 
                 // const response2 = await Networking.PostToServer('/writeGoogleAccessToken', { authenticationCode });
                 // runInAction(() => {
diff --git a/src/server/apis/google/GoogleApiServerUtils.ts b/src/server/apis/google/GoogleApiServerUtils.ts
index 75f904331..56bc79119 100644
--- a/src/server/apis/google/GoogleApiServerUtils.ts
+++ b/src/server/apis/google/GoogleApiServerUtils.ts
@@ -59,6 +59,7 @@ export namespace GoogleApiServerUtils {
      */
     export function processProjectCredentials(): void {
         const { client_secret: clientSecret, client_id: clientId, redirect_uris: redirectUris } = GoogleCredentialsLoader.ProjectCredentials;
+        console.log('Loaded Google redirect URIs:', redirectUris);
         // initialize the global authorization client
         oAuthOptions = {
             clientId,
@@ -191,7 +192,12 @@ export namespace GoogleApiServerUtils {
 
         return oauth2Client.generateAuthUrl({
             access_type: 'offline',
-            scope: ['https://www.googleapis.com/auth/tasks'],
+            scope: [
+                'https://www.googleapis.com/auth/tasks', 
+                'openid',
+                'profile'
+            ],
+            prompt: 'consent', // This ensures we get a refresh token
         });
     }
 
@@ -306,7 +312,7 @@ export namespace GoogleApiServerUtils {
         const headerParameters = { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } };
         const { client_id, client_secret } = GoogleCredentialsLoader.ProjectCredentials;
         const params = new URLSearchParams({
-            refresh_token: credentials.refresh_token!, // AARAV use user.googleToken 
+            refresh_token: credentials.refresh_token!, // AARAV use user.googleToken
             client_id,
             client_secret,
             grant_type: 'refresh_token',
diff --git a/src/server/apis/google/google_project_credentials.json b/src/server/apis/google/google_project_credentials.json
index 738e13647..010f9a626 100644
--- a/src/server/apis/google/google_project_credentials.json
+++ b/src/server/apis/google/google_project_credentials.json
@@ -6,6 +6,6 @@
         "token_uri": "https://oauth2.googleapis.com/token",
         "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
         "client_secret": "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",
-        "redirect_uris": ["urn:ietf:wg:oauth:2.0:oob", "http://localhost"]
+        "redirect_uris": ["http://localhost:1050/refreshGoogle"]
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 8d424c8cb4d178d5fb92b6543d63fa409eb6430b Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 4 Jun 2025 21:05:03 -0400
Subject: changed google authentication to not reload the page.

---
 src/client/apis/GoogleAuthenticationManager.tsx    | 23 +++++++++---------
 src/client/util/SettingsManager.tsx                |  2 +-
 src/client/views/nodes/TaskBox.tsx                 | 11 ++++++++-
 src/server/ApiManagers/GeneralGoogleManager.ts     | 27 +++++-----------------
 src/server/apis/google/GoogleApiServerUtils.ts     | 16 +++++--------
 .../apis/google/google_project_credentials.json    |  8 +++----
 6 files changed, 39 insertions(+), 48 deletions(-)

(limited to 'src/client/apis/GoogleAuthenticationManager.tsx')

diff --git a/src/client/apis/GoogleAuthenticationManager.tsx b/src/client/apis/GoogleAuthenticationManager.tsx
index a93e03e60..ffec07512 100644
--- a/src/client/apis/GoogleAuthenticationManager.tsx
+++ b/src/client/apis/GoogleAuthenticationManager.tsx
@@ -1,4 +1,4 @@
-import { action, IReactionDisposer, makeObservable, observable, reaction, runInAction } from 'mobx';
+import { action, IReactionDisposer, makeObservable, observable, runInAction } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import { Opt } from '../../fields/Doc';
@@ -8,7 +8,6 @@ import { MainViewModal } from '../views/MainViewModal';
 import './GoogleAuthenticationManager.scss';
 import { ObservableReactComponent } from '../views/ObservableReactComponent';
 
-const AuthenticationUrl = 'https://accounts.google.com/o/oauth2/v2/auth';
 const prompt = 'Paste authorization code here...';
 
 @observer
@@ -85,27 +84,29 @@ export class GoogleAuthenticationManager extends ObservableReactComponent<object
     //     return (response2 as { access_token: string }).access_token;
     // };
 
-    public fetchOrGenerateAccessToken = async (): Promise<string> => {
+    public fetchOrGenerateAccessToken = async (): Promise<string | undefined> => {
         const response = await Networking.FetchFromServer('/readGoogleAccessToken');
-    
+
         // This will return a JSON object with { access_token, user_info } if already linked
         try {
             const parsed = JSON.parse(response) as { access_token: string; user_info: { name: string; picture: string } };
-    
+
             runInAction(() => {
                 this.success = true;
                 this.credentials = parsed;
             });
-    
+
             return parsed.access_token;
-        } catch (err) {
-            console.warn('Not linked yet or invalid JSON. Redirecting to auth...');
+        } catch {
+            console.warn('Not linked yet or invalid JSON. open auth...');
             // This is an auth URL — redirect the user to /refreshGoogle
             if (typeof response === 'string' && response.startsWith('http')) {
-                window.location.href = response;
-                return ''; // Won’t be used — this page will reload anyway
+                if (window.confirm('Authorize Dash to access your Google tasks?')) {
+                    window.open(response)?.focus();
+                    return undefined;
+                }
             }
-    
+
             throw new Error('Unable to fetch Google access token.');
         }
     };
diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 9e79fd870..f54dea90c 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -40,7 +40,7 @@ export class SettingsManager extends React.Component<object> {
     @observable private _activeTab = 'Accounts';
     @observable private _isOpen = false;
 
-    private googleAuthorize = action(() => GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken(true));
+    private googleAuthorize = action(() => GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken());
 
     public closeMgr = action(() => {
         this._isOpen = false;
diff --git a/src/client/views/nodes/TaskBox.tsx b/src/client/views/nodes/TaskBox.tsx
index 8855e43c8..df81d9c69 100644
--- a/src/client/views/nodes/TaskBox.tsx
+++ b/src/client/views/nodes/TaskBox.tsx
@@ -6,7 +6,6 @@ import { DocumentType } from '../../documents/DocumentTypes';
 import { FieldView } from './FieldView';
 import { DateField } from '../../../fields/DateField';
 import { Doc } from '../../../fields/Doc';
-import { Networking } from '../../Network';
 
 import './TaskBox.scss';
 import { GoogleAuthenticationManager } from '../../apis/GoogleAuthenticationManager';
@@ -324,6 +323,16 @@ export class TaskBox extends React.Component<TaskBoxProps> {
                         console.log('GT button clicked');
                         try {
                             const token = await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken();
+                            if (token === undefined) {
+                                const listener = () => {
+                                    if (confirm('✅ Try again?')) {
+                                        // refactor this click function and call it again
+                                    }
+                                    window.removeEventListener('focusin', listener);
+                                };
+                                setTimeout(() => window.addEventListener('focusin', listener), 100);
+                                return;
+                            }
                             console.log('Got token', token);
 
                             const response = await fetch('/googleTasks/create', {
diff --git a/src/server/ApiManagers/GeneralGoogleManager.ts b/src/server/ApiManagers/GeneralGoogleManager.ts
index 25589ccb5..59d066934 100644
--- a/src/server/ApiManagers/GeneralGoogleManager.ts
+++ b/src/server/ApiManagers/GeneralGoogleManager.ts
@@ -1,5 +1,5 @@
 import ApiManager, { Registration } from './ApiManager';
-import { Method, _success } from '../RouteManager';
+import { Method } from '../RouteManager';
 import { GoogleApiServerUtils } from '../apis/google/GoogleApiServerUtils';
 import RouteSubscriber from '../RouteSubscriber';
 import { Database } from '../database';
@@ -72,19 +72,19 @@ export default class GeneralGoogleManager extends ApiManager {
             secureHandler: async ({ req, res, user }) => {
                 try {
                     const auth = await GoogleApiServerUtils.retrieveOAuthClient(user);
-            
+
                     if (!auth) {
                         return res.status(401).send('Google credentials missing or invalid.');
                     }
-            
+
                     const tasks = google.tasks({ version: 'v1', auth });
-            
+
                     const { title, notes, due, status, completed } = req.body;
                     const result = await tasks.tasks.insert({
                         tasklist: '@default',
-                        requestBody: { title, notes, due, status, completed},
+                        requestBody: { title, notes, due, status, completed },
                     });
-            
+
                     res.status(200).send(result.data);
                 } catch (err) {
                     console.error('Google Tasks error:', err);
@@ -98,37 +98,22 @@ export default class GeneralGoogleManager extends ApiManager {
             subscription: '/refreshGoogle',
             secureHandler: async ({ user, req, res }) => {
                 const code = req.query.code as string;
-                console.log('/refreshGoogle hit with code:', code);
 
                 try {
                     const enriched = await GoogleApiServerUtils.processNewUser(user.id, code);
 
                     if (enriched.refresh_token) {
-                        console.log('Enriched credentials:', enriched);
-
                         if (enriched.refresh_token) {
                             user.googleToken = enriched.refresh_token;
                             await user.save();
-                            console.log('Saved refresh token to user model');
                         } else {
                             console.warn('No refresh token returned');
                         }
                     }
-
-                    // await user.save();
-                    // _success(res, 'Google account successfully linked!');
-                    res.redirect('/home');
-
                 } catch (err) {
                     console.error('Failed to process Google code:', err);
                     res.status(500).send('Error linking Google account');
                 }
-
-                // const response2 = await Networking.PostToServer('/writeGoogleAccessToken', { authenticationCode });
-                // runInAction(() => {
-                //     this.success = true;
-                //     this.credentials = response2 as { user_info: { name: string; picture: string }; access_token: string };
-                // });
             },
         });
     }
diff --git a/src/server/apis/google/GoogleApiServerUtils.ts b/src/server/apis/google/GoogleApiServerUtils.ts
index 56bc79119..2f7ef473c 100644
--- a/src/server/apis/google/GoogleApiServerUtils.ts
+++ b/src/server/apis/google/GoogleApiServerUtils.ts
@@ -185,18 +185,14 @@ export namespace GoogleApiServerUtils {
      */
     export function generateAuthenticationUrl(): string {
         const oauth2Client = new google.auth.OAuth2(
-            '838617994486-a28072lirm8uk8cm78t7ic4krp0rgkgv.apps.googleusercontent.com',
-            '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',
+            '740987818053-dtflji3hfkn5r9t8ad6jb8740pls8moh.apps.googleusercontent.com',
+            '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',
             'http://localhost:1050/refreshGoogle' // Ensure this matches the redirect URI in Google Cloud Console
         );
 
         return oauth2Client.generateAuthUrl({
             access_type: 'offline',
-            scope: [
-                'https://www.googleapis.com/auth/tasks', 
-                'openid',
-                'profile'
-            ],
+            scope: ['https://www.googleapis.com/auth/tasks', 'openid', 'profile'],
             prompt: 'consent', // This ensures we get a refresh token
         });
     }
@@ -220,12 +216,12 @@ export namespace GoogleApiServerUtils {
      */
     export async function processNewUser(userId: string, authenticationCode: string): Promise<EnrichedCredentials> {
         const credentials = await new Promise<Credentials>((resolve, reject) => {
-            worker.getToken(authenticationCode, (err, credentials) => {
-                if (err || !credentials) {
+            worker.getToken(authenticationCode, (err, creds) => {
+                if (err || !creds) {
                     reject(err);
                     return;
                 }
-                resolve(credentials);
+                resolve(creds);
             });
         });
         const enriched = injectUserInfo(credentials);
diff --git a/src/server/apis/google/google_project_credentials.json b/src/server/apis/google/google_project_credentials.json
index 010f9a626..8abc13b80 100644
--- a/src/server/apis/google/google_project_credentials.json
+++ b/src/server/apis/google/google_project_credentials.json
@@ -1,11 +1,11 @@
 {
     "installed": {
-        "client_id": "838617994486-a28072lirm8uk8cm78t7ic4krp0rgkgv.apps.googleusercontent.com",
-        "project_id": "gtasks-test-dash",
+        "client_id": "740987818053-dtflji3hfkn5r9t8ad6jb8740pls8moh.apps.googleusercontent.com",
+        "project_id": "dash-web-461920",
         "auth_uri": "https://accounts.google.com/o/oauth2/auth",
         "token_uri": "https://oauth2.googleapis.com/token",
         "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-        "client_secret": "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",
+        "client_secret": "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",
         "redirect_uris": ["http://localhost:1050/refreshGoogle"]
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-70-g09d2


From bd75348c3ad851e05200cf138eaee3b4b349758f Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 4 Jun 2025 21:44:43 -0400
Subject: from last

---
 src/client/apis/GoogleAuthenticationManager.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/client/apis/GoogleAuthenticationManager.tsx')

diff --git a/src/client/apis/GoogleAuthenticationManager.tsx b/src/client/apis/GoogleAuthenticationManager.tsx
index ffec07512..70e1ccc05 100644
--- a/src/client/apis/GoogleAuthenticationManager.tsx
+++ b/src/client/apis/GoogleAuthenticationManager.tsx
@@ -183,11 +183,7 @@ export class GoogleAuthenticationManager extends ObservableReactComponent<object
     }
 
     render() {
-        return (
-            <div className="hell">
-                <MainViewModal isDisplayed={this.openState} interactive={true} contents={this.renderPrompt} dialogueBoxStyle={this.dialogueBoxStyle} overlayStyle={{ zIndex: 1001 }} closeOnExternalClick={action(() => (this.isOpen = false))} />
-            </div>
-        );
+        return <MainViewModal isDisplayed={this.openState} interactive={true} contents={this.renderPrompt} dialogueBoxStyle={this.dialogueBoxStyle} overlayStyle={{ zIndex: 1001 }} closeOnExternalClick={action(() => (this.isOpen = false))} />;
     }
 }
 
-- 
cgit v1.2.3-70-g09d2


From 87bd169df4a4384e41b32b3252b3b3c6618f4510 Mon Sep 17 00:00:00 2001
From: Skitty1238 <157652284+Skitty1238@users.noreply.github.com>
Date: Thu, 5 Jun 2025 11:25:20 -0400
Subject: fixed being able to add tasks to Google Tasks. Cleaned up google
 authorization button clicks + alerts

---
 src/client/apis/GoogleAuthenticationManager.tsx    |   2 +-
 src/client/views/nodes/TaskBox.tsx                 | 109 ++++++++++++++-------
 .../apis/google/google_project_credentials.json    |   7 +-
 3 files changed, 77 insertions(+), 41 deletions(-)

(limited to 'src/client/apis/GoogleAuthenticationManager.tsx')

diff --git a/src/client/apis/GoogleAuthenticationManager.tsx b/src/client/apis/GoogleAuthenticationManager.tsx
index 70e1ccc05..23e658329 100644
--- a/src/client/apis/GoogleAuthenticationManager.tsx
+++ b/src/client/apis/GoogleAuthenticationManager.tsx
@@ -101,7 +101,7 @@ export class GoogleAuthenticationManager extends ObservableReactComponent<object
             console.warn('Not linked yet or invalid JSON. open auth...');
             // This is an auth URL — redirect the user to /refreshGoogle
             if (typeof response === 'string' && response.startsWith('http')) {
-                if (window.confirm('Authorize Dash to access your Google tasks?')) {
+                if (window.confirm('Authorize Dash to access your Google account?')) {
                     window.open(response)?.focus();
                     return undefined;
                 }
diff --git a/src/client/views/nodes/TaskBox.tsx b/src/client/views/nodes/TaskBox.tsx
index e755c6fe3..b59599052 100644
--- a/src/client/views/nodes/TaskBox.tsx
+++ b/src/client/views/nodes/TaskBox.tsx
@@ -211,9 +211,77 @@ export class TaskBox extends React.Component<TaskBoxProps> {
         const isCompleted = !!this.props.Document.$task_completed;
 
         const startTime = doc.$task_startTime instanceof DateField && doc.$task_startTime.date instanceof Date ? toLocalDateTimeString(doc.$task_startTime.date) : '';
-
         const endTime = doc.$task_endTime instanceof DateField && doc.$task_endTime.date instanceof Date ? toLocalDateTimeString(doc.$task_endTime.date) : '';
 
+        const handleGoogleTaskClick = async () => {
+            console.log('GT button clicked');
+
+            try {
+                const token = await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken();
+                if (!token) {
+                    const listener = () => {
+                        window.removeEventListener('focusin', listener);
+                        if (confirm('✅ Authorization complete. Try adding the task again?')) {
+                            // you could refactor the click handler here
+                            handleGoogleTaskClick();
+                        }
+                        window.removeEventListener('focusin', listener);
+                    };
+                    setTimeout(() => window.addEventListener('focusin', listener), 100);
+                    return;
+                }
+
+                let due: string | undefined;
+
+                if (allDay) {
+                    const rawRange = typeof doc.$task_dateRange === 'string' ? doc.$task_dateRange : '';
+                    const datePart = rawRange.split('|')[0];
+
+                    if (datePart && !isNaN(new Date(datePart).getTime())) {
+                        // Set time to midnight UTC to represent the start of the all-day event
+                        const baseDate = datePart.includes('T') ? datePart : datePart + 'T00:00:00Z';
+                        due = new Date(baseDate).toISOString();
+                    } else {
+                        due = undefined;
+                    }
+                } else if (doc.$task_endTime instanceof DateField && doc.$task_endTime.date) {
+                    due = doc.$task_endTime.date.toISOString();
+                } else if (doc.$task_startTime instanceof DateField && doc.$task_startTime.date) {
+                    due = doc.$task_startTime.date.toISOString();
+                } else {
+                    due = undefined;
+                }
+
+                const response = await fetch('/googleTasks/create', {
+                    method: 'POST',
+                    credentials: 'include',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        Authorization: `Bearer ${token}`,
+                    },
+                    body: JSON.stringify({
+                        title: taskTitle || 'Untitled Task',
+                        notes: taskDesc,
+                        due,
+                        status: doc.$task_completed ? 'completed' : 'needsAction',
+                        completed: doc.$task_completed ? new Date().toISOString() : undefined,
+                    }),
+                });
+
+                const result = await response.json();
+                console.log('Google Task result:', result);
+
+                if (result?.id) {
+                    alert('✅ Task sent to Google Tasks!');
+                } else {
+                    alert(`❌ Failed: ${result?.error?.message || 'Unknown error'}`);
+                }
+            } catch (err) {
+                console.error('Fetch error:', err);
+                alert('❌ Task creation failed.');
+            }
+        };
+
         return (
             <div className="task-manager-container">
                 <input className="task-manager-title" type="text" placeholder="Task Title" value={taskTitle} onChange={this.updateTitle} disabled={isCompleted} style={{ opacity: isCompleted ? 0.7 : 1 }} />
@@ -257,44 +325,11 @@ export class TaskBox extends React.Component<TaskBoxProps> {
 
                     <button
                         className="task-manager-google"
-                        onClick={async event => {
+                        onClick={event => {
                             event.preventDefault();
-
-                            console.log('GT button clicked');
-                            try {
-                                const token = await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken();
-                                console.log('Got token', token);
-
-                                const response = await fetch('/googleTasks/create', {
-                                    method: 'POST',
-                                    credentials: 'include',
-                                    headers: {
-                                        'Content-Type': 'application/json',
-                                        Authorization: `Bearer ${token}`,
-                                    },
-                                    body: JSON.stringify({
-                                        title: taskTitle || 'Untitled Task',
-                                        notes: taskDesc,
-                                        due: allDay ? new Date(String(doc.$task_dateRange)?.split('|')[0]).toISOString() : (doc.$task_endTime instanceof DateField && doc.$task_endTime.date?.toISOString()) || undefined,
-                                        status: doc.$task_completed ? 'completed' : 'needsAction',
-                                        completed: doc.$task_completed ? new Date().toISOString() : undefined,
-                                    }),
-                                });
-
-                                const result = await response.json();
-                                console.log('Google Task result:', result);
-
-                                if (result?.id) {
-                                    alert('✅ Task sent to Google Tasks!');
-                                } else {
-                                    alert(`❌ Failed: ${result?.error?.message || 'Unknown error'}`);
-                                }
-                            } catch (err) {
-                                console.error('Fetch error:', err);
-                                alert('❌ Task creation failed.');
-                            }
+                            handleGoogleTaskClick();
                         }}>
-                        Add to Google
+                        Add to Google Tasks
                     </button>
                 </div>
 
diff --git a/src/server/apis/google/google_project_credentials.json b/src/server/apis/google/google_project_credentials.json
index 8abc13b80..8a9a38dac 100644
--- a/src/server/apis/google/google_project_credentials.json
+++ b/src/server/apis/google/google_project_credentials.json
@@ -1,11 +1,12 @@
 {
     "installed": {
-        "client_id": "740987818053-dtflji3hfkn5r9t8ad6jb8740pls8moh.apps.googleusercontent.com",
-        "project_id": "dash-web-461920",
+        "client_id": "838617994486-a28072lirm8uk8cm78t7ic4krp0rgkgv.apps.googleusercontent.com",
+        "project_id": "gtasks-test-dash",
         "auth_uri": "https://accounts.google.com/o/oauth2/auth",
         "token_uri": "https://oauth2.googleapis.com/token",
         "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-        "client_secret": "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",
+        "client_secret": "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",
         "redirect_uris": ["http://localhost:1050/refreshGoogle"]
     }
 }
+
-- 
cgit v1.2.3-70-g09d2


From ee7da91564ae293f394b487f96c53f0118af9d7b Mon Sep 17 00:00:00 2001
From: Skitty1238 <157652284+Skitty1238@users.noreply.github.com>
Date: Fri, 6 Jun 2025 21:29:00 -0400
Subject: cleaned up popups so that not linking to Google doesnt bombard user
 with popups. Added debuggign instructions to alerts

---
 src/client/apis/GoogleAuthenticationManager.tsx | 62 ++++++++-----------------
 src/client/views/nodes/TaskBox.tsx              | 43 +++++++++++------
 2 files changed, 48 insertions(+), 57 deletions(-)

(limited to 'src/client/apis/GoogleAuthenticationManager.tsx')

diff --git a/src/client/apis/GoogleAuthenticationManager.tsx b/src/client/apis/GoogleAuthenticationManager.tsx
index 23e658329..67a6e01e9 100644
--- a/src/client/apis/GoogleAuthenticationManager.tsx
+++ b/src/client/apis/GoogleAuthenticationManager.tsx
@@ -41,49 +41,6 @@ export class GoogleAuthenticationManager extends ObservableReactComponent<object
         this.openState && this.resetState(0, 0);
     }
 
-    // public fetchOrGenerateAccessToken = async (displayIfFound = false) => {
-    //     const response = await Networking.FetchFromServer('/readGoogleAccessToken');
-    //     // if this is an authentication url, activate the UI to register the new access token
-
-    //     if (new RegExp(AuthenticationUrl).test(response)) {
-    //         this.isOpen = true;
-    //         this.authenticationLink = response;
-
-    //         // GETS STUCK AT THIS PROMISE!!
-    //         return new Promise<string>(resolve => {
-    //             this.disposer?.();
-    //             this.disposer = reaction(
-    //                 () => this.authenticationCode,
-    //                 async authenticationCode => {
-    //                     if (authenticationCode && /\d{1}\/[\w-]{55}/.test(authenticationCode)) {
-    //                         resolve(authenticationCode);
-    //                         this.disposer?.();
-    //                         // const response2 = await Networking.PostToServer('/writeGoogleAccessToken', { authenticationCode });
-    //                         // runInAction(() => {
-    //                         //     this.success = true;
-    //                         //     this.credentials = response2 as { user_info: { name: string; picture: string }; access_token: string };
-    //                         // });
-    //                         // resolve((response2 as { access_token: string }).access_token);
-    //                         this.resetState();
-    //                     }
-    //                 }
-    //             );
-    //         });
-    //     }
-
-    //     // otherwise, we already have a valid, stored access token and user info
-    //     const response2 = JSON.parse(response) as { user_info: { name: string; picture: string }; access_token: string };
-    //     if (displayIfFound) {
-    //         runInAction(() => {
-    //             this.success = true;
-    //             this.credentials = response2;
-    //         });
-    //         this.resetState(-1, -1);
-    //         this.isOpen = true;
-    //     }
-    //     return (response2 as { access_token: string }).access_token;
-    // };
-
     public fetchOrGenerateAccessToken = async (): Promise<string | undefined> => {
         const response = await Networking.FetchFromServer('/readGoogleAccessToken');
 
@@ -111,6 +68,25 @@ export class GoogleAuthenticationManager extends ObservableReactComponent<object
         }
     };
 
+    public fetchAccessTokenSilently = async (): Promise<string | undefined> => {
+        const response = await Networking.FetchFromServer('/readGoogleAccessToken');
+    
+        try {
+            const parsed = JSON.parse(response) as { access_token: string; user_info: { name: string; picture: string } };
+    
+            runInAction(() => {
+                this.success = true;
+                this.credentials = parsed;
+            });
+    
+            return parsed.access_token;
+        } catch {
+            // Do nothing — just return undefined silently
+            return undefined;
+        }
+    };
+    
+
     resetState = action((visibleForMS: number = 3000, fadesOutInMS: number = 500) => {
         if (!visibleForMS && !fadesOutInMS) {
             runInAction(() => {
diff --git a/src/client/views/nodes/TaskBox.tsx b/src/client/views/nodes/TaskBox.tsx
index c99a91080..5f46c9b2c 100644
--- a/src/client/views/nodes/TaskBox.tsx
+++ b/src/client/views/nodes/TaskBox.tsx
@@ -234,24 +234,39 @@ export class TaskBox extends ViewBoxBaseComponent<FieldViewProps>() {
     handleBlur = (e: React.FocusEvent<HTMLDivElement>) => {
         // Check if focus is moving outside this component
         if (!e.currentTarget.contains(e.relatedTarget)) {
-            this.syncWithGoogleTaskBidirectional();
+            this.syncWithGoogleTaskBidirectional(true);
         }
     };
 
-    syncWithGoogleTaskBidirectional = async (): Promise<boolean> => {
+    /**
+     * Method to sync the task with Google Tasks bidirectionally 
+     * (update Dash from Google and vice versa, based on which is newer)
+     * @param silent - whether to suppress UI prompts to connect to Google (default: false)
+     * @returns - a promise that resolves to true if sync was successful, false otherwise
+     */
+
+    syncWithGoogleTaskBidirectional = async (silent = false): Promise<boolean> => {
         const doc = this.Document;
-        const token = await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken();
+        let token: string | undefined;
+        try {
+            token = silent ? await GoogleAuthenticationManager.Instance.fetchAccessTokenSilently() : await GoogleAuthenticationManager.Instance.fetchOrGenerateAccessToken();
+        } catch (err) {
+            console.warn('Google auth failed:', err);
+            return false;
+        }
 
         if (!token) {
-            const listener = () => {
-                window.removeEventListener('focusin', listener);
-                if (confirm('✅ Authorization complete. Try syncing the task again?')) {
-                    // you could refactor the click handler here
-                    this.syncWithGoogleTaskBidirectional();
-                }
-                window.removeEventListener('focusin', listener);
-            };
-            setTimeout(() => window.addEventListener('focusin', listener), 100);
+            if (!silent) {
+                const listener = () => {
+                    window.removeEventListener('focusin', listener);
+                    if (confirm('✅ Authorization complete. Try syncing the task again?')) {
+                        // you could refactor the click handler here
+                        this.syncWithGoogleTaskBidirectional();
+                    }
+                    window.removeEventListener('focusin', listener);
+                };
+                setTimeout(() => window.addEventListener('focusin', listener), 100);
+            }
             return false;
         }
 
@@ -373,7 +388,7 @@ export class TaskBox extends ViewBoxBaseComponent<FieldViewProps>() {
                         console.warn('❌ Google Task creation failed:', result);
                     }
                 } catch (err) {
-                    console.error('❌ Error creating Google Task:', err);
+                    console.warn('❌ Error creating Google Task:', err);
                 }
             } else if (doc.$googleTaskId) {
                 await this.syncWithGoogleTaskBidirectional();
@@ -492,7 +507,7 @@ export class TaskBox extends ViewBoxBaseComponent<FieldViewProps>() {
             if (success) {
                 alert('✅ Task successfully synced!');
             } else {
-                alert('❌ Task sync failed.');
+                alert('❌ Task sync failed. Try reloading.');
             }
         };
 
-- 
cgit v1.2.3-70-g09d2

