The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
chore: prevention of used leaked passwords entitlement (#43410)
Ignacio Dobronichebec20f5428c
diff --git a/apps/studio/components/interfaces/Auth/AuthProvidersForm/AuthProvidersForm.types.ts b/apps/studio/components/interfaces/Auth/AuthProvidersForm/AuthProvidersForm.types.tsindex af4bcc95c19..32667230f54 100644--- a/apps/studio/components/interfaces/Auth/AuthProvidersForm/AuthProvidersForm.types.ts+++ b/apps/studio/components/interfaces/Auth/AuthProvidersForm/AuthProvidersForm.types.ts@@ -1,3 +1,5 @@+import type { FeatureKey } from 'data/entitlements/entitlements-query'+export interface Enum {label: stringvalue: string@@ -22,7 +24,7 @@ export interface Provider {descriptionOptional?: stringunits?: stringisSecret?: boolean- isPaid?: boolean+ entitlementKey?: FeatureKeylink?: string}}diff --git a/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsx b/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsxindex 594b16b7d37..160a08f3cd2 100644--- a/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsx+++ b/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsx@@ -7,6 +7,7 @@ import { ResourceItem } from 'components/ui/Resource/ResourceItem'import type { components } from 'data/api'import { useAuthConfigUpdateMutation } from 'data/auth/auth-config-update-mutation'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'+import { useHasEntitlementAccess } from 'hooks/misc/useCheckEntitlements'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { BASE_PATH } from 'lib/constants'import { Check } from 'lucide-react'@@ -67,7 +68,7 @@ export const ProviderForm = ({ config, provider, isActive }: ProviderFormProps))}- const isFreePlan = organization?.plan.id === 'free'+ const hasEntitlementAccess = useHasEntitlementAccess()const INITIAL_VALUES = (() => {const initialValues: { [x: string]: string | boolean } = {}@@ -201,18 +202,17 @@ export const ProviderForm = ({ config, provider, isActive }: ProviderFormProps))}+ const { entitlementKey } = provider.properties[x]+ const hasAccess =+ entitlementKey == null || hasEntitlementAccess(entitlementKey)const properties = {...provider.properties[x],- description:- provider.properties[x].isPaid && isFreePlan- ? `${description} Only available on [Pro plan](/org/${organization.slug}/billing?panel=subscriptionPlan) and above.`- : description,+ description: hasAccess+ ? description+ : `${description} Only available on [Pro plan](/org/${organization?.slug}/billing?panel=subscriptionPlan) and above.`,}- const isDisabledDueToPlan = properties.isPaid && isFreePlanconst shouldDisable =- properties.type === 'boolean'- ? isDisabledDueToPlan && !values[x]- : isDisabledDueToPlan+ properties.type === 'boolean' ? !hasAccess && !values[x] : !hasAccessreturn (<FormFielddiff --git a/apps/studio/components/interfaces/Auth/AuthProvidersFormValidation.tsx b/apps/studio/components/interfaces/Auth/AuthProvidersFormValidation.tsxindex baf676418c3..2c6613140e5 100644--- a/apps/studio/components/interfaces/Auth/AuthProvidersFormValidation.tsx+++ b/apps/studio/components/interfaces/Auth/AuthProvidersFormValidation.tsx@@ -38,7 +38,7 @@ const PROVIDER_EMAIL = {'Rejects the use of known or easy to guess passwords on sign up or password change. Powered by the HaveIBeenPwned.org Pwned Passwords API.',type: 'boolean',link: `${DOCS_URL}/guides/auth/password-security#password-strength-and-leaked-password-protection`,- isPaid: true,+ entitlementKey: 'auth.password_hibp',},PASSWORD_MIN_LENGTH: {title: 'Minimum password length',diff --git a/apps/studio/hooks/misc/useCheckEntitlements.ts b/apps/studio/hooks/misc/useCheckEntitlements.tsindex 430eac85422..12d258b8cdd 100644--- a/apps/studio/hooks/misc/useCheckEntitlements.ts+++ b/apps/studio/hooks/misc/useCheckEntitlements.ts@@ -6,7 +6,7 @@ import type {} from 'data/entitlements/entitlements-query'import { useEntitlementsQuery } from 'data/entitlements/entitlements-query'import { IS_PLATFORM } from 'lib/constants'-import { useMemo } from 'react'+import { useCallback, useMemo } from 'react'import { useSelectedOrganizationQuery } from './useSelectedOrganization'function isNumericConfig(@@ -61,6 +61,26 @@ function getEntitlementMax(entitlement: Entitlement | null): number | undefined: getEntitlementNumericValue(entitlement)}+export function useHasEntitlementAccess(organizationSlug?: string) {+ const shouldGetSelectedOrg = !organizationSlug+ const { data: selectedOrg } = useSelectedOrganizationQuery({+ enabled: shouldGetSelectedOrg,+ })++ const finalOrgSlug = organizationSlug || selectedOrg?.slug+ const enabled = IS_PLATFORM && !!finalOrgSlug++ const { data: entitlementsData } = useEntitlementsQuery({ slug: finalOrgSlug! }, { enabled })++ return useCallback(+ (key: string) =>+ IS_PLATFORM+ ? entitlementsData?.entitlements.find((e) => e.feature.key === key)?.hasAccess ?? false+ : true,+ [entitlementsData]+ )+}+export function useCheckEntitlements(featureKey: FeatureKey,organizationSlug?: string,