@capgo/cli 4.3.0 → 4.3.3

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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.3](https://github.com/Cap-go/CLI/compare/v4.3.2...v4.3.3) (2024-04-16)
+
+### [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.3",
   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`);
@@ -94491,7 +94502,7 @@ async function addApp(appId, options, throwErr = true) {
   } else if (appExist) {
     return true;
   }
-  const { error: orgError, data: allOrganizations } = await supabase.rpc("get_orgs_v4");
+  const { error: orgError, data: allOrganizations } = await supabase.rpc("get_orgs_v5");
   if (orgError) {
     f2.error("Cannot get the list of organizations - exiting");
     f2.error(`Error ${JSON.stringify(orgError)}`);
@@ -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.3",
   "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) {
@@ -52,7 +50,7 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
   }
 
   const { error: orgError, data: allOrganizations } = await supabase
-    .rpc('get_orgs_v4')
+    .rpc('get_orgs_v5')
 
   if (orgError) {
     p.log.error('Cannot get the list of organizations - exiting')
@@ -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,