SwitchbackTech
diff --git a/‎e2e/utils/event-test-utils.ts‎
Lines changed: 3 additions & 1 deletion b/‎e2e/utils/event-test-utils.ts‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎packages/backend/src/__tests__/mocks.gcal/errors/error.google.factory.ts‎
Lines changed: 59 additions & 0 deletions b/‎packages/backend/src/__tests__/mocks.gcal/errors/error.google.factory.ts‎
Lines changed: 59 additions & 0 deletions
diff --git a/‎packages/backend/src/common/errors/handlers/error.express.handler.ts‎
Lines changed: 12 additions & 7 deletions b/‎packages/backend/src/common/errors/handlers/error.express.handler.ts‎
Lines changed: 12 additions & 7 deletions
diff --git a/‎packages/backend/src/common/errors/handlers/error.handler.test.ts‎
Lines changed: 40 additions & 0 deletions b/‎packages/backend/src/common/errors/handlers/error.handler.test.ts‎
Lines changed: 40 additions & 0 deletions
diff --git a/‎packages/backend/src/common/services/gcal/gcal.util.test.ts‎
Lines changed: 15 additions & 0 deletions b/‎packages/backend/src/common/services/gcal/gcal.util.test.ts‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎packages/backend/src/common/services/gcal/gcal.utils.ts‎
Lines changed: 26 additions & 13 deletions b/‎packages/backend/src/common/services/gcal/gcal.utils.ts‎
Lines changed: 26 additions & 13 deletions
diff --git a/‎packages/backend/src/servers/websocket/websocket.server.ts‎
Lines changed: 5 additions & 0 deletions b/‎packages/backend/src/servers/websocket/websocket.server.ts‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎packages/backend/src/sync/controllers/sync.controller.test.ts‎
Lines changed: 56 additions & 1 deletion b/‎packages/backend/src/sync/controllers/sync.controller.test.ts‎
Lines changed: 56 additions & 1 deletion
@@ -212,7 +212,9 @@ export const fillTitleAndSaveWithKeyboard = async (
   const titleInput = getFormTitleInput(page);
   await expect(titleInput).toBeVisible({ timeout: FORM_TIMEOUT });
   await titleInput.fill(title);
-  await page.keyboard.press("Enter");
+  // EventForm saves on Cmd+Enter (Mac) or Ctrl+Enter (Linux/Windows)
+  // ControlOrMeta maps to the platform-appropriate modifier
+  await page.keyboard.press("ControlOrMeta+Enter");
   // Wait for form to close, confirming the save completed
   await titleInput.waitFor({ state: "hidden", timeout: FORM_TIMEOUT });
 };
 
@@ -0,0 +1,59 @@
+import { GaxiosError } from "gaxios";
+
+export const createGoogleError = (
+  overrides: {
+    code?: string | number;
+    responseStatus?: number;
+    message?: string;
+  } = {},
+) => {
+  const url = new URL("https://www.googleapis.com/calendar/v3");
+  const headers = new Headers();
+
+  const error = new GaxiosError(
+    overrides.message ?? "test google error",
+    {
+      headers,
+      url,
+    },
+    overrides.responseStatus
+      ? {
+          config: {
+            headers,
+            url,
+          },
+          status: overrides.responseStatus,
+          statusText: "ERROR",
+          headers,
+          data: {},
+          ok: false,
+          redirected: false,
+          type: "error" as ResponseType,
+          url: url.toString(),
+          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 () => ({}),
+          text: async () => "",
+          bytes: async () => {
+            throw new Error("Not implemented");
+          },
+        }
+      : undefined,
+  );
+
+  error.code = overrides.code;
+
+  return error;
+};
@@ -1,6 +1,7 @@
 import { Request } from "express";
 import { GaxiosError } from "gaxios";
 import { SessionRequest } from "supertokens-node/framework/express";
+import { GOOGLE_REVOKED } from "@core/constants/websocket.constants";
 import { BaseError } from "@core/errors/errors.base";
 import { Status } from "@core/errors/status.codes";
 import { Logger } from "@core/logger/winston.logger";
@@ -19,6 +20,7 @@ import {
 } from "@backend/common/services/gcal/gcal.utils";
 import { CompassError, Info_Error } from "@backend/common/types/error.types";
 import { SessionResponse } from "@backend/common/types/express.types";
+import { webSocketServer } from "@backend/servers/websocket/websocket.server";
 import { getSyncByToken } from "@backend/sync/util/sync.queries";
 import { findCompassUserBy } from "@backend/user/queries/user.queries";
 import userService from "@backend/user/services/user.service";
@@ -91,7 +93,7 @@ export const handleExpressError = async (
     }
 
     if (isGoogleError(e)) {
-      await handleGoogleError(req, res, userId, e);
+      await handleGoogleError(req, res, userId, e as GaxiosError);
     } else {
       const errInfo = assembleErrorInfo(e);
       res.status(e.status || Status.INTERNAL_SERVER).send(errInfo);
@@ -104,20 +106,23 @@ export const handleExpressError = async (
 };
 
 const handleGoogleError = async (
-  req: Request | SessionRequest,
+  _req: Request | SessionRequest,
   res: SessionResponse,
   userId: string,
   e: GaxiosError,
 ) => {
   if (isInvalidGoogleToken(e)) {
-    await req.session?.revokeSession();
+    await userService.pruneGoogleData(userId);
+    webSocketServer.handleGoogleRevoked(userId);
 
-    // revoke specific sessions for this user
-    logger.debug(
-      `Invalid Google token for user: ${userId}\n\tsession revoked as result`,
+    logger.warn(
+      `Invalid Google token for user: ${userId}. Google data pruned and client notified.`,
     );
 
-    res.status(Status.UNAUTHORIZED).send();
+    res.status(Status.UNAUTHORIZED).send({
+      code: GOOGLE_REVOKED,
+      message: "Google access revoked. Your Google data has been removed.",
+    });
     return;
   }
 
 
@@ -1,10 +1,16 @@
+import { GOOGLE_REVOKED } from "@core/constants/websocket.constants";
 import { BaseError } from "@core/errors/errors.base";
 import { Status } from "@core/errors/status.codes";
+import { invalidGrant400Error } from "@backend/__tests__/mocks.gcal/errors/error.google.invalidGrant";
+import { handleExpressError } from "@backend/common/errors/handlers/error.express.handler";
 import {
   error,
+  errorHandler,
   toClientErrorPayload,
 } from "@backend/common/errors/handlers/error.handler";
 import { UserError } from "@backend/common/errors/user/user.errors";
+import { webSocketServer } from "@backend/servers/websocket/websocket.server";
+import userService from "@backend/user/services/user.service";
 
 describe("error.handler", () => {
   describe("toClientErrorPayload", () => {
@@ -38,4 +44,38 @@ describe("error.handler", () => {
       expect(Object.keys(payload)).toEqual(["result", "message"]);
     });
   });
+
+  describe("handleExpressError", () => {
+    it("returns 401 with GOOGLE_REVOKED payload when Google token is invalid", async () => {
+      const userId = "507f1f77bcf86cd799439011";
+      jest.spyOn(userService, "pruneGoogleData").mockResolvedValue();
+      const handleGoogleRevokedSpy = jest.spyOn(
+        webSocketServer,
+        "handleGoogleRevoked",
+      );
+      handleGoogleRevokedSpy.mockImplementation(() => undefined);
+      jest.spyOn(errorHandler, "isOperational").mockReturnValue(true);
+
+      const send = jest.fn();
+      const res = {
+        header: jest.fn().mockReturnThis(),
+        status: jest.fn().mockReturnThis(),
+        send,
+      } as unknown as Parameters<typeof handleExpressError>[1];
+      const req = {
+        session: { getUserId: () => userId },
+      } as Parameters<typeof handleExpressError>[0];
+      (res as { req?: typeof req }).req = req;
+
+      await handleExpressError(req, res, invalidGrant400Error);
+
+      expect(res.status).toHaveBeenCalledWith(Status.UNAUTHORIZED);
+      expect(send).toHaveBeenCalledWith({
+        code: GOOGLE_REVOKED,
+        message: "Google access revoked. Your Google data has been removed.",
+      });
+      expect(handleGoogleRevokedSpy).toHaveBeenCalledWith(userId);
+      handleGoogleRevokedSpy.mockRestore();
+    });
+  });
 });
@@ -1,8 +1,10 @@
+import { createGoogleError } from "../../../__tests__/mocks.gcal/errors/error.google.factory";
 import { invalidGrant400Error } from "../../../__tests__/mocks.gcal/errors/error.google.invalidGrant";
 import { invalidValueError } from "../../../__tests__/mocks.gcal/errors/error.google.invalidValue";
 import { invalidSyncTokenError } from "../../../__tests__/mocks.gcal/errors/error.invalidSyncToken";
 import {
   getEmailFromUrl,
+  getGoogleErrorStatus,
   isFullSyncRequired,
   isInvalidGoogleToken,
   isInvalidValue,
@@ -18,6 +20,19 @@ describe("Google Error Parsing", () => {
   it("recognizes expired refresh token", () => {
     expect(isInvalidGoogleToken(invalidGrant400Error)).toBe(true);
   });
+  it("returns response status when present", () => {
+    expect(
+      getGoogleErrorStatus(
+        createGoogleError({ code: "500", responseStatus: 401 }),
+      ),
+    ).toBe(401);
+  });
+  it("falls back to the parsed gaxios code", () => {
+    expect(getGoogleErrorStatus(createGoogleError({ code: "410" }))).toBe(410);
+  });
+  it("returns undefined for non-google errors", () => {
+    expect(getGoogleErrorStatus(new Error("nope"))).toBeUndefined();
+  });
 });
 
 describe("Gaxios response parsing", () => {
 
@@ -42,27 +42,40 @@ export const getEmailFromUrl = (url: string) => {
 };
 
 // occurs when token expired or revoked
-export const isInvalidGoogleToken = (e: GaxiosError | Error) => {
-  const is400 = "code" in e && e.code === "400";
-  const hasInvalidMsg = "message" in e && e.message === "invalid_grant";
-  const isInvalid = is400 && hasInvalidMsg;
+export const isInvalidGoogleToken = (e: unknown) => {
+  if (!isGoogleError(e)) return false;
 
-  return isGoogleError(e) && isInvalid;
+  const err = e as GaxiosError;
+  const is400 = err.code === "400" || err.response?.status === 400;
+  const hasInvalidMsg = err.message === "invalid_grant";
+  const hasInvalidData = err.response?.data?.error === "invalid_grant";
+
+  return is400 && (hasInvalidMsg || hasInvalidData);
 };
 
 export const isGoogleError = (e: unknown) => {
-  return e instanceof GaxiosError;
+  return e instanceof GaxiosError || (e as any)?.name === "GaxiosError";
 };
 
-export const isFullSyncRequired = (e: GaxiosError | Error) => {
-  if (isGoogleError(e) && e.code) {
-    const codeStr = typeof e.code === "string" ? e.code : String(e.code);
-    if (parseInt(codeStr) === 410) {
-      return true;
-    }
+export const getGoogleErrorStatus = (e: unknown) => {
+  if (!isGoogleError(e)) return undefined;
+
+  const err = e as GaxiosError;
+  const responseStatus = err.response?.status;
+
+  if (typeof responseStatus === "number") return responseStatus;
+  if (typeof err.code === "number") return err.code;
+
+  if (typeof err.code === "string") {
+    const code = Number.parseInt(err.code, 10);
+    if (!Number.isNaN(code)) return code;
   }
 
-  return false;
+  return undefined;
+};
+
+export const isFullSyncRequired = (e: unknown) => {
+  return getGoogleErrorStatus(e) === 410;
 };
 
 export const isInvalidValue = (e: GaxiosError) => {
 
@@ -6,6 +6,7 @@ import {
   EVENT_CHANGED,
   EVENT_CHANGE_PROCESSED,
   FETCH_USER_METADATA,
+  GOOGLE_REVOKED,
   IMPORT_GCAL_END,
   IMPORT_GCAL_START,
   RESULT_IGNORED,
@@ -236,6 +237,10 @@ class WebSocketServer {
   handleBackgroundSomedayChange(userId: string) {
     return this.notifyUser(userId, SOMEDAY_EVENT_CHANGED);
   }
+
+  handleGoogleRevoked(userId: string) {
+    return this.notifyUser(userId, GOOGLE_REVOKED);
+  }
 }
 
 export const webSocketServer = new WebSocketServer();
@@ -3,7 +3,10 @@ import { randomUUID } from "node:crypto";
 import { DefaultEventsMap } from "socket.io";
 import { Socket } from "socket.io-client";
 import { faker } from "@faker-js/faker";
-import { EVENT_CHANGED } from "@core/constants/websocket.constants";
+import {
+  EVENT_CHANGED,
+  GOOGLE_REVOKED,
+} from "@core/constants/websocket.constants";
 import { Status } from "@core/errors/status.codes";
 import { Resource_Sync, XGoogleResourceState } from "@core/types/sync.types";
 import { Schema_User } from "@core/types/user.types";
@@ -23,12 +26,16 @@ import {
   cleanupTestDb,
   setupTestDb,
 } from "@backend/__tests__/helpers/mock.db.setup";
+import { invalidGrant400Error } from "@backend/__tests__/mocks.gcal/errors/error.google.invalidGrant";
 import { WatchError } from "@backend/common/errors/sync/watch.errors";
 import gcalService from "@backend/common/services/gcal/gcal.service";
 import mongoService from "@backend/common/services/mongo.service";
+import { webSocketServer } from "@backend/servers/websocket/websocket.server";
+import syncService from "@backend/sync/services/sync.service";
 import * as syncQueries from "@backend/sync/util/sync.queries";
 import { updateSync } from "@backend/sync/util/sync.queries";
 import userMetadataService from "@backend/user/services/user-metadata.service";
+import userService from "@backend/user/services/user.service";
 
 describe("SyncController", () => {
   const baseDriver = new BaseDriver();
@@ -184,6 +191,54 @@ describe("SyncController", () => {
 
       expect(response.text).toEqual("IGNORED");
     });
+
+    it("should prune Google data, notify client via websocket, and return structured response when user revokes access", async () => {
+      const { user } = await UtilDriver.setupTestUser();
+      const userId = user._id.toString();
+
+      const watch = await mongoService.watch.findOne({
+        user: userId,
+        gCalendarId: { $ne: Resource_Sync.CALENDAR },
+      });
+
+      expect(watch).toBeDefined();
+      expect(watch).not.toBeNull();
+
+      const handleGcalNotificationSpy = jest
+        .spyOn(syncService, "handleGcalNotification")
+        .mockRejectedValue(invalidGrant400Error);
+
+      const pruneGoogleDataSpy = jest
+        .spyOn(userService, "pruneGoogleData")
+        .mockResolvedValue();
+
+      const handleGoogleRevokedSpy = jest.spyOn(
+        webSocketServer,
+        "handleGoogleRevoked",
+      );
+
+      const response = await syncDriver.handleGoogleNotification(
+        {
+          resource: Resource_Sync.EVENTS,
+          channelId: watch!._id,
+          resourceId: watch!.resourceId,
+          resourceState: XGoogleResourceState.EXISTS,
+          expiration: watch!.expiration,
+        },
+        Status.GONE,
+      );
+
+      expect(response.body).toEqual({
+        code: GOOGLE_REVOKED,
+        message: "User revoked access, pruned Google data",
+      });
+      expect(pruneGoogleDataSpy).toHaveBeenCalledWith(userId);
+      expect(handleGoogleRevokedSpy).toHaveBeenCalledWith(userId);
+
+      handleGcalNotificationSpy.mockRestore();
+      pruneGoogleDataSpy.mockRestore();
+      handleGoogleRevokedSpy.mockRestore();
+    });
   });
 
   describe("importGCal: ", () => {