fixed merge conflict

Author: brendan-kellam

packages/web/src/app/signup/page.tsx

@@ -4,7 +4,6 @@ import { redirect } from "next/navigation";
 import { Footer } from "@/app/components/footer";
 import { getIdentityProviderMetadata } from "@/lib/identityProviders";
 import { createLogger } from "@sourcebot/shared";
-import { getAuthProviders } from "@/lib/authProviders";
 import { getOrgFromDomain } from "@/data/org";
 import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 

packages/web/src/ee/features/permissionSyncing/actions.ts

@@ -1,10 +1,9 @@
 'use server';
 
 import { sew } from "@/actions";
-import { createLogger } from "@sourcebot/logger";
+import { createLogger, env } from "@sourcebot/shared";
 import { withAuthV2, withMinimumOrgRole } from "@/withAuthV2";
 import { loadConfig } from "@sourcebot/shared";
-import { env } from "@/env.mjs";
 import { OrgRole } from "@sourcebot/db";
 import { cookies } from "next/headers";
 import { OPTIONAL_PROVIDERS_LINK_SKIPPED_COOKIE_NAME } from "@/lib/constants";

packages/web/src/ee/features/permissionSyncing/tokenRefresh.ts

@@ -1,7 +1,5 @@
 import { loadConfig } from "@sourcebot/shared";
-import { env } from "@/env.mjs";
-import { createLogger } from "@sourcebot/logger";
-import { getTokenFromConfig } from '@sourcebot/crypto';
+import { getTokenFromConfig, createLogger, env } from "@sourcebot/shared";
 import { GitHubIdentityProviderConfig, GitLabIdentityProviderConfig } from "@sourcebot/schemas/v3/index.type";
 import { LinkedAccountTokensMap } from "@/auth"
 const { prisma } = await import('@/prisma');

packages/web/src/ee/features/sso/sso.ts

@@ -1,21 +1,18 @@
-import { env } from "@sourcebot/shared";
-import GitHub from "next-auth/providers/github";
-import Google from "next-auth/providers/google";
-import Okta from "next-auth/providers/okta";
-import Keycloak from "next-auth/providers/keycloak";
-import Gitlab from "next-auth/providers/gitlab";
-import MicrosoftEntraID from "next-auth/providers/microsoft-entra-id";
+import type { IdentityProvider } from "@/auth";
+import { onCreateUser } from "@/lib/authUtils";
 import { prisma } from "@/prisma";
+import { GCPIAPIdentityProviderConfig, GitHubIdentityProviderConfig, GitLabIdentityProviderConfig, GoogleIdentityProviderConfig, KeycloakIdentityProviderConfig, MicrosoftEntraIDIdentityProviderConfig, OktaIdentityProviderConfig } from "@sourcebot/schemas/v3/index.type";
+import { createLogger, env, getTokenFromConfig, hasEntitlement, loadConfig } from "@sourcebot/shared";
 import { OAuth2Client } from "google-auth-library";
-import Credentials from "next-auth/providers/credentials";
 import type { User as AuthJsUser } from "next-auth";
 import type { Provider } from "next-auth/providers";
-import { onCreateUser } from "@/lib/authUtils";
-import { hasEntitlement, loadConfig } from "@sourcebot/shared";
-import { getTokenFromConfig } from "@sourcebot/crypto";
-import type { IdentityProvider } from "@/auth";
-import { GCPIAPIdentityProviderConfig, GitHubIdentityProviderConfig, GitLabIdentityProviderConfig, GoogleIdentityProviderConfig, KeycloakIdentityProviderConfig, MicrosoftEntraIDIdentityProviderConfig, OktaIdentityProviderConfig } from "@sourcebot/schemas/v3/index.type";
-import { createLogger } from "@sourcebot/shared";
+import Credentials from "next-auth/providers/credentials";
+import GitHub from "next-auth/providers/github";
+import Gitlab from "next-auth/providers/gitlab";
+import Google from "next-auth/providers/google";
+import Keycloak from "next-auth/providers/keycloak";
+import MicrosoftEntraID from "next-auth/providers/microsoft-entra-id";
+import Okta from "next-auth/providers/okta";
 
 const logger = createLogger('web-sso');
 

packages/web/src/features/chat/actions.ts

@@ -1,7 +1,6 @@
 'use server';
 
 import { sew, withAuth, withOrgMembership } from "@/actions";
-import { env } from "@sourcebot/shared";
 import { SOURCEBOT_GUEST_USER_ID } from "@/lib/constants";
 import { ErrorCode } from "@/lib/errorCodes";
 import { chatIsReadonly, notFound, ServiceError, serviceErrorResponse } from "@/lib/serviceError";
@@ -20,9 +19,8 @@ import { LanguageModelV2 as AISDKLanguageModelV2 } from "@ai-sdk/provider";
 import { createXai } from '@ai-sdk/xai';
 import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
 import { createOpenRouter } from '@openrouter/ai-sdk-provider';
-import { getTokenFromConfig } from "@sourcebot/shared";
+import { getTokenFromConfig, createLogger, env } from "@sourcebot/shared";
 import { ChatVisibility, OrgRole, Prisma } from "@sourcebot/db";
-import { createLogger } from "@sourcebot/logger";
 import { LanguageModel } from "@sourcebot/schemas/v3/languageModel.type";
 import { Token } from "@sourcebot/schemas/v3/shared.type";
 import { generateText, JSONValue, extractReasoningMiddleware, wrapLanguageModel } from "ai";