SwitchbackTech
diff --git a/‎packages/backend/package.json‎
Lines changed: 1 addition & 1 deletion b/‎packages/backend/package.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/backend/src/__tests__/helpers/mock.events.init.ts‎
Lines changed: 3 additions & 4 deletions b/‎packages/backend/src/__tests__/helpers/mock.events.init.ts‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎packages/backend/src/__tests__/helpers/mock.setup.ts‎
Lines changed: 9 additions & 11 deletions b/‎packages/backend/src/__tests__/helpers/mock.setup.ts‎
Lines changed: 9 additions & 11 deletions
diff --git a/‎packages/backend/src/__tests__/mocks.gcal/errors/error.google.invalidGrant.ts‎
Lines changed: 45 additions & 8 deletions b/‎packages/backend/src/__tests__/mocks.gcal/errors/error.google.invalidGrant.ts‎
Lines changed: 45 additions & 8 deletions
diff --git a/‎packages/backend/src/__tests__/mocks.gcal/errors/error.google.invalidValue.ts‎
Lines changed: 84 additions & 41 deletions b/‎packages/backend/src/__tests__/mocks.gcal/errors/error.google.invalidValue.ts‎
Lines changed: 84 additions & 41 deletions
@@ -6,12 +6,12 @@
   "main": "build/src/app.js",
   "dependencies": {
     "@compass/core": "1.0.0",
+    "@googleapis/calendar": "^14.1.0",
     "chalk": "4.1.2",
     "cors": "^2.8.5",
     "dotenv": "^16.0.0",
     "exponential-backoff": "^3.1.2",
     "express": "^4.17.1",
-    "googleapis": "^112.0.0",
     "helmet": "^7.0.0",
     "lodash.mergewith": "^4.6.2",
     "mongodb": "6.3",
 
@@ -1,7 +1,6 @@
-import type { GaxiosPromise } from "gaxios";
-import { calendar_v3, google } from "googleapis";
 import { ObjectId, WithoutId } from "mongodb";
 import { Options } from "rrule";
+import { calendar } from "@googleapis/calendar";
 import { Origin } from "@core/constants/core.constants";
 import { MapEvent } from "@core/mappers/map.event";
 import { Schema_Event, WithCompassId } from "@core/types/event.types";
@@ -34,8 +33,8 @@ export interface State_AfterGcalImport {
  */
 export const simulateGoogleCalendarEventCreation = async (
   event: gSchema$Event,
-): GaxiosPromise<calendar_v3.Schema$Event> => {
-  return google.calendar("v3").events.insert({ requestBody: event });
+) => {
+  return calendar({ version: "v3" }).events.insert({ requestBody: event });
 };
 
 /**
 
@@ -1,5 +1,4 @@
 import { Handler, NextFunction, Response } from "express";
-import { GoogleApis } from "googleapis";
 import mergeWith from "lodash.mergewith";
 import { randomUUID } from "node:crypto";
 import { SessionRequest } from "supertokens-node/framework/express";
@@ -44,16 +43,15 @@ export function compassTestState(): CompassTestState {
 }
 
 function mockGoogleapis() {
-  mockModule("googleapis", (googleapis: { google: GoogleApis }) => {
-    return {
-      google: {
-        ...googleapis.google,
-        calendar: mockGcal({
-          googleapis: googleapis.google,
-        }),
-      },
-    };
-  });
+  mockModule(
+    "@googleapis/calendar",
+    (calendarModule: typeof import("@googleapis/calendar")) => {
+      return {
+        ...calendarModule,
+        calendar: mockGcal({}),
+      };
+    },
+  );
 }
 
 function mockSuperTokens() {
 
@@ -1,25 +1,62 @@
-import { GaxiosError } from "googleapis-common";
+import { GaxiosError } from "gaxios";
 
-export const invalidGrant400Error = new GaxiosError(
+const error = new GaxiosError(
   "invalid_grant",
-  {},
+  {
+    headers: new Headers(),
+    url: new URL("https://oauth2.googleapis.com/token"),
+    method: "POST",
+    responseType: "json",
+    data: "refresh_token=1%2F%2F01F_IBIEZx2TUCgYIARAAGAESNgF-L9IrE_2hx29jFovRvv0eIB_pNYnQsFy8QqSlmsq6nzCENaKrnItvDp72Qg9tF3OtDZrdwAZ&client_id=111711111111-mqq17c111hgpgn907j79kgnse1o0lchk.apps.googleusercontent.com&client_secret=Z8o&grant_type=refresh_token",
+  },
   {
     config: {
       method: "POST",
-      body: "'refresh_token=1%2F%2F01F_IBIEZx2TUCgYIARAAGAESNgF-L9IrE_2hx29jFovRvv0eIB_pNYnQsFy8QqSlmsq6nzCENaKrnItvDp72Qg9tF3OtDZrdwAZ&client_id=111711111111-mqq17c111hgpgn907j79kgnse1o0lchk.apps.googleusercontent.com&client_secret=Z8o&grant_type=refresh_token'",
+      body: "refresh_token=1%2F%2F01F_IBIEZx2TUCgYIARAAGAESNgF-L9IrE_2hx29jFovRvv0eIB_pNYnQsFy8QqSlmsq6nzCENaKrnItvDp72Qg9tF3OtDZrdwAZ&client_id=111711111111-mqq17c111hgpgn907j79kgnse1o0lchk.apps.googleusercontent.com&client_secret=Z8o&grant_type=refresh_token",
       data: "refresh_token=1%2F%2F01F_IBIEZx2TUCgYIARAAGAESNgF-L9IrE_2hx29jFovRvv0eIB_pNYnQsFy8QqSlmsq6nzCENaKrnItvDp72Qg9tF3OtDZrdwAZ&client_id=111711111111-mqq17c111hgpgn907j79kgnse1o0lchk.apps.googleusercontent.com&client_secret=Z8o&grant_type=refresh_token",
-      url: "https://oauth2.googleapis.com/token",
+      url: new URL("https://oauth2.googleapis.com/token"),
       responseType: "json",
+      headers: new Headers(),
     },
     data: {
       error: "invalid_grant",
       error_description: "Bad Request",
     },
     status: 400,
     statusText: "Bad Request",
-    headers: {},
-    request: {
-      responseURL: "",
+    headers: new Headers(),
+    ok: false,
+    redirected: false,
+    type: "error" as ResponseType,
+    url: "https://oauth2.googleapis.com/token",
+    body: null,
+    bodyUsed: false,
+    clone: () => {
+      throw new Error("Not implemented");
+    },
+    arrayBuffer: async () => {
+      throw new Error("Not implemented");
+    },
+    blob: async () => {
+      throw new Error("Not implemented");
+    },
+    formData: async () => {
+      throw new Error("Not implemented");
+    },
+    json: async () => ({
+      error: "invalid_grant",
+      error_description: "Bad Request",
+    }),
+    text: async () => {
+      throw new Error("Not implemented");
+    },
+    bytes: async () => {
+      throw new Error("Not implemented");
     },
   },
 );
+
+// Set the code property to match the HTTP status
+error.code = "400";
+
+export const invalidGrant400Error = error;
@@ -1,9 +1,47 @@
-import { GaxiosError } from "googleapis-common";
+import { GaxiosError } from "gaxios";
 
-export const invalidValueError = new GaxiosError(
+const requestHeaders = new Headers();
+requestHeaders.set(
+  "x-goog-api-client",
+  "gdcl/6.0.4 gl-node/16.17.0 auth/8.7.0",
+);
+requestHeaders.set("Accept-Encoding", "gzip");
+requestHeaders.set("User-Agent", "google-api-nodejs-client/6.0.4 (gzip)");
+requestHeaders.set(
+  "Authorization",
+  "Bearer ya29.a0AVvZVsr4Nv76zYXg0JPCTWTEc37yn0qUyDu35T6AGiv9ucvLsbMZWQ_zk5eKa2bBqiiOCHp4go1Wkml1-paDG0Aayaf-4XeQd8nm78STjMYNk7cEXL8K5jlHTO3Um1VJtPm4yW-ful6ytXn22ULPzzxlahwQaCgYKAZISARASFQGbdwaIn48X7svG7sifNvemifZazw0163",
+);
+requestHeaders.set("Content-Type", "application/json");
+requestHeaders.set("Accept", "application/json");
+
+const responseHeaders = new Headers();
+responseHeaders.set(
+  "alt-svc",
+  'h3=":443"; ma=2592000,h3-29=":443"; ma=2592000',
+);
+responseHeaders.set(
+  "cache-control",
+  "no-cache, no-store, max-age=0, must-revalidate",
+);
+responseHeaders.set("connection", "close");
+responseHeaders.set("content-encoding", "gzip");
+responseHeaders.set("content-type", "application/json; charset=UTF-8");
+responseHeaders.set("date", "Thu, 09 Feb 2023 16:42:21 GMT");
+responseHeaders.set("expires", "Mon, 01 Jan 1990 00:00:00 GMT");
+responseHeaders.set("pragma", "no-cache");
+responseHeaders.set("server", "ESF");
+responseHeaders.set("transfer-encoding", "chunked");
+responseHeaders.set("vary", "Origin, X-Origin, Referer");
+responseHeaders.set("x-content-type-options", "nosniff");
+responseHeaders.set("x-frame-options", "SAMEORIGIN");
+responseHeaders.set("x-xss-protection", "0");
+
+const error = new GaxiosError(
   "Invalid Value",
   {
-    url: "https://www.googleapis.com/calendar/v3/calendars/foo%40gmail.com/events/watch?syncToken=x",
+    url: new URL(
+      "https://www.googleapis.com/calendar/v3/calendars/foo%40gmail.com/events/watch?syncToken=x",
+    ),
     method: "POST",
     data: {
       address: "https://foo.yourdomain.app/api/sync/gcal/notifications",
@@ -12,15 +50,7 @@ export const invalidValueError = new GaxiosError(
       token: "secret",
       type: "web_hook",
     },
-    headers: {
-      "x-goog-api-client": "gdcl/6.0.4 gl-node/16.17.0 auth/8.7.0",
-      "Accept-Encoding": "gzip",
-      "User-Agent": "google-api-nodejs-client/6.0.4 (gzip)",
-      Authorization:
-        "Bearer ya29.a0AVvZVsr4Nv76zYXg0JPCTWTEc37yn0qUyDu35T6AGiv9ucvLsbMZWQ_zk5eKa2bBqiiOCHp4go1Wkml1-paDG0Aayaf-4XeQd8nm78STjMYNk7cEXL8K5jlHTO3Um1VJtPm4yW-ful6ytXn22ULPzzxlahwQaCgYKAZISARASFQGbdwaIn48X7svG7sifNvemifZazw0163",
-      "Content-Type": "application/json",
-      Accept: "application/json",
-    },
+    headers: requestHeaders,
     params: { syncToken: "x" },
     retry: true,
     body: '{"address":"https://foo.yourdomain.app/api/sync/gcal/notifications","expiration":"1675961300771","id":"b69deec8-8526-4504-b376-db83295df0f0","token":"secret","type":"web_hook"}',
@@ -39,7 +69,9 @@ export const invalidValueError = new GaxiosError(
   },
   {
     config: {
-      url: "https://www.googleapis.com/calendar/v3/calendars/foo%40gmail.com/events/watch?syncToken=x",
+      url: new URL(
+        "https://www.googleapis.com/calendar/v3/calendars/foo%40gmail.com/events/watch?syncToken=x",
+      ),
       method: "POST",
       data: {
         address: "https://foo.yourdomain.app/api/sync/gcal/notifications",
@@ -48,15 +80,7 @@ export const invalidValueError = new GaxiosError(
         token: "secret",
         type: "web_hook",
       },
-      headers: {
-        "x-goog-api-client": "gdcl/6.0.4 gl-node/16.17.0 auth/8.7.0",
-        "Accept-Encoding": "gzip",
-        "User-Agent": "google-api-nodejs-client/6.0.4 (gzip)",
-        Authorization:
-          "Bearer ya29.a0AVvZVsr4Nv76zYXg0JPCTWTEc37yn0qUyDu35T6AGiv9ucvLsbMZWQ_zk5eKa2bBqiiOCHp4go1Wkml1-paDG0Aayaf-4XeQd8nm78STjMYNk7cEXL8K5jlHTO3Um1VJtPm4yW-ful6ytXn22ULPzzxlahwQaCgYKAZISARASFQGbdwaIn48X7svG7sifNvemifZazw0163",
-        "Content-Type": "application/json",
-        Accept: "application/json",
-      },
+      headers: requestHeaders,
       params: { syncToken: "x" },
       retry: true,
       body: '{"address":"https://foo.yourdomain.app/api/sync/gcal/notifications","expiration":"1675961300771","id":"b69deec8-8526-4504-b376-db83295df0f0","token":"secret","type":"web_hook"}',
@@ -82,27 +106,46 @@ export const invalidValueError = new GaxiosError(
         message: "Invalid Value",
       },
     },
-    headers: {
-      "alt-svc": 'h3=":443"; ma=2592000,h3-29=":443"; ma=2592000',
-      "cache-control": "no-cache, no-store, max-age=0, must-revalidate",
-      connection: "close",
-      "content-encoding": "gzip",
-      "content-type": "application/json; charset=UTF-8",
-      date: "Thu, 09 Feb 2023 16:42:21 GMT",
-      expires: "Mon, 01 Jan 1990 00:00:00 GMT",
-      pragma: "no-cache",
-      server: "ESF",
-      "transfer-encoding": "chunked",
-      vary: "Origin, X-Origin, Referer",
-      "x-content-type-options": "nosniff",
-      "x-frame-options": "SAMEORIGIN",
-      "x-xss-protection": "0",
-    },
+    headers: responseHeaders,
     status: 400,
     statusText: "Bad Request",
-    request: {
-      responseURL:
-        "https://www.googleapis.com/calendar/v3/calendars/foo%40gmail.com/events/watch?syncToken=x",
+    ok: false,
+    redirected: false,
+    type: "error" as ResponseType,
+    url: "https://www.googleapis.com/calendar/v3/calendars/foo%40gmail.com/events/watch?syncToken=x",
+    body: null,
+    bodyUsed: false,
+    clone: () => {
+      throw new Error("Not implemented");
+    },
+    arrayBuffer: async () => {
+      throw new Error("Not implemented");
+    },
+    blob: async () => {
+      throw new Error("Not implemented");
+    },
+    formData: async () => {
+      throw new Error("Not implemented");
+    },
+    json: async () => ({
+      error: {
+        errors: [
+          { domain: "global", reason: "invalid", message: "Invalid Value" },
+        ],
+        code: 400,
+        message: "Invalid Value",
+      },
+    }),
+    text: async () => {
+      throw new Error("Not implemented");
+    },
+    bytes: async () => {
+      throw new Error("Not implemented");
     },
   },
 );
+
+// Set the code property to match the HTTP status
+error.code = "400";
+
+export const invalidValueError = error;