cleanup methods, make private

radenkovic · radenkovic · commit 2ad854eb7d00 · 2025-09-17T16:38:23.000+02:00
diff --git a/packages/nylas-connect/README.md b/packages/nylas-connect/README.md
@@ -479,7 +479,7 @@ Hook return values (essentials):
 | connect     | (opts) => Promise<ConnectResult\|string> | Start auth flow          |
 | logout      | () => Promise<void>                      | Sign out                 |
 
-Optional: `enableDebug`, `disableDebug`, `setLogLevel`, `logger`, `connectClient`.
+Optional: `setLogLevel`, `connectClient`.
 
 ---
 
@@ -492,8 +492,6 @@ Optional: `enableDebug`, `disableDebug`, `setLogLevel`, `logger`, `connectClient
 | getAuthUrl(options?)          | Promise<{ url: string; state: string; scopes: string[] }> | Build auth URL for backend-only exchange |
 | getSession(grantId?)          | Promise<SessionData\|null>                                | Get current session                      |
 | getAccessToken(grantId?)      | Promise<string\|null>                                     | Get stored access token                  |
-| getGrantInfo(grantId?)        | Promise<GrantInfo\|null>                                  | Get stored grant info                    |
-| isConnected(grantId?)         | Promise<boolean>                                          | Is grant currently connected?            |
 | getConnectionStatus(grantId?) | Promise<ConnectionStatus>                                 | Get connection status                    |
 | logout(grantId?)              | Promise<void>                                             | Clear stored tokens and logout           |
 | onConnectStateChange(cb)      | () => void                                                | Subscribe to connect state changes       |
@@ -536,14 +534,12 @@ Method groups and when to use:
 ### Session
 
 - `getSession(grantId?)`: Read the current session for a grant.
-- `isConnected(grantId?)`: Check whether a grant is connected.
 - `getConnectionStatus(grantId?)`: Inspect connection state.
 - `logout(grantId?)`: Clear stored tokens and logout.
 
 ### Tokens & Grants
 
 - `getAccessToken(grantId?)`: Read the stored access token, if available.
-- `getGrantInfo(grantId?)`: Read grant metadata (e.g., name, email).
 
 ### Events
 
@@ -567,8 +563,6 @@ Common errors:
 <summary>Logging</summary>
 
 ```ts
-nylasConnect.enableDebug();
-nylasConnect.disableDebug();
 nylasConnect.setLogLevel("warn");
 ```
 
@@ -614,7 +608,7 @@ Symptom → Cause → Fix
 - Session not persisting → Memory-only mode or blocked storage → Set `persistTokens: true`; allow localStorage.
 - Redirect mismatch → `redirectUri` differs from Dashboard config → Ensure exact match including protocol/port/path.
 - Region errors/CORS → Wrong `apiUrl` vs account region → Use correct region base URL (US/EU) and allow domain in Dashboard.
-- Token expired → Session stale → Re-auth or refresh; check `isConnected()` and handle expiration.
+- Token expired → Session stale → Re-auth or refresh; check `getConnectionStatus()` and handle expiration.
 - Inline flow not navigating → Ensure you return early after setting `window.location.href`.
 - Connect called outside a user gesture → Browsers may block popups; call directly in a click/tap handler (avoid extra awaits first).
 
@@ -663,7 +657,7 @@ License: MIT
 When handling multiple accounts, pass a `grantId` to target a specific connection:
 
 ```ts
-const isPrimaryConnected = await nylasConnect.isConnected(primaryGrantId);
+const status = await nylasConnect.getConnectionStatus(primaryGrantId);
 const token = await nylasConnect.getAccessToken(secondaryGrantId);
 await nylasConnect.logout(primaryGrantId);
 ```
diff --git a/packages/nylas-connect/src/connect-client.test.ts b/packages/nylas-connect/src/connect-client.test.ts
@@ -137,7 +137,7 @@ describe("NylasConnect (fundamentals)", () => {
     expect(localStorage.getItem("@nylas/connect:token_g")).toBeNull();
   });
 
-  it("enableDebug() and disableDebug() control logger levels correctly", () => {
+  it("setLogLevel controls logger levels correctly", () => {
     const auth = new NylasConnect({
       clientId,
       redirectUri,
@@ -153,43 +153,7 @@ describe("NylasConnect (fundamentals)", () => {
     };
 
     try {
-      // Test enableDebug - should enable debug level logging
-      auth.enableDebug();
-
-      // Reset spies
-      Object.values(consoleSpy).forEach((spy) => spy.mockClear());
-
-      // Test that debug messages now show
-      logger.debug("test debug message");
-      logger.info("test info message");
-
-      expect(consoleSpy.log).toHaveBeenCalledWith(
-        expect.stringMatching(/\[.*\] \[NYLAS-AUTH\] \[DEBUG\]/),
-        "test debug message",
-      );
-      expect(consoleSpy.info).toHaveBeenCalledWith(
-        expect.stringMatching(/\[.*\] \[NYLAS-AUTH\] \[INFO\]/),
-        "test info message",
-      );
-
-      // Test disableDebug - should disable all logging
-      auth.disableDebug();
-
-      // Reset spies
-      Object.values(consoleSpy).forEach((spy) => spy.mockClear());
-
-      // Test that no messages show now
-      logger.debug("debug should not show");
-      logger.info("info should not show");
-      logger.warn("warn should not show");
-      logger.error("error should not show");
-
-      expect(consoleSpy.log).not.toHaveBeenCalled();
-      expect(consoleSpy.info).not.toHaveBeenCalled();
-      expect(consoleSpy.warn).not.toHaveBeenCalled();
-      expect(consoleSpy.error).not.toHaveBeenCalled();
-
-      // Test setLogLevel method
+      // Set WARN level - only warn and error messages should show
       auth.setLogLevel(LogLevel.WARN);
 
       // Reset spies
@@ -211,6 +175,18 @@ describe("NylasConnect (fundamentals)", () => {
         expect.stringMatching(/\[.*\] \[NYLAS-AUTH\] \[ERROR\]/),
         "error should show",
       );
+
+      // Disable all logs
+      auth.setLogLevel("off");
+      Object.values(consoleSpy).forEach((spy) => spy.mockClear());
+      logger.debug("debug off");
+      logger.info("info off");
+      logger.warn("warn off");
+      logger.error("error off");
+      expect(consoleSpy.log).not.toHaveBeenCalled();
+      expect(consoleSpy.info).not.toHaveBeenCalled();
+      expect(consoleSpy.warn).not.toHaveBeenCalled();
+      expect(consoleSpy.error).not.toHaveBeenCalled();
     } finally {
       // Clean up spies
       Object.values(consoleSpy).forEach((spy) => spy.mockRestore());
@@ -672,84 +648,6 @@ describe("NylasConnect (sessions, validation, and events)", () => {
     expect(localStorage.getItem("@nylas/connect:token_default")).toBeNull();
   });
 
-  it("validateToken returns true when response ok and has data", async () => {
-    const auth = new NylasConnect({
-      clientId,
-      redirectUri,
-      apiUrl: "https://api.nylas.com",
-    });
-
-    const validSession = {
-      accessToken: "t_ok",
-      idToken: "h.e.y",
-      grantId: "g_ok",
-      expiresAt: Date.now() + 60_000,
-      scope: "email",
-    };
-    localStorage.setItem(
-      "@nylas/connect:token_default",
-      JSON.stringify(validSession),
-    );
-
-    const spy = vi.fn();
-    auth.onConnectStateChange(spy);
-
-    vi.stubGlobal(
-      "fetch",
-      vi.fn().mockResolvedValue({
-        ok: true,
-        json: async () => ({ data: { grant_id: "g_ok" } }),
-      }),
-    );
-
-    const result = await auth.validateToken();
-    expect(result).toBe(true);
-    expect(spy).not.toHaveBeenCalledWith(
-      "TOKEN_VALIDATION_ERROR",
-      expect.anything(),
-      expect.anything(),
-    );
-  });
-
-  it("validateToken returns false and emits TOKEN_VALIDATION_ERROR when invalid", async () => {
-    const auth = new NylasConnect({
-      clientId,
-      redirectUri,
-      apiUrl: "https://api.nylas.com",
-    });
-
-    const session = {
-      accessToken: "t_bad",
-      idToken: "h.e.y",
-      grantId: "g_bad",
-      expiresAt: Date.now() + 60_000,
-      scope: "email",
-    };
-    localStorage.setItem(
-      "@nylas/connect:token_default",
-      JSON.stringify(session),
-    );
-
-    const spy = vi.fn();
-    auth.onConnectStateChange(spy);
-
-    vi.stubGlobal(
-      "fetch",
-      vi.fn().mockResolvedValue({
-        ok: true,
-        json: async () => ({}),
-      }),
-    );
-
-    const result = await auth.validateToken();
-    expect(result).toBe(false);
-    expect(spy).toHaveBeenCalledWith(
-      "TOKEN_VALIDATION_ERROR",
-      null,
-      expect.objectContaining({ grantId: "g_bad" }),
-    );
-  });
-
   it("onAuthStateChange unsubscribe stops subsequent emissions", async () => {
     const auth = new NylasConnect({
       clientId,
@@ -769,48 +667,6 @@ describe("NylasConnect (sessions, validation, and events)", () => {
     expect(spy).not.toHaveBeenCalled();
   });
 
-  it("getGrantInfo emits GRANT_PROFILE_LOADED with source 'token'", async () => {
-    const auth = new NylasConnect({
-      clientId,
-      redirectUri,
-      apiUrl: "https://api.nylas.com",
-    });
-
-    const grantInfo = {
-      id: "user_1",
-      email: "alice@example.com",
-      name: "Alice",
-      picture: "https://example.com/p.png",
-      provider: "google",
-      emailVerified: true,
-    };
-
-    const session = {
-      accessToken: "t",
-      idToken: "h.e.y",
-      grantId: "g1",
-      expiresAt: Date.now() + 60_000,
-      scope: "email profile",
-      grantInfo,
-    };
-    localStorage.setItem(
-      "@nylas/connect:token_default",
-      JSON.stringify(session),
-    );
-
-    const spy = vi.fn();
-    auth.onConnectStateChange(spy);
-
-    const result = await auth.getGrantInfo();
-    expect(result).toEqual(grantInfo);
-
-    expect(spy).toHaveBeenCalledWith(
-      "GRANT_PROFILE_LOADED",
-      expect.objectContaining({ grantId: "g1" }),
-      { grantInfo, source: "token" },
-    );
-  });
-
   describe("getConnectionStatus", () => {
     it("returns not_connected when no session", async () => {
       const auth = new NylasConnect({
diff --git a/packages/nylas-connect/src/connect-client.ts b/packages/nylas-connect/src/connect-client.ts
@@ -674,7 +674,7 @@ export class NylasConnect {
   /**
    * Validate an access token
    */
-  async validateToken(token?: string): Promise<boolean> {
+  private async validateToken(token?: string): Promise<boolean> {
     let accessToken = token;
     let grantId = "unknown";
 
@@ -728,32 +728,6 @@ export class NylasConnect {
     }
   }
 
-  /**
-   * Get grant information from stored token
-   */
-  async getGrantInfo(grantId?: string): Promise<GrantInfo | null> {
-    const session = await this.getSession(grantId);
-    const grantInfo = session?.grantInfo ?? null;
-
-    if (grantInfo) {
-      // Emit GRANT_PROFILE_LOADED event
-      this.triggerConnectStateChange("GRANT_PROFILE_LOADED", session, {
-        grantInfo,
-        source: "token",
-      });
-    }
-
-    return grantInfo;
-  }
-
-  /**
-   * Check if a grant is currently connected
-   */
-  async isConnected(grantId?: string): Promise<boolean> {
-    const session = await this.getSession(grantId);
-    return session !== null;
-  }
-
   /**
    * Get current connection status
    */
@@ -845,20 +819,6 @@ export class NylasConnect {
     logger.info("Grant logged out", { grantId });
   }
 
-  /**
-   * Enable debug logging
-   */
-  enableDebug(): void {
-    logger.enable();
-  }
-
-  /**
-   * Disable debug logging
-   */
-  disableDebug(): void {
-    logger.disable();
-  }
-
   /**
    * Set logging level
    * @param level - Log level: LogLevel enum values or "off"
@@ -867,40 +827,6 @@ export class NylasConnect {
     logger.setLevel(level);
   }
 
-  /**
-   * Get access to the logger instance for advanced usage
-   */
-  get logger(): Pick<
-    typeof logger,
-    | "debug"
-    | "info"
-    | "warn"
-    | "error"
-    | "log"
-    | "setLevel"
-    | "enable"
-    | "disable"
-  > {
-    return {
-      debug: logger.debug.bind(logger),
-      info: logger.info.bind(logger),
-      warn: logger.warn.bind(logger),
-      error: logger.error.bind(logger),
-      log: logger.log.bind(logger),
-      setLevel: logger.setLevel.bind(logger),
-      enable: logger.enable.bind(logger),
-      disable: logger.disable.bind(logger),
-    };
-  }
-
-  /**
-   * Check if automatic callback handling is enabled
-   * @returns true if auto callback handling is enabled
-   */
-  isAutoCallbackEnabled(): boolean {
-    return this.config.autoHandleCallback;
-  }
-
   /**
    * Check if defaultScopes is configured as provider-specific
    */
