partial google calendar task integration + fix with dark mode colors for task nodes so that text is still visible

1 files changed, 25 insertions, 14 deletions

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;