ti.sil/sourcebot
1
0
Fork 0
mirror of https://github.com/sourcebot-dev/sourcebot.git synced 2025-12-14 21:35:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed merge conflict

Browse source
This commit is contained in:
bkellam 2025-11-04 20:36:21 -08:00
parent 938d2dca4c
commit 169e709b34
5 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/web/src/app/signup/page.tsx
View file

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

3
packages/web/src/ee/features/permissionSyncing/actions.ts
View file

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

4
packages/web/src/ee/features/permissionSyncing/tokenRefresh.ts
View file

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

25
packages/web/src/ee/features/sso/sso.ts
View file

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

4
packages/web/src/features/chat/actions.ts
View file

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