Skip to content

Commit 6ead9b4

Browse files
fix merge
1 parent ca55a9a commit 6ead9b4

5 files changed

Lines changed: 4 additions & 6 deletions

File tree

docs/snippets/schemas/v3/index.schema.mdx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7145,8 +7145,6 @@
71457145
},
71467146
{
71477147
"type": "array",
7148-
"deprecated": true,
7149-
"description": "Deprecated. Use the object form keyed by id instead.",
71507148
"items": {
71517149
"$schema": "http://json-schema.org/draft-07/schema#",
71527150
"title": "IdentityProviderConfig",

packages/backend/src/ee/accountPermissionSyncer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ export class AccountPermissionSyncer {
220220
) {
221221
const config = await loadConfig(env.CONFIG_PATH);
222222

223-
logger.info(`Syncing permissions for ${account.providerId} account (id: ${account.id}) for user ${account.user.email}...`);
223+
logger.debug(`Syncing permissions for ${account.providerId} account (id: ${account.id}) for user ${account.user.email}...`);
224224

225225
// Ensure the OAuth token is fresh, refreshing it if it is expired or near expiry.
226226
//
@@ -408,7 +408,7 @@ export class AccountPermissionSyncer {
408408
}
409409
});
410410

411-
logger.info(`Permissions synced for ${account.providerId} account (id: ${account.id}) for user ${account.user.email}`);
411+
logger.debug(`Permissions synced for ${account.providerId} account (id: ${account.id}) for user ${account.user.email}`);
412412
}
413413

414414
private async onJobFailed(job: Job<AccountPermissionSyncJob> | undefined, err: Error) {

packages/db/prisma/migrations/20260504230838_add_provider_id_and_type_to_account/migration.sql renamed to packages/db/prisma/migrations/20260530203443_add_provider_id_and_type_to_account/migration.sql

File renamed without changes.

packages/schemas/src/v3/index.schema.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7144,8 +7144,6 @@ const schema = {
71447144
},
71457145
{
71467146
"type": "array",
7147-
"deprecated": true,
7148-
"description": "Deprecated. Use the object form keyed by id instead.",
71497147
"items": {
71507148
"$schema": "http://json-schema.org/draft-07/schema#",
71517149
"title": "IdentityProviderConfig",

packages/web/src/app/login/components/loginForm.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { Card } from "@/components/ui/card";
55
import { SourcebotLogo } from "@/app/components/sourcebotLogo";
66
import { AuthMethodSelector } from "@/app/components/authMethodSelector";
77
import useCaptureEvent from "@/hooks/useCaptureEvent";
8+
import { useIdentityProviders } from "@/features/auth/useIdentityProviders";
89
import Link from "next/link";
910

1011
interface LoginFormProps {
@@ -17,6 +18,7 @@ interface LoginFormProps {
1718

1819
export const LoginForm = ({ callbackUrl, error, context, isAnonymousAccessEnabled = false, hideSecurityNotice = false }: LoginFormProps) => {
1920
const captureEvent = useCaptureEvent();
21+
const providers = useIdentityProviders();
2022

2123
const safeCallbackUrl = useMemo(() => {
2224
if (!callbackUrl) return "/";

0 commit comments

Comments
 (0)