@capgo/cli 4.3.0 → 4.3.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.3.2](https://github.com/Cap-go/CLI/compare/v4.3.1...v4.3.2) (2024-04-14)
+
+### [4.3.1](https://github.com/Cap-go/CLI/compare/v4.3.0...v4.3.1) (2024-04-14)
+
 ## [4.3.0](https://github.com/Cap-go/CLI/compare/v4.2.12...v4.3.0) (2024-03-31)
 
 

package/dist/index.js

@@ -91634,7 +91634,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.3.0",
+  version: "4.3.2",
   description: "A CLI to upload to capgo servers",
   main: "dist/index.js",
   bin: {
@@ -92884,16 +92884,16 @@ async function checkKey(supabase, apikey, keymode) {
     program.error("");
   }
 }
-async function isPaying(supabase, userId) {
-  const { data } = await supabase.rpc("is_paying", { userid: userId }).single();
+async function isPayingOrg(supabase, orgId) {
+  const { data } = await supabase.rpc("is_paying_org", { orgid: orgId }).single();
   return data || false;
 }
-async function isTrial(supabase, userId) {
-  const { data } = await supabase.rpc("is_trial", { userid: userId }).single();
+async function isTrialOrg(supabase, orgId) {
+  const { data } = await supabase.rpc("is_trial_org", { orgid: orgId }).single();
   return data || 0;
 }
-async function isAllowedAction(supabase, userId) {
-  const { data } = await supabase.rpc("is_allowed_action_user", { userid: userId }).single();
+async function isAllowedActionOrg(supabase, orgId) {
+  const { data } = await supabase.rpc("is_allowed_action_org", { orgid: orgId }).single();
   return !!data;
 }
 async function isAllowedActionAppIdApiKey(supabase, appId, apikey) {
@@ -92993,9 +92993,9 @@ async function isAllowedAppOrg(supabase, apikey, appId) {
     error: functionError
   };
 }
-async function checkPlanValid(supabase, userId, apikey, appId, warning = true) {
+async function checkPlanValid(supabase, orgId, apikey, appId, warning = true) {
   const config = await getRemoteConfig();
-  const validPlan = await (appId ? isAllowedActionAppIdApiKey(supabase, appId, apikey) : isAllowedAction(supabase, userId));
+  const validPlan = await (appId ? isAllowedActionAppIdApiKey(supabase, appId, apikey) : isAllowedActionOrg(supabase, orgId));
   if (!validPlan) {
     f2.error(`You need to upgrade your plan to continue to use capgo.
  Upgrade here: ${config.hostWeb}/dashboard/settings/plans
@@ -93007,8 +93007,10 @@ async function checkPlanValid(supabase, userId, apikey, appId, warning = true) {
     wait(500);
     program.error("");
   }
-  const trialDays = await isTrial(supabase, userId);
-  const ispaying = await isPaying(supabase, userId);
+  const [trialDays, ispaying] = await Promise.all([
+    isTrialOrg(supabase, orgId),
+    isPayingOrg(supabase, orgId)
+  ]);
   if (trialDays > 0 && warning && !ispaying)
     f2.warn(`WARNING !!
 Trial expires in ${trialDays} days, upgrade here: ${config.hostWeb}/dashboard/settings/plans
@@ -93119,6 +93121,15 @@ async function verifyUser(supabase, apikey, keymod = ["all"]) {
   }
   return userId;
 }
+async function getOrganizationId(supabase, appId) {
+  const { data, error } = await supabase.from("apps").select("owner_org").eq("app_id", appId).single();
+  if (!data || error) {
+    f2.error(`Cannot get organization id for app id ${appId}`);
+    formatError(error);
+    program.error("");
+  }
+  return data.owner_org;
+}
 async function requireUpdateMetadata(supabase, channel2, appId) {
   const { data, error } = await supabase.from("channels").select("disableAutoUpdate").eq("name", channel2).eq("app_id", appId).limit(1);
   if (error) {
@@ -94011,7 +94022,8 @@ async function uploadBundle(appid, options, shouldExit = true) {
   const supabase = await createSupabaseClient(options.apikey);
   const userId = await verifyUser(supabase, options.apikey, ["write", "all", "upload"]);
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, 2 /* upload */);
-  await checkPlanValid(supabase, userId, options.apikey, appid, true);
+  const orgId = await getOrganizationId(supabase, appid);
+  await checkPlanValid(supabase, orgId, options.apikey, appid, true);
   const updateMetadataRequired = await requireUpdateMetadata(supabase, channel2, appid);
   const { data: channelData, error: channelError } = await supabase.from("channels").select("version ( minUpdateVersion, native_packages )").eq("name", channel2).eq("app_id", appid).single();
   let localDependencies = void 0;
@@ -94065,11 +94077,11 @@ async function uploadBundle(appid, options, shouldExit = true) {
       program.error("");
     }
   }
-  const { data: isTrial2, error: isTrialsError } = await supabase.rpc("is_trial", { userid: userId }).single();
-  if (isTrial2 && isTrial2 > 0 || isTrialsError) {
+  const { data: isTrial, error: isTrialsError } = await supabase.rpc("is_trial_org", { orgid: orgId }).single();
+  if (isTrial && isTrial > 0 || isTrialsError) {
     f2.warn(`WARNING !!
-Trial expires in ${isTrial2} days`);
-    f2.warn(`Upgrade here: ${localConfig.hostWeb}/dashboard/settings/plans`);
+Trial expires in ${isTrial} days`);
+    f2.warn(`Upgrade here: ${localConfig.hostWeb}/dashboard/settings/plans?oid=${orgId}`);
   }
   const { data: appVersion, error: appVersionError } = await supabase.rpc("exist_app_versions", { appid, apikey: options.apikey, name_version: bundle2 }).single();
   if (appVersion || appVersionError) {
@@ -94483,7 +94495,6 @@ async function addApp(appId, options, throwErr = true) {
   }
   const supabase = await createSupabaseClient(options.apikey);
   let userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
-  await checkPlanValid(supabase, userId, options.apikey, void 0, false);
   const appExist = await checkAppExists(supabase, appId);
   if (throwErr && appExist) {
     f2.error(`App ${appId} already exist`);
@@ -94512,6 +94523,7 @@ async function addApp(appId, options, throwErr = true) {
   const organization = allOrganizations.find((org) => org.gid === organizationUid);
   userId = organization.created_by;
   f2.info(`Using the organization "${organization.name}" as the app owner`);
+  await checkPlanValid(supabase, organizationUid, options.apikey, void 0, false);
   let { name, icon } = options;
   appId = appId || config?.app?.appId;
   name = name || config?.app?.appName || "Unknown";
@@ -95173,6 +95185,7 @@ async function setChannel(channel2, appId, options) {
   const supabase = await createSupabaseClient(options.apikey);
   const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, 4 /* admin */);
+  const orgId = await getOrganizationId(supabase, appId);
   const { bundle: bundle2, latest, downgrade, upgrade, ios, android, selfAssign, state, disableAutoUpdate } = options;
   if (!channel2) {
     f2.error("Missing argument, you need to provide a channel");
@@ -95187,7 +95200,7 @@ async function setChannel(channel2, appId, options) {
     program.error("");
   }
   try {
-    await checkPlanValid(supabase, userId, options.apikey, appId);
+    await checkPlanValid(supabase, orgId, options.apikey, appId);
     const channelPayload = {
       created_by: userId,
       app_id: appId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.3.0",
+  "version": "4.3.2",
   "description": "A CLI to upload to capgo servers",
   "main": "dist/index.js",
   "bin": {

package/src/app/add.ts

@@ -39,8 +39,6 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
 
   let userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
 
-  await checkPlanValid(supabase, userId, options.apikey, undefined, false)
-
   // Check we have app access to this appId
   const appExist = await checkAppExists(supabase, appId)
   if (throwErr && appExist) {
@@ -82,6 +80,8 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
 
   p.log.info(`Using the organization "${organization.name}" as the app owner`)
 
+  await checkPlanValid(supabase, organizationUid, options.apikey, undefined, false)
+
   let { name, icon } = options
   appId = appId || config?.app?.appId
   name = name || config?.app?.appName || 'Unknown'

package/src/bundle/unlink.ts

@@ -15,6 +15,7 @@ import {
   findSavedKey,
   formatError,
   getConfig,
+  getOrganizationId,
   useLogSnag,
   verifyUser,
 } from '../utils'
@@ -47,7 +48,11 @@ export async function unlinkDevice(channel: string, appId: string, options: Opti
   }
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['all', 'write'])
+  const [userId, orgId] = await Promise.all([
+    verifyUser(supabase, options.apikey, ['all', 'write']),
+    getOrganizationId(supabase, appId),
+  ])
+
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.write)
 
@@ -56,7 +61,7 @@ export async function unlinkDevice(channel: string, appId: string, options: Opti
     program.error('')
   }
   try {
-    await checkPlanValid(supabase, userId, options.apikey, appId)
+    await checkPlanValid(supabase, orgId, options.apikey, appId)
 
     const versionData = await getVersionData(supabase, appId, bundle)
     await checkVersionNotUsedInChannel(supabase, appId, versionData)

package/src/bundle/upload.ts

@@ -32,6 +32,7 @@ import {
   getConfig,
   getLocalConfig,
   getLocalDepenencies,
+  getOrganizationId,
   hasOrganizationPerm,
   regexSemver,
   requireUpdateMetadata,
@@ -149,7 +150,10 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   // await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appid);
 
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, OrganizationPerm.upload)
-  await checkPlanValid(supabase, userId, options.apikey, appid, true)
+
+  // Now if it does exist we will fetch the org id
+  const orgId = await getOrganizationId(supabase, appid)
+  await checkPlanValid(supabase, orgId, options.apikey, appid, true)
 
   const updateMetadataRequired = await requireUpdateMetadata(supabase, channel, appid)
 
@@ -227,11 +231,12 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   }
 
   const { data: isTrial, error: isTrialsError } = await supabase
-    .rpc('is_trial', { userid: userId })
+    .rpc('is_trial_org', { orgid: orgId })
     .single()
   if ((isTrial && isTrial > 0) || isTrialsError) {
+    // TODO: Come back to this to fix for orgs v3
     p.log.warn(`WARNING !!\nTrial expires in ${isTrial} days`)
-    p.log.warn(`Upgrade here: ${localConfig.hostWeb}/dashboard/settings/plans`)
+    p.log.warn(`Upgrade here: ${localConfig.hostWeb}/dashboard/settings/plans?oid=${orgId}`)
   }
 
   // check if app already exist

package/src/channel/set.ts

@@ -13,6 +13,7 @@ import {
   findSavedKey,
   formatError,
   getConfig,
+  getOrganizationId,
   updateOrCreateChannel,
   useLogSnag,
   verifyUser,
@@ -53,6 +54,7 @@ export async function setChannel(channel: string, appId: string, options: Option
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.admin)
+  const orgId = await getOrganizationId(supabase, appId)
 
   const { bundle, latest, downgrade, upgrade, ios, android, selfAssign, state, disableAutoUpdate } = options
   if (!channel) {
@@ -76,7 +78,7 @@ export async function setChannel(channel: string, appId: string, options: Option
     program.error('')
   }
   try {
-    await checkPlanValid(supabase, userId, options.apikey, appId)
+    await checkPlanValid(supabase, orgId, options.apikey, appId)
     const channelPayload: Database['public']['Tables']['channels']['Insert'] = {
       created_by: userId,
       app_id: appId,

package/src/types/supabase.types.ts

@@ -7,6 +7,31 @@ export type Json =
   | Json[]
 
 export interface Database {
+  graphql_public: {
+    Tables: {
+      [_ in never]: never
+    }
+    Views: {
+      [_ in never]: never
+    }
+    Functions: {
+      graphql: {
+        Args: {
+          operationName?: string
+          query?: string
+          variables?: Json
+          extensions?: Json
+        }
+        Returns: Json
+      }
+    }
+    Enums: {
+      [_ in never]: never
+    }
+    CompositeTypes: {
+      [_ in never]: never
+    }
+  }
   public: {
     Tables: {
       apikeys: {
@@ -44,78 +69,12 @@ export interface Database {
           },
         ]
       }
-      app_stats: {
-        Row: {
-          app_id: string
-          bandwidth: number
-          channels: number
-          created_at: string | null
-          date_id: string
-          devices: number
-          devices_real: number
-          mlu: number
-          mlu_real: number
-          shared: number
-          updated_at: string | null
-          user_id: string
-          version_size: number
-          versions: number
-        }
-        Insert: {
-          app_id: string
-          bandwidth?: number
-          channels?: number
-          created_at?: string | null
-          date_id?: string
-          devices?: number
-          devices_real?: number
-          mlu?: number
-          mlu_real?: number
-          shared?: number
-          updated_at?: string | null
-          user_id: string
-          version_size?: number
-          versions?: number
-        }
-        Update: {
-          app_id?: string
-          bandwidth?: number
-          channels?: number
-          created_at?: string | null
-          date_id?: string
-          devices?: number
-          devices_real?: number
-          mlu?: number
-          mlu_real?: number
-          shared?: number
-          updated_at?: string | null
-          user_id?: string
-          version_size?: number
-          versions?: number
-        }
-        Relationships: [
-          {
-            foreignKeyName: 'app_stats_app_id_fkey'
-            columns: ['app_id']
-            isOneToOne: false
-            referencedRelation: 'apps'
-            referencedColumns: ['app_id']
-          },
-          {
-            foreignKeyName: 'app_stats_user_id_fkey'
-            columns: ['user_id']
-            isOneToOne: false
-            referencedRelation: 'users'
-            referencedColumns: ['id']
-          },
-        ]
-      }
       app_usage: {
         Row: {
           app_id: string
           bandwidth: number
           date: string | null
-          fails: number
+          fail: number
           get: number
           id: string
           install: number
@@ -128,7 +87,7 @@ export interface Database {
           app_id: string
           bandwidth?: number
           date?: string | null
-          fails?: number
+          fail?: number
           get?: number
           id?: string
           install?: number
@@ -141,7 +100,7 @@ export interface Database {
           app_id?: string
           bandwidth?: number
           date?: string | null
-          fails?: number
+          fail?: number
           get?: number
           id?: string
           install?: number
@@ -293,11 +252,12 @@ export interface Database {
           app_id: string
           created_at: string | null
           icon_url: string
-          id: string | null
+          id: number
           last_version: string | null
           name: string | null
           owner_org: string
           retention: number
+          tmp_id: string | null
           updated_at: string | null
           user_id: string | null
         }
@@ -305,11 +265,12 @@ export interface Database {
           app_id: string
           created_at?: string | null
           icon_url: string
-          id?: string | null
+          id?: number
           last_version?: string | null
           name?: string | null
           owner_org: string
           retention?: number
+          tmp_id?: string | null
           updated_at?: string | null
           user_id?: string | null
         }
@@ -317,11 +278,12 @@ export interface Database {
           app_id?: string
           created_at?: string | null
           icon_url?: string
-          id?: string | null
+          id?: number
           last_version?: string | null
           name?: string | null
           owner_org?: string
           retention?: number
+          tmp_id?: string | null
           updated_at?: string | null
           user_id?: string | null
         }
@@ -342,18 +304,6 @@ export interface Database {
           },
         ]
       }
-      auth_uid: {
-        Row: {
-          uid: string | null
-        }
-        Insert: {
-          uid?: string | null
-        }
-        Update: {
-          uid?: string | null
-        }
-        Relationships: []
-      }
       channel_devices: {
         Row: {
           app_id: string
@@ -507,183 +457,6 @@ export interface Database {
           },
         ]
       }
-      clickhouse_app_usage: {
-        Row: {
-          app_id: string | null
-          bandwidth: number | null
-          date: string | null
-          fail: number | null
-          get: number | null
-          install: number | null
-          mau: number | null
-          storage_added: number | null
-          storage_deleted: number | null
-          uninstall: number | null
-        }
-        Insert: {
-          app_id?: string | null
-          bandwidth?: number | null
-          date?: string | null
-          fail?: number | null
-          get?: number | null
-          install?: number | null
-          mau?: number | null
-          storage_added?: number | null
-          storage_deleted?: number | null
-          uninstall?: number | null
-        }
-        Update: {
-          app_id?: string | null
-          bandwidth?: number | null
-          date?: string | null
-          fail?: number | null
-          get?: number | null
-          install?: number | null
-          mau?: number | null
-          storage_added?: number | null
-          storage_deleted?: number | null
-          uninstall?: number | null
-        }
-        Relationships: []
-      }
-      clickhouse_app_usage_parm: {
-        Row: {
-          _app_list: string | null
-          _end_date: string | null
-          _start_date: string | null
-          app_id: string | null
-          bandwidth: number | null
-          date: string | null
-          fail: number | null
-          get: number | null
-          install: number | null
-          mau: number | null
-          storage_added: number | null
-          storage_deleted: number | null
-          uninstall: number | null
-        }
-        Insert: {
-          _app_list?: string | null
-          _end_date?: string | null
-          _start_date?: string | null
-          app_id?: string | null
-          bandwidth?: number | null
-          date?: string | null
-          fail?: number | null
-          get?: number | null
-          install?: number | null
-          mau?: number | null
-          storage_added?: number | null
-          storage_deleted?: number | null
-          uninstall?: number | null
-        }
-        Update: {
-          _app_list?: string | null
-          _end_date?: string | null
-          _start_date?: string | null
-          app_id?: string | null
-          bandwidth?: number | null
-          date?: string | null
-          fail?: number | null
-          get?: number | null
-          install?: number | null
-          mau?: number | null
-          storage_added?: number | null
-          storage_deleted?: number | null
-          uninstall?: number | null
-        }
-        Relationships: []
-      }
-      clickhouse_devices: {
-        Row: {
-          app_id: string | null
-          created_at: string | null
-          custom_id: string | null
-          device_id: string | null
-          is_emulator: boolean | null
-          is_prod: boolean | null
-          os_version: string | null
-          platform: string | null
-          plugin_version: string | null
-          updated_at: string | null
-          version: number | null
-          version_build: string | null
-        }
-        Insert: {
-          app_id?: string | null
-          created_at?: string | null
-          custom_id?: string | null
-          device_id?: string | null
-          is_emulator?: boolean | null
-          is_prod?: boolean | null
-          os_version?: string | null
-          platform?: string | null
-          plugin_version?: string | null
-          updated_at?: string | null
-          version?: number | null
-          version_build?: string | null
-        }
-        Update: {
-          app_id?: string | null
-          created_at?: string | null
-          custom_id?: string | null
-          device_id?: string | null
-          is_emulator?: boolean | null
-          is_prod?: boolean | null
-          os_version?: string | null
-          platform?: string | null
-          plugin_version?: string | null
-          updated_at?: string | null
-          version?: number | null
-          version_build?: string | null
-        }
-        Relationships: []
-      }
-      clickhouse_logs: {
-        Row: {
-          action: string | null
-          app_id: string | null
-          created_at: string | null
-          device_id: string | null
-          platform: string | null
-          version: number | null
-          version_build: string | null
-        }
-        Insert: {
-          action?: string | null
-          app_id?: string | null
-          created_at?: string | null
-          device_id?: string | null
-          platform?: string | null
-          version?: number | null
-          version_build?: string | null
-        }
-        Update: {
-          action?: string | null
-          app_id?: string | null
-          created_at?: string | null
-          device_id?: string | null
-          platform?: string | null
-          version?: number | null
-          version_build?: string | null
-        }
-        Relationships: []
-      }
-      cycle_info: {
-        Row: {
-          subscription_anchor_end: string | null
-          subscription_anchor_start: string | null
-        }
-        Insert: {
-          subscription_anchor_end?: string | null
-          subscription_anchor_start?: string | null
-        }
-        Update: {
-          subscription_anchor_end?: string | null
-          subscription_anchor_start?: string | null
-        }
-        Relationships: []
-      }
       deleted_account: {
         Row: {
           created_at: string | null
@@ -692,7 +465,7 @@ export interface Database {
         }
         Insert: {
           created_at?: string | null
-          email?: string
+          email: string
           id?: string
         }
         Update: {
@@ -990,24 +763,30 @@ export interface Database {
         Row: {
           created_at: string | null
           created_by: string
+          customer_id: string | null
           id: string
           logo: string | null
+          management_email: string
           name: string
           updated_at: string | null
         }
         Insert: {
           created_at?: string | null
           created_by: string
+          customer_id?: string | null
           id?: string
           logo?: string | null
+          management_email: string
           name: string
           updated_at?: string | null
         }
         Update: {
           created_at?: string | null
           created_by?: string
+          customer_id?: string | null
           id?: string
           logo?: string | null
+          management_email?: string
           name?: string
           updated_at?: string | null
         }
@@ -1019,12 +798,22 @@ export interface Database {
             referencedRelation: 'users'
             referencedColumns: ['id']
           },
+          {
+            foreignKeyName: 'orgs_customer_id_fkey'
+            columns: ['customer_id']
+            isOneToOne: true
+            referencedRelation: 'stripe_info'
+            referencedColumns: ['customer_id']
+          },
         ]
       }
       plans: {
         Row: {
+          abtest: boolean
+          app: number
           bandwidth: number
           bandwidth_unit: number | null
+          channel: number
           created_at: string
           description: string
           id: string
@@ -1039,14 +828,21 @@ export interface Database {
           price_m_storage_id: string | null
           price_y: number
           price_y_id: string
+          progressive_deploy: boolean
+          shared: number
           storage: number
           storage_unit: number | null
           stripe_id: string
+          update: number
           updated_at: string
+          version: number
         }
         Insert: {
+          abtest?: boolean
+          app?: number
           bandwidth: number
           bandwidth_unit?: number | null
+          channel?: number
           created_at?: string
           description?: string
           id?: string
@@ -1061,14 +857,21 @@ export interface Database {
           price_m_storage_id?: string | null
           price_y?: number
           price_y_id: string
+          progressive_deploy?: boolean
+          shared?: number
           storage: number
           storage_unit?: number | null
           stripe_id?: string
+          update?: number
           updated_at?: string
+          version?: number
         }
         Update: {
+          abtest?: boolean
+          app?: number
           bandwidth?: number
           bandwidth_unit?: number | null
+          channel?: number
           created_at?: string
           description?: string
           id?: string
@@ -1083,10 +886,14 @@ export interface Database {
           price_m_storage_id?: string | null
           price_y?: number
           price_y_id?: string
+          progressive_deploy?: boolean
+          shared?: number
           storage?: number
           storage_unit?: number | null
           stripe_id?: string
+          update?: number
           updated_at?: string
+          version?: number
         }
         Relationships: []
       }
@@ -1265,14 +1072,6 @@ export interface Database {
         }
         Returns: string
       }
-      calculate_cycle_usage: {
-        Args: Record<PropertyKey, never>
-        Returns: undefined
-      }
-      calculate_daily_app_usage: {
-        Args: Record<PropertyKey, never>
-        Returns: undefined
-      }
       check_min_rights:
         | {
           Args: {
@@ -1338,10 +1137,6 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: number
       }
-      count_all_paying: {
-        Args: Record<PropertyKey, never>
-        Returns: number
-      }
       count_all_plans: {
         Args: Record<PropertyKey, never>
         Returns: {
@@ -1360,13 +1155,6 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: number
       }
-      create_partitions: {
-        Args: {
-          start_date: string
-          num_years: number
-        }
-        Returns: undefined
-      }
       delete_user: {
         Args: Record<PropertyKey, never>
         Returns: undefined
@@ -1436,6 +1224,16 @@ export interface Database {
             storage: number
           }[]
         }
+      get_current_plan_max_org: {
+        Args: {
+          orgid: string
+        }
+        Returns: {
+          mau: number
+          bandwidth: number
+          storage: number
+        }[]
+      }
       get_current_plan_name:
         | {
           Args: Record<PropertyKey, never>
@@ -1447,6 +1245,12 @@ export interface Database {
           }
           Returns: string
         }
+      get_current_plan_name_org: {
+        Args: {
+          orgid: string
+        }
+        Returns: string
+      }
       get_customer_counts: {
         Args: Record<PropertyKey, never>
         Returns: {
@@ -1455,23 +1259,24 @@ export interface Database {
           total: number
         }[]
       }
-      get_cycle_info:
-        | {
-          Args: Record<PropertyKey, never>
-          Returns: {
-            subscription_anchor_start: string
-            subscription_anchor_end: string
-          }[]
+      get_cycle_info: {
+        Args: {
+          userid: string
         }
-        | {
-          Args: {
-            userid: string
-          }
-          Returns: {
-            subscription_anchor_start: string
-            subscription_anchor_end: string
-          }[]
+        Returns: {
+          subscription_anchor_start: string
+          subscription_anchor_end: string
+        }[]
+      }
+      get_cycle_info_org: {
+        Args: {
+          orgid: string
         }
+        Returns: {
+          subscription_anchor_start: string
+          subscription_anchor_end: string
+        }[]
+      }
       get_db_url: {
         Args: Record<PropertyKey, never>
         Returns: string
@@ -1504,25 +1309,13 @@ export interface Database {
         }
         Returns: string
       }
-      get_infos: {
-        Args: {
-          appid: string
-          deviceid: string
-          versionname: string
-        }
-        Returns: {
-          current_version_id: number
-          versiondata: Json
-          channel: Json
-        }[]
-      }
       get_max_plan:
         | {
           Args: Record<PropertyKey, never>
           Returns: {
             mau: number
-            bandwidth: number
             storage: number
+            bandwidth: number
           }[]
         }
         | {
@@ -1630,9 +1423,59 @@ export interface Database {
             subscription_end: string
           }[]
         }
-      get_plan_usage_percent: {
+      get_orgs_v5:
+        | {
+          Args: Record<PropertyKey, never>
+          Returns: {
+            gid: string
+            created_by: string
+            logo: string
+            name: string
+            role: string
+            paying: boolean
+            trial_left: number
+            can_use_more: boolean
+            is_canceled: boolean
+            app_count: number
+            subscription_start: string
+            subscription_end: string
+            management_email: string
+          }[]
+        }
+        | {
+          Args: {
+            userid: string
+          }
+          Returns: {
+            gid: string
+            created_by: string
+            logo: string
+            name: string
+            role: string
+            paying: boolean
+            trial_left: number
+            can_use_more: boolean
+            is_canceled: boolean
+            app_count: number
+            subscription_start: string
+            subscription_end: string
+            management_email: string
+          }[]
+        }
+      get_plan_usage_percent:
+        | {
+          Args: Record<PropertyKey, never>
+          Returns: number
+        }
+        | {
+          Args: {
+            userid: string
+          }
+          Returns: number
+        }
+      get_plan_usage_percent_org: {
         Args: {
-          userid: string
+          orgid: string
         }
         Returns: number
       }
@@ -1667,27 +1510,24 @@ export interface Database {
           storage: number
         }[]
       }
+      get_total_stats_v5_org: {
+        Args: {
+          orgid: string
+        }
+        Returns: {
+          mau: number
+          bandwidth: number
+          storage: number
+        }[]
+      }
       get_total_storage_size:
         | {
           Args: Record<PropertyKey, never>
           Returns: number
         }
-        | {
-          Args: {
-            appid: string
-          }
-          Returns: number
-        }
-        | {
-          Args: {
-            userid: string
-          }
-          Returns: number
-        }
         | {
           Args: {
             userid: string
-            appid: string
           }
           Returns: number
         }
@@ -1812,6 +1652,12 @@ export interface Database {
           }
           Returns: boolean
         }
+      is_allowed_action_org: {
+        Args: {
+          orgid: string
+        }
+        Returns: boolean
+      }
       is_allowed_action_user:
         | {
           Args: Record<PropertyKey, never>
@@ -1892,6 +1738,12 @@ export interface Database {
           }
           Returns: boolean
         }
+      is_canceled_org: {
+        Args: {
+          orgid: string
+        }
+        Returns: boolean
+      }
       is_free_usage:
         | {
           Args: Record<PropertyKey, never>
@@ -1903,12 +1755,6 @@ export interface Database {
           }
           Returns: boolean
         }
-      is_good_plan_v3: {
-        Args: {
-          userid: string
-        }
-        Returns: boolean
-      }
       is_good_plan_v5: {
         Args: {
           userid: string
@@ -1979,6 +1825,18 @@ export interface Database {
           }
           Returns: boolean
         }
+      is_paying_and_good_plan_org: {
+        Args: {
+          orgid: string
+        }
+        Returns: boolean
+      }
+      is_paying_org: {
+        Args: {
+          orgid: string
+        }
+        Returns: boolean
+      }
       is_trial:
         | {
           Args: Record<PropertyKey, never>
@@ -1990,24 +1848,16 @@ export interface Database {
           }
           Returns: number
         }
+      is_trial_org: {
+        Args: {
+          orgid: string
+        }
+        Returns: number
+      }
       one_month_ahead: {
         Args: Record<PropertyKey, never>
         Returns: string
       }
-      post_replication_sql:
-        | {
-          Args: {
-            sql_query: string
-          }
-          Returns: undefined
-        }
-        | {
-          Args: {
-            sql_query: string
-            params: string[]
-          }
-          Returns: undefined
-        }
       process_current_jobs_if_unlocked: {
         Args: Record<PropertyKey, never>
         Returns: number[]
@@ -2016,6 +1866,13 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: undefined
       }
+      remove_enum_value: {
+        Args: {
+          enum_type: unknown
+          enum_value: string
+        }
+        Returns: undefined
+      }
       reset_and_seed_data: {
         Args: Record<PropertyKey, never>
         Returns: undefined
@@ -2028,27 +1885,14 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: undefined
       }
-      update_app_usage:
-        | {
-          Args: Record<PropertyKey, never>
-          Returns: undefined
-        }
-        | {
-          Args: {
-            minutes_interval: number
-          }
-          Returns: undefined
-        }
       verify_mfa: {
         Args: Record<PropertyKey, never>
         Returns: boolean
       }
     }
     Enums: {
-      app_mode: 'prod' | 'dev' | 'livereload'
       disable_update: 'major' | 'minor' | 'version_number' | 'none'
       key_mode: 'read' | 'write' | 'all' | 'upload'
-      pay_as_you_go_type: 'base' | 'units'
       platform_os: 'ios' | 'android'
       queue_job_status: 'inserted' | 'requested' | 'failed'
       stripe_status:
@@ -2058,7 +1902,7 @@ export interface Database {
         | 'failed'
         | 'deleted'
         | 'canceled'
-      usage_mode: '5min' | 'day' | 'month' | 'cycle' | 'last_saved'
+      usage_mode: 'last_saved' | '5min' | 'day' | 'cycle'
       user_min_right:
         | 'invite_read'
         | 'invite_upload'
@@ -2073,9 +1917,6 @@ export interface Database {
       user_role: 'read' | 'upload' | 'write' | 'admin'
     }
     CompositeTypes: {
-      match_plan: {
-        name: string | null
-      }
       orgs_table: {
         id: string | null
         created_by: string | null
@@ -2098,6 +1939,185 @@ export interface Database {
       }
     }
   }
+  storage: {
+    Tables: {
+      buckets: {
+        Row: {
+          allowed_mime_types: string[] | null
+          avif_autodetection: boolean | null
+          created_at: string | null
+          file_size_limit: number | null
+          id: string
+          name: string
+          owner: string | null
+          owner_id: string | null
+          public: boolean | null
+          updated_at: string | null
+        }
+        Insert: {
+          allowed_mime_types?: string[] | null
+          avif_autodetection?: boolean | null
+          created_at?: string | null
+          file_size_limit?: number | null
+          id: string
+          name: string
+          owner?: string | null
+          owner_id?: string | null
+          public?: boolean | null
+          updated_at?: string | null
+        }
+        Update: {
+          allowed_mime_types?: string[] | null
+          avif_autodetection?: boolean | null
+          created_at?: string | null
+          file_size_limit?: number | null
+          id?: string
+          name?: string
+          owner?: string | null
+          owner_id?: string | null
+          public?: boolean | null
+          updated_at?: string | null
+        }
+        Relationships: []
+      }
+      migrations: {
+        Row: {
+          executed_at: string | null
+          hash: string
+          id: number
+          name: string
+        }
+        Insert: {
+          executed_at?: string | null
+          hash: string
+          id: number
+          name: string
+        }
+        Update: {
+          executed_at?: string | null
+          hash?: string
+          id?: number
+          name?: string
+        }
+        Relationships: []
+      }
+      objects: {
+        Row: {
+          bucket_id: string | null
+          created_at: string | null
+          id: string
+          last_accessed_at: string | null
+          metadata: Json | null
+          name: string | null
+          owner: string | null
+          owner_id: string | null
+          path_tokens: string[] | null
+          updated_at: string | null
+          version: string | null
+        }
+        Insert: {
+          bucket_id?: string | null
+          created_at?: string | null
+          id?: string
+          last_accessed_at?: string | null
+          metadata?: Json | null
+          name?: string | null
+          owner?: string | null
+          owner_id?: string | null
+          path_tokens?: string[] | null
+          updated_at?: string | null
+          version?: string | null
+        }
+        Update: {
+          bucket_id?: string | null
+          created_at?: string | null
+          id?: string
+          last_accessed_at?: string | null
+          metadata?: Json | null
+          name?: string | null
+          owner?: string | null
+          owner_id?: string | null
+          path_tokens?: string[] | null
+          updated_at?: string | null
+          version?: string | null
+        }
+        Relationships: [
+          {
+            foreignKeyName: 'objects_bucketId_fkey'
+            columns: ['bucket_id']
+            isOneToOne: false
+            referencedRelation: 'buckets'
+            referencedColumns: ['id']
+          },
+        ]
+      }
+    }
+    Views: {
+      [_ in never]: never
+    }
+    Functions: {
+      can_insert_object: {
+        Args: {
+          bucketid: string
+          name: string
+          owner: string
+          metadata: Json
+        }
+        Returns: undefined
+      }
+      extension: {
+        Args: {
+          name: string
+        }
+        Returns: string
+      }
+      filename: {
+        Args: {
+          name: string
+        }
+        Returns: string
+      }
+      foldername: {
+        Args: {
+          name: string
+        }
+        Returns: string[]
+      }
+      get_size_by_bucket: {
+        Args: Record<PropertyKey, never>
+        Returns: {
+          size: number
+          bucket_id: string
+        }[]
+      }
+      search: {
+        Args: {
+          prefix: string
+          bucketname: string
+          limits?: number
+          levels?: number
+          offsets?: number
+          search?: string
+          sortcolumn?: string
+          sortorder?: string
+        }
+        Returns: {
+          name: string
+          id: string
+          updated_at: string
+          created_at: string
+          last_accessed_at: string
+          metadata: Json
+        }[]
+      }
+    }
+    Enums: {
+      [_ in never]: never
+    }
+    CompositeTypes: {
+      [_ in never]: never
+    }
+  }
 }
 
 type PublicSchema = Database[Extract<keyof Database, 'public'>]

package/src/utils.ts

@@ -134,23 +134,23 @@ export async function isGoodPlan(supabase: SupabaseClient<Database>, userId: str
   return data || false
 }
 
-export async function isPaying(supabase: SupabaseClient<Database>, userId: string): Promise<boolean> {
+export async function isPayingOrg(supabase: SupabaseClient<Database>, orgId: string): Promise<boolean> {
   const { data } = await supabase
-    .rpc('is_paying', { userid: userId })
+    .rpc('is_paying_org', { orgid: orgId })
     .single()
   return data || false
 }
 
-export async function isTrial(supabase: SupabaseClient<Database>, userId: string): Promise<number> {
+export async function isTrialOrg(supabase: SupabaseClient<Database>, orgId: string): Promise<number> {
   const { data } = await supabase
-    .rpc('is_trial', { userid: userId })
+    .rpc('is_trial_org', { orgid: orgId })
     .single()
   return data || 0
 }
 
-export async function isAllowedAction(supabase: SupabaseClient<Database>, userId: string): Promise<boolean> {
+export async function isAllowedActionOrg(supabase: SupabaseClient<Database>, orgId: string): Promise<boolean> {
   const { data } = await supabase
-    .rpc('is_allowed_action_user', { userid: userId })
+    .rpc('is_allowed_action_org', { orgid: orgId })
     .single()
   return !!data
 }
@@ -283,10 +283,11 @@ export async function isAllowedAppOrg(supabase: SupabaseClient<Database>, apikey
   }
 }
 
-export async function checkPlanValid(supabase: SupabaseClient<Database>, userId: string, apikey: string, appId?: string, warning = true) {
+export async function checkPlanValid(supabase: SupabaseClient<Database>, orgId: string, apikey: string, appId?: string, warning = true) {
   const config = await getRemoteConfig()
 
-  const validPlan = await (appId ? isAllowedActionAppIdApiKey(supabase, appId, apikey) : isAllowedAction(supabase, userId))
+  // isAllowedActionAppIdApiKey was updated in the orgs_v3 migration to work with the new system
+  const validPlan = await (appId ? isAllowedActionAppIdApiKey(supabase, appId, apikey) : isAllowedActionOrg(supabase, orgId))
   if (!validPlan) {
     p.log.error(`You need to upgrade your plan to continue to use capgo.\n Upgrade here: ${config.hostWeb}/dashboard/settings/plans\n`)
     wait(100)
@@ -297,8 +298,10 @@ export async function checkPlanValid(supabase: SupabaseClient<Database>, userId:
     wait(500)
     program.error('')
   }
-  const trialDays = await isTrial(supabase, userId)
-  const ispaying = await isPaying(supabase, userId)
+  const [trialDays, ispaying] = await Promise.all([
+    isTrialOrg(supabase, orgId),
+    isPayingOrg(supabase, orgId),
+  ])
   if (trialDays > 0 && warning && !ispaying)
     p.log.warn(`WARNING !!\nTrial expires in ${trialDays} days, upgrade here: ${config.hostWeb}/dashboard/settings/plans\n`)
 }
@@ -498,6 +501,20 @@ export async function verifyUser(supabase: SupabaseClient<Database>, apikey: str
   return userId
 }
 
+export async function getOrganizationId(supabase: SupabaseClient<Database>, appId: string) {
+  const { data, error } = await supabase.from('apps')
+    .select('owner_org')
+    .eq('app_id', appId)
+    .single()
+
+  if (!data || error) {
+    p.log.error(`Cannot get organization id for app id ${appId}`)
+    formatError(error)
+    program.error('')
+  }
+  return data.owner_org
+}
+
 export async function requireUpdateMetadata(supabase: SupabaseClient<Database>, channel: string, appId: string): Promise<boolean> {
   const { data, error } = await supabase
     .from('channels')