fix(integrations): namespace GitHub connect DI tokens to avoid collision (#2579)

Author: jonathanlab

apps/code/src/renderer/desktop-contributions.ts

@@ -1,5 +1,6 @@
 import { billingCoreModule } from "@posthog/core/billing/billing.module";
 import { inboxCoreModule } from "@posthog/core/inbox/inbox.module";
+import { githubConnectModule } from "@posthog/core/integrations/githubConnect.module";
 import { onboardingModule } from "@posthog/core/onboarding/onboarding.module";
 import { setupCoreModule } from "@posthog/core/setup/setup.module";
 import { CONTRIBUTION } from "@posthog/di/contribution";
@@ -30,6 +31,7 @@ export function registerDesktopContributions(): void {
     connectivityUiModule,
     fileWatcherUiModule,
     focusUiModule,
+    githubConnectModule,
     inboxCoreModule,
     notificationsUiModule,
     onboardingModule,

apps/code/src/renderer/desktop-services.ts

@@ -18,6 +18,8 @@ import {
 } from "@posthog/core/inbox/identifiers";
 import { selectModelFromOptions } from "@posthog/core/inbox/reportTaskCreation";
 import {
+  GITHUB_CONNECT_CLIENT as INTEGRATIONS_GITHUB_CONNECT_CLIENT,
+  type GithubConnectClient as IntegrationsGithubConnectClient,
   REPOSITORIES_CLIENT,
   REPOSITORIES_SERVICE,
   type RepositoriesClient,
@@ -52,7 +54,10 @@ import {
   type FileWatcherClient,
 } from "@posthog/ui/features/file-watcher/identifiers";
 import { GIT_CACHE_KEY_PROVIDER } from "@posthog/ui/features/git-interaction/gitCacheProvider";
-import { UiRepositoriesClient } from "@posthog/ui/features/integrations/integrationsClientImpl";
+import {
+  UiGithubConnectClient,
+  UiRepositoriesClient,
+} from "@posthog/ui/features/integrations/integrationsClientImpl";
 import { NAVIGATION_TASK_BINDER } from "@posthog/ui/features/navigation/taskBinder";
 import { navigationTaskBinder } from "@posthog/ui/features/navigation/taskBinderImpl";
 import {
@@ -134,6 +139,9 @@ container
   .toConstantValue(new OnboardingGithubConnectClient());
 
 // integrations
+container
+  .bind<IntegrationsGithubConnectClient>(INTEGRATIONS_GITHUB_CONNECT_CLIENT)
+  .toConstantValue(new UiGithubConnectClient());
 container
   .bind<RepositoriesClient>(REPOSITORIES_CLIENT)
   .toConstantValue(new UiRepositoriesClient());

apps/code/src/renderer/di/bindings.ts

@@ -42,6 +42,8 @@ import {
   type ReportModelResolver,
 } from "@posthog/core/inbox/identifiers";
 import {
+  GITHUB_CONNECT_CLIENT as INTEGRATIONS_GITHUB_CONNECT_CLIENT,
+  type GithubConnectClient as IntegrationsGithubConnectClient,
   REPOSITORIES_CLIENT,
   REPOSITORIES_SERVICE,
   type RepositoriesClient,
@@ -268,6 +270,7 @@ export interface RendererBindings {
   [REPORT_MODEL_RESOLVER]: ReportModelResolver;
   [LINEAR_OAUTH_FLOW]: LinearOAuthFlow;
   [GITHUB_CONNECT_CLIENT]: GithubConnectClient;
+  [INTEGRATIONS_GITHUB_CONNECT_CLIENT]: IntegrationsGithubConnectClient;
   [REPOSITORIES_CLIENT]: RepositoriesClient;
   [REPOSITORIES_SERVICE]: RepositoriesService;
   [HEDGEHOG_MODE_HOST]: HedgehogModeHost;

packages/core/src/integrations/githubConnect.module.ts

@@ -0,0 +1,7 @@
+import { ContainerModule } from "inversify";
+import { GithubConnectService } from "./githubConnectService";
+import { GITHUB_CONNECT_SERVICE } from "./identifiers";
+
+export const githubConnectModule = new ContainerModule(({ bind }) => {
+  bind(GITHUB_CONNECT_SERVICE).to(GithubConnectService).inSingletonScope();
+});

packages/core/src/integrations/identifiers.ts

@@ -38,9 +38,9 @@ export interface GithubConnectClient {
 }
 
 export const GITHUB_CONNECT_CLIENT = Symbol.for(
-  "posthog.core.githubConnectClient",
+  "posthog.core.integrations.githubConnectClient",
 );
 
 export const GITHUB_CONNECT_SERVICE = Symbol.for(
-  "posthog.core.githubConnectService",
+  "posthog.core.integrations.githubConnectService",
 );

packages/core/src/onboarding/identifiers.ts

@@ -3,9 +3,9 @@ export interface GithubConnectClient {
 }
 
 export const GITHUB_CONNECT_CLIENT = Symbol.for(
-  "posthog.core.githubConnectClient",
+  "posthog.core.onboarding.githubConnectClient",
 );
 
 export const GITHUB_CONNECT_SERVICE = Symbol.for(
-  "posthog.core.githubConnectService",
+  "posthog.core.onboarding.githubConnectService",
 );