@capgo/cli 4.2.2 → 4.2.4

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.2.4](https://github.com/Cap-go/CLI/compare/v4.2.3...v4.2.4) (2024-03-22)
+
+
+### Bug Fixes
+
+* make no-key works ([11eed1a](https://github.com/Cap-go/CLI/commit/11eed1a515d44800ef369303dd14c5218b2164ca))
+
+### [4.2.3](https://github.com/Cap-go/CLI/compare/v4.2.2...v4.2.3) (2024-03-12)
+
+
+### Bug Fixes
+
+* issue check plan ([ed64d10](https://github.com/Cap-go/CLI/commit/ed64d107612cfc58548dca80bf1915e90b98ec33))
+
 ### [4.2.2](https://github.com/Cap-go/CLI/compare/v4.2.1...v4.2.2) (2024-03-11)
 
 ### [4.2.1](https://github.com/Cap-go/CLI/compare/v4.2.0...v4.2.1) (2024-03-08)

package/dist/index.js

@@ -61137,7 +61137,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.2.2",
+  version: "4.2.4",
   description: "A CLI to upload to capgo servers",
   main: "dist/index.js",
   bin: {
@@ -62393,6 +62393,10 @@ async function isTrial(supabase, userId) {
   const { data } = await supabase.rpc("is_trial", { userid: userId }).single();
   return data || 0;
 }
+async function isAllowedAction(supabase, userId) {
+  const { data } = await supabase.rpc("is_allowed_action_user", { userid: userId }).single();
+  return !!data;
+}
 async function isAllowedActionAppIdApiKey(supabase, appId, apikey) {
   const { data } = await supabase.rpc("is_allowed_action", { apikey, appid: appId }).single();
   return !!data;
@@ -62494,9 +62498,9 @@ async function isAllowedAppOrg(supabase, apikey, appId) {
     error: functionError
   };
 }
-async function checkPlanValid(supabase, userId, appId, apikey, warning = true) {
+async function checkPlanValid(supabase, userId, apikey, appId, warning = true) {
   const config = await getRemoteConfig();
-  const validPlan = await isAllowedActionAppIdApiKey(supabase, appId, apikey);
+  const validPlan = await (appId ? isAllowedActionAppIdApiKey(supabase, appId, apikey) : isAllowedAction(supabase, userId));
   if (!validPlan) {
     f2.error(`You need to upgrade your plan to continue to use capgo.
  Upgrade here: ${config.hostWeb}/dashboard/settings/plans
@@ -63459,7 +63463,7 @@ async function uploadBundle(appid, options, shouldExit = true) {
   oe(`Uploading`);
   await checkLatest();
   let { bundle: bundle2, path: path3, channel: channel2 } = options;
-  const { external, key: key2 = false, displayIvSession, autoMinUpdateVersion, ignoreMetadataCheck } = options;
+  const { external, key: key2, displayIvSession, autoMinUpdateVersion, ignoreMetadataCheck } = options;
   let { minUpdateVersion } = options;
   options.apikey = options.apikey || findSavedKey();
   const snag = useLogSnag();
@@ -63504,7 +63508,7 @@ 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, appid, options.apikey, true);
+  await checkPlanValid(supabase, userId, options.apikey, appid, true);
   const updateMetadataRequired = await requireUpdateMetadata(supabase, channel2);
   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;
@@ -63582,7 +63586,9 @@ Trial expires in ${isTrial2} days`);
     s.start(`Calculating checksum`);
     checksum = await (0, import_checksum2.checksum)(zipped, "crc32");
     s.stop(`Checksum: ${checksum}`);
-    if (key2 || (0, import_node_fs8.existsSync)(baseKeyPub)) {
+    if (key2 === false) {
+      f2.info(`Encryption ignored`);
+    } else if (key2 || (0, import_node_fs8.existsSync)(baseKeyPub)) {
       const publicKey = typeof key2 === "string" ? key2 : baseKeyPub;
       let keyData = options.keyData || "";
       if (!keyData && !(0, import_node_fs8.existsSync)(publicKey)) {
@@ -63942,6 +63948,7 @@ async function addApp(appId, options, throwErr = true) {
   }
   const supabase = await createSupabaseClient(options.apikey);
   const 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`);
@@ -63961,7 +63968,6 @@ async function addApp(appId, options, throwErr = true) {
     f2.info(`Adding ${appId} to Capgo`);
   let iconBuff;
   let iconType;
-  await checkPlanValid(supabase, userId, appId, options.apikey, false);
   if (icon && (0, import_node_fs10.existsSync)(icon)) {
     iconBuff = (0, import_node_fs10.readFileSync)(icon);
     const contentType = src_default.getType(icon);
@@ -64621,7 +64627,7 @@ async function setChannel(channel2, appId, options) {
     program.error("");
   }
   try {
-    await checkPlanValid(supabase, userId, appId, options.apikey);
+    await checkPlanValid(supabase, userId, options.apikey, appId);
     const channelPayload = {
       created_by: userId,
       app_id: appId,

package/package.json

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

package/src/app/add.ts

@@ -38,6 +38,9 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
   const supabase = await createSupabaseClient(options.apikey)
 
   const 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) {
@@ -62,8 +65,6 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
   let iconBuff
   let iconType
 
-  await checkPlanValid(supabase, userId, appId, options.apikey, false)
-
   if (icon && existsSync(icon)) {
     iconBuff = readFileSync(icon)
     const contentType = mime.getType(icon)

package/src/bundle/unlink.ts

@@ -55,7 +55,7 @@ export async function unlinkDevice(channel: string, appId: string, options: Opti
     program.error('')
   }
   try {
-    await checkPlanValid(supabase, userId, appId, options.apikey)
+    await checkPlanValid(supabase, userId, options.apikey, appId)
 
     const versionData = await getVersionData(supabase, appId, userId, bundle)
     await checkVersionNotUsedInChannel(supabase, appId, userId, versionData)

package/src/bundle/upload.ts

@@ -60,7 +60,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   p.intro(`Uploading`)
   await checkLatest()
   let { bundle, path, channel } = options
-  const { external, key = false, displayIvSession, autoMinUpdateVersion, ignoreMetadataCheck } = options
+  const { external, key, displayIvSession, autoMinUpdateVersion, ignoreMetadataCheck } = options
   let { minUpdateVersion } = options
   options.apikey = options.apikey || findSavedKey()
   const snag = useLogSnag()
@@ -118,7 +118,7 @@ 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, appid, options.apikey, true)
+  await checkPlanValid(supabase, userId, options.apikey, appid, true)
 
   const updateMetadataRequired = await requireUpdateMetadata(supabase, channel)
 
@@ -227,7 +227,11 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
     s.start(`Calculating checksum`)
     checksum = await getChecksum(zipped, 'crc32')
     s.stop(`Checksum: ${checksum}`)
-    if (key || existsSync(baseKeyPub)) {
+    // key should be undefined or a string if false it should ingore encryption
+    if (key === false) {
+      p.log.info(`Encryption ignored`)
+    }
+    else if (key || existsSync(baseKeyPub)) {
       const publicKey = typeof key === 'string' ? key : baseKeyPub
       let keyData = options.keyData || ''
       // check if publicKey exist

package/src/channel/set.ts

@@ -75,7 +75,7 @@ export async function setChannel(channel: string, appId: string, options: Option
     program.error('')
   }
   try {
-    await checkPlanValid(supabase, userId, appId, options.apikey)
+    await checkPlanValid(supabase, userId, options.apikey, appId)
     const channelPayload: Database['public']['Tables']['channels']['Insert'] = {
       created_by: userId,
       app_id: appId,

package/src/utils.ts

@@ -282,9 +282,10 @@ export async function isAllowedAppOrg(supabase: SupabaseClient<Database>, apikey
   }
 }
 
-export async function checkPlanValid(supabase: SupabaseClient<Database>, userId: string, appId: string, apikey: string, warning = true) {
+export async function checkPlanValid(supabase: SupabaseClient<Database>, userId: string, apikey: string, appId?: string, warning = true) {
   const config = await getRemoteConfig()
-  const validPlan = await isAllowedActionAppIdApiKey(supabase, appId, apikey)
+
+  const validPlan = await (appId ? isAllowedActionAppIdApiKey(supabase, appId, apikey) : isAllowedAction(supabase, userId))
   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)