From 169e709b349b011f2b76150ce5dfa80a64cfe3f0 Mon Sep 17 00:00:00 2001 From: bkellam Date: Tue, 4 Nov 2025 20:36:21 -0800 Subject: [PATCH] fixed merge conflict --- packages/web/src/app/signup/page.tsx | 1 - .../ee/features/permissionSyncing/actions.ts | 3 +-- .../permissionSyncing/tokenRefresh.ts | 4 +-- packages/web/src/ee/features/sso/sso.ts | 25 ++++++++----------- packages/web/src/features/chat/actions.ts | 4 +-- 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/packages/web/src/app/signup/page.tsx b/packages/web/src/app/signup/page.tsx index 2ca0b868..fe84e3d9 100644 --- a/packages/web/src/app/signup/page.tsx +++ b/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"; diff --git a/packages/web/src/ee/features/permissionSyncing/actions.ts b/packages/web/src/ee/features/permissionSyncing/actions.ts index 95667027..a52b0c3e 100644 --- a/packages/web/src/ee/features/permissionSyncing/actions.ts +++ b/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"; diff --git a/packages/web/src/ee/features/permissionSyncing/tokenRefresh.ts b/packages/web/src/ee/features/permissionSyncing/tokenRefresh.ts index f6ebef06..7d2c69eb 100644 --- a/packages/web/src/ee/features/permissionSyncing/tokenRefresh.ts +++ b/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'); diff --git a/packages/web/src/ee/features/sso/sso.ts b/packages/web/src/ee/features/sso/sso.ts index aca340bf..a0fe415c 100644 --- a/packages/web/src/ee/features/sso/sso.ts +++ b/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'); diff --git a/packages/web/src/features/chat/actions.ts b/packages/web/src/features/chat/actions.ts index 58931d83..86f86301 100644 --- a/packages/web/src/features/chat/actions.ts +++ b/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";