Feat baa

package.json

@@ -20,7 +20,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@8e7decc",
+        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@6eabe7e",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@df765cc",
         "@appwrite.io/pink-legacy": "^1.0.3",

src/lib/actions/analytics.ts

@@ -426,6 +426,8 @@ export enum Submit {
     MessagingTopicSubscriberDelete = 'submit_messaging_topic_subscriber_delete',
     ApplyQuickFilter = 'submit_apply_quick_filter',
     RequestBAA = 'submit_request_baa',
+    BAAAddonEnable = 'submit_baa_addon_enable',
+    BAAAddonDisable = 'submit_baa_addon_disable',
     RequestSoc2 = 'submit_request_soc2',
     SiteCreate = 'submit_site_create',
     SiteDelete = 'submit_site_delete',

src/lib/constants.ts

@@ -85,7 +85,8 @@ export enum Dependencies {
     MESSAGING_TOPIC_SUBSCRIBERS = 'dependency:messaging_topic_subscribers',
     SITE = 'dependency:site',
     SITES = 'dependency:sites',
-    SITES_DOMAINS = 'dependency:sites_domains'
+    SITES_DOMAINS = 'dependency:sites_domains',
+    ADDONS = 'dependency:addons'
 }
 
 export const defaultScopes: string[] = [

src/routes/(console)/organization-[organization]/billing/+page.ts

@@ -25,6 +25,7 @@ export const load: PageLoad = async ({ parent, depends, url, route }) => {
     depends(Dependencies.CREDIT);
     depends(Dependencies.INVOICES);
     depends(Dependencies.ADDRESS);
+    depends(Dependencies.ADDONS);
     // aggregation reloads on page param changes
     depends(Dependencies.BILLING_AGGREGATION);
 

src/routes/(console)/organization-[organization]/billing/planSummary.svelte

@@ -247,8 +247,17 @@
         };
 
         // addons (additional members, projects, etc.)
+        const billingAddonNames: Record<string, string> = {
+            addon_baa: 'BAA Agreement'
+        };
+
         const addons = (currentAggregation?.resources || [])
-            .filter((r) => r.amount > 0 && currentPlan?.addons?.[r.resourceId]?.price > 0)
+            .filter(
+                (r) =>
+                    r.amount > 0 &&
+                    (currentPlan?.addons?.[r.resourceId]?.price > 0 ||
+                        r.resourceId.startsWith('addon_'))
+            )
             .map((addon) => ({
                 id: `addon-${addon.resourceId}`,
                 expandable: false,
@@ -258,7 +267,8 @@
                             ? 'Additional members'
                             : addon.resourceId === 'projects'
                               ? 'Additional projects'
-                              : `${addon.resourceId} overage (${formatNum(addon.value)})`,
+                              : billingAddonNames[addon.resourceId] ??
+                                `${addon.resourceId} overage (${formatNum(addon.value)})`,
                     usage: '',
                     price: formatCurrency(addon.amount)
                 },

src/routes/(console)/organization-[organization]/settings/+page.svelte

@@ -6,9 +6,11 @@
     import { sdk } from '$lib/stores/sdk';
     import { members, organization } from '$lib/stores/organization';
     import { projects } from '../store';
-    import { invalidate } from '$app/navigation';
+    import { goto, invalidate } from '$app/navigation';
+    import { resolve } from '$app/paths';
     import { Dependencies } from '$lib/constants';
     import { onMount } from 'svelte';
+    import { page } from '$app/state';
     import Delete from './deleteOrganizationModal.svelte';
     import DownloadDPA from './downloadDPA.svelte';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
@@ -22,8 +24,77 @@
     let name: string;
     let showDelete = false;
 
-    onMount(() => {
+    onMount(async () => {
         name = $organization.name;
+
+        if (page.url.searchParams.get('type') === 'validate-addon') {
+            let addonId = page.url.searchParams.get('addonId');
+
+            // Fall back to listing addons if addonId is missing or invalid
+            if (!addonId || addonId === 'undefined') {
+                try {
+                    const addons = await sdk.forConsole.organizations.listAddons({
+                        organizationId: $organization.$id
+                    });
+                    const pending = addons.addons.find(
+                        (a) => a.key === 'baa' && a.status === 'pending'
+                    );
+                    addonId = pending?.$id ?? null;
+                } catch {
+                    addonId = null;
+                }
+            }
+
+            if (addonId) {
+                try {
+                    await sdk.forConsole.organizations.validateToggleAddonPayment({
+                        organizationId: $organization.$id,
+                        addonId
+                    });
+                    await Promise.all([
+                        invalidate(Dependencies.ADDONS),
+                        invalidate(Dependencies.ORGANIZATION)
+                    ]);
+                    addNotification({
+                        message: 'BAA addon has been enabled',
+                        type: 'success'
+                    });
+                } catch (e) {
+                    // If addon not found, payment webhook may have already activated it
+                    if (e?.type === 'addon_not_found' || e?.code === 404) {
+                        await Promise.all([
+                            invalidate(Dependencies.ADDONS),
+                            invalidate(Dependencies.ORGANIZATION)
+                        ]);
+                        addNotification({
+                            message: 'BAA addon has been enabled',
+                            type: 'success'
+                        });
+                    } else {
+                        addNotification({
+                            message: e.message,
+                            type: 'error'
+                        });
+                    }
+                }
+            } else {
+                // No pending addon found — likely already activated by webhook
+                await Promise.all([
+                    invalidate(Dependencies.ADDONS),
+                    invalidate(Dependencies.ORGANIZATION)
+                ]);
+                addNotification({
+                    message: 'BAA addon has been enabled',
+                    type: 'success'
+                });
+            }
+
+            const settingsUrl = resolve(
+                '/(console)/organization-[organization]/settings',
+                { organization: $organization.$id }
+            );
+            await goto(settingsUrl, { replaceState: true });
+        }
     });
 
     async function updateName() {
@@ -75,7 +146,7 @@
 
         {#if isCloud}
             <DownloadDPA />
-            <Baa locale={data.locale} countryList={data.countryList} />
+            <Baa addons={data.addons} />
             <Soc2 locale={data.locale} countryList={data.countryList} />
         {/if}
 

src/routes/(console)/organization-[organization]/settings/+page.ts

@@ -7,21 +7,30 @@ import { isCloud } from '$lib/system';
 export const load: PageLoad = async ({ depends, params, parent }) => {
     const { countryList, locale } = await parent();
     depends(Dependencies.ORGANIZATION);
+    depends(Dependencies.ADDONS);
 
-    const [projects, invoices] = await Promise.all([
+    const [projects, invoices, addons] = await Promise.all([
         sdk.forConsole.projects.list({
             queries: [Query.equal('teamId', params.organization), Query.select(['$id', 'name'])]
         }),
         isCloud
             ? sdk.forConsole.organizations.listInvoices({
                   organizationId: params.organization
               })
-            : undefined
+            : undefined,
+        isCloud
+            ? sdk.forConsole.organizations
+                  .listAddons({
+                      organizationId: params.organization
+                  })
+                  .catch(() => null)
+            : null
     ]);
 
     return {
         projects,
         invoices,
+        addons,
         countryList,
         locale
     };