@capgo/cli 4.10.16 → 4.10.20

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 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.10.20](https://github.com/Cap-go/CLI/compare/v4.10.19...v4.10.20) (2024-06-18)
+
+
+### Bug Fixes
+
+* lint issue ([df7867b](https://github.com/Cap-go/CLI/commit/df7867ba88b1c87a2a123caae68b5b9c4505487e))
+
+### [4.10.19](https://github.com/Cap-go/CLI/compare/v4.10.18...v4.10.19) (2024-06-18)
+
+### [4.10.18](https://github.com/Cap-go/CLI/compare/v4.10.17...v4.10.18) (2024-06-17)
+
+
+### Bug Fixes
+
+* add log message for the user ([e8b7437](https://github.com/Cap-go/CLI/commit/e8b7437da81bf819d6765fab7659f5d975855693))
+
+### [4.10.17](https://github.com/Cap-go/CLI/compare/v4.10.16...v4.10.17) (2024-06-13)
+
+
+### Bug Fixes
+
+* remove old userId ([b263deb](https://github.com/Cap-go/CLI/commit/b263debe9b13fd68841c3a176f660863160a3872))
+
 ### [4.10.16](https://github.com/Cap-go/CLI/compare/v4.10.15...v4.10.16) (2024-06-13)
 
 

package/dist/index.js

@@ -110243,7 +110243,7 @@ async function deletedFailedVersion(supabase, appId, name) {
   try {
     const pathFailed = "private/delete_failed_version";
     const res = await supabase.functions.invoke(pathFailed, { body: JSON.stringify(data), method: "DELETE" });
-    return res.data.url;
+    return res.data.status;
   } catch (error) {
     f2.error(`Cannot delete failed version ${formatError(error)}`);
     return Promise.reject(new Error("Cannot delete failed version"));
@@ -110508,7 +110508,7 @@ async function getUserId(options) {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.10.16",
+  version: "4.10.20",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -111551,6 +111551,7 @@ The app size is ${mbSize} Mb, this may take a while to download for users
     const startTime = import_node_perf_hooks.performance.now();
     try {
       if (options.multipart !== void 0 && options.multipart) {
+        f2.info(`Uploading bundle as multipart`);
         await uploadMultipart(supabase, appid, bundle2, zipped, orgId);
       } else {
         const url = await uploadUrl(supabase, appid, bundle2);
@@ -112288,7 +112289,7 @@ async function deleteAppVersion(supabase, appid, bundle2) {
     program.error("");
   }
 }
-async function deleteSpecificVersion(supabase, appid, _userId, bundle2) {
+async function deleteSpecificVersion(supabase, appid, bundle2) {
   const versionData = await getVersionData(supabase, appid, bundle2);
   await checkVersionNotUsedInChannel(supabase, appid, versionData);
   await checkVersionNotUsedInDeviceOverride(supabase, appid, versionData);
@@ -112312,7 +112313,7 @@ function displayBundles(data) {
   });
   f2.success(t.render());
 }
-async function getActiveAppVersions(supabase, appid, _userId) {
+async function getActiveAppVersions(supabase, appid) {
   const { data, error: vError } = await supabase.from("app_versions").select().eq("app_id", appid).eq("deleted", false).order("created_at", { ascending: false });
   if (vError) {
     f2.error(`App ${appid} not found in database`);
@@ -112353,10 +112354,10 @@ async function listBundle(appId, options) {
     program.error("");
   }
   const supabase = await createSupabaseClient(options.apikey);
-  const userId = await verifyUser(supabase, options.apikey, ["write", "all", "read", "upload"]);
+  await verifyUser(supabase, options.apikey, ["write", "all", "read", "upload"]);
   f2.info(`Querying available versions of: ${appId} in Capgo`);
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, 1 /* read */);
-  const allVersions = await getActiveAppVersions(supabase, appId, userId);
+  const allVersions = await getActiveAppVersions(supabase, appId);
   f2.info(`Active versions in Capgo: ${allVersions?.length}`);
   displayBundles(allVersions);
   $e(`Done \u2705`);
@@ -112529,7 +112530,7 @@ async function deleteBundle(bundleId, appId, options) {
     program.error("");
   }
   const supabase = await createSupabaseClient(options.apikey);
-  const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
+  await verifyUser(supabase, options.apikey, ["write", "all"]);
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, 3 /* write */);
   appId = appId || config?.app?.appId;
   if (!options.apikey) {
@@ -112545,7 +112546,7 @@ async function deleteBundle(bundleId, appId, options) {
     program.error("");
   }
   f2.info(`Deleting bundle ${appId}@${bundleId} from Capgo`);
-  await deleteSpecificVersion(supabase, appId, userId, bundleId);
+  await deleteSpecificVersion(supabase, appId, bundleId);
   f2.success(`Bundle ${appId}@${bundleId} deleted in Capgo`);
   $e(`Done`);
   import_node_process22.default.exit();
@@ -112754,10 +112755,10 @@ var import_node_process26 = __toESM(require("node:process"));
 var import_preload = __toESM(require_preload());
 var import_prompt_sync = __toESM(require_prompt_sync());
 var prompt = (0, import_prompt_sync.default)();
-async function removeVersions(toRemove, supabase, appid, userId) {
+async function removeVersions(toRemove, supabase, appid) {
   for await (const row of toRemove) {
     f2.warn(`Removing ${row.name} created on ${getHumanDate(row.created_at)}`);
-    await deleteSpecificVersion(supabase, appid, userId, row.name);
+    await deleteSpecificVersion(supabase, appid, row.name);
   }
 }
 function getRemovableVersionsInSemverRange(data, bundle2, nextMajor) {
@@ -112785,10 +112786,10 @@ async function cleanupBundle(appid, options) {
     program.error("");
   }
   const supabase = await createSupabaseClient(options.apikey);
-  const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
+  await verifyUser(supabase, options.apikey, ["write", "all"]);
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, 3 /* write */);
   f2.info(`Querying all available versions in Capgo`);
-  let allVersions = await getActiveAppVersions(supabase, appid, userId);
+  let allVersions = await getActiveAppVersions(supabase, appid);
   const versionInUse = await getChannelsVersion(supabase, appid);
   f2.info(`Total active versions in Capgo: ${allVersions?.length}`);
   if (allVersions?.length === 0) {
@@ -112829,7 +112830,7 @@ async function cleanupBundle(appid, options) {
     }
   }
   f2.success("You have confirmed removal, removing versions now");
-  await removeVersions(toRemove, supabase, appid, userId);
+  await removeVersions(toRemove, supabase, appid);
   $e(`Done \u2705`);
   import_node_process26.default.exit();
 }
@@ -112855,7 +112856,11 @@ async function deleteChannel(channelId, appId, options) {
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, 4 /* admin */);
   f2.info(`Deleting channel ${appId}#${channelId} from Capgo`);
   try {
-    await delChannel(supabase, channelId, appId, userId);
+    const deleteStatus = await delChannel(supabase, channelId, appId, userId);
+    if (deleteStatus.error) {
+      f2.error(`Cannot delete Channel \u{1F640} ${formatError(deleteStatus.error)}`);
+      program.error("");
+    }
     const orgId = await getOrganizationId(supabase, appId);
     f2.success(`Channel deleted`);
     await snag.track({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.10.16",
+  "version": "4.10.20",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",

package/src/api/versions.ts

@@ -24,7 +24,7 @@ export async function deleteAppVersion(supabase: SupabaseClient<Database>, appid
   }
 }
 
-export async function deleteSpecificVersion(supabase: SupabaseClient<Database>, appid: string, _userId: string, bundle: string) {
+export async function deleteSpecificVersion(supabase: SupabaseClient<Database>, appid: string, bundle: string) {
   const versionData = await getVersionData(supabase, appid, bundle)
   await checkVersionNotUsedInChannel(supabase, appid, versionData)
   await checkVersionNotUsedInDeviceOverride(supabase, appid, versionData)
@@ -55,12 +55,11 @@ export function displayBundles(data: (Database['public']['Tables']['app_versions
   p.log.success(t.render())
 }
 
-export async function getActiveAppVersions(supabase: SupabaseClient<Database>, appid: string, _userId: string) {
+export async function getActiveAppVersions(supabase: SupabaseClient<Database>, appid: string) {
   const { data, error: vError } = await supabase
     .from('app_versions')
     .select()
     .eq('app_id', appid)
-    // .eq('user_id', userId)
     .eq('deleted', false)
     .order('created_at', { ascending: false })
 

package/src/bundle/cleanup.ts

@@ -20,11 +20,11 @@ interface Options extends OptionsBase {
 
 const prompt = promptSync()
 
-async function removeVersions(toRemove: Database['public']['Tables']['app_versions']['Row'][], supabase: SupabaseClient<Database>, appid: string, userId: string) {
+async function removeVersions(toRemove: Database['public']['Tables']['app_versions']['Row'][], supabase: SupabaseClient<Database>, appid: string) {
   // call deleteSpecificVersion one by one from toRemove sync
   for await (const row of toRemove) {
     p.log.warn(`Removing ${row.name} created on ${(getHumanDate(row.created_at))}`)
-    await deleteSpecificVersion(supabase, appid, userId, row.name)
+    await deleteSpecificVersion(supabase, appid, row.name)
   }
 }
 
@@ -57,14 +57,14 @@ export async function cleanupBundle(appid: string, options: Options) {
   }
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
+  await verifyUser(supabase, options.apikey, ['write', 'all'])
 
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, OrganizationPerm.write)
   p.log.info(`Querying all available versions in Capgo`)
 
   // Get all active app versions we might possibly be able to cleanup
-  let allVersions: (Database['public']['Tables']['app_versions']['Row'] & { keep?: string })[] = await getActiveAppVersions(supabase, appid, userId)
+  let allVersions: (Database['public']['Tables']['app_versions']['Row'] & { keep?: string })[] = await getActiveAppVersions(supabase, appid)
 
   const versionInUse = await getChannelsVersion(supabase, appid)
 
@@ -121,7 +121,7 @@ export async function cleanupBundle(appid: string, options: Options) {
 
   // Yes, lets clean it up
   p.log.success('You have confirmed removal, removing versions now')
-  await removeVersions(toRemove, supabase, appid, userId)
+  await removeVersions(toRemove, supabase, appid)
   p.outro(`Done ✅`)
   process.exit()
 }

package/src/bundle/delete.ts

@@ -26,7 +26,7 @@ export async function deleteBundle(bundleId: string, appId: string, options: Opt
   }
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
+  await verifyUser(supabase, options.apikey, ['write', 'all'])
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.write)
 
@@ -46,7 +46,7 @@ export async function deleteBundle(bundleId: string, appId: string, options: Opt
 
   p.log.info(`Deleting bundle ${appId}@${bundleId} from Capgo`)
 
-  await deleteSpecificVersion(supabase, appId, userId, bundleId)
+  await deleteSpecificVersion(supabase, appId, bundleId)
   p.log.success(`Bundle ${appId}@${bundleId} deleted in Capgo`)
   p.outro(`Done`)
   process.exit()

package/src/bundle/list.ts

@@ -25,7 +25,7 @@ export async function listBundle(appId: string, options: OptionsBase) {
 
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload'])
+  await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload'])
 
   p.log.info(`Querying available versions of: ${appId} in Capgo`)
 
@@ -33,7 +33,7 @@ export async function listBundle(appId: string, options: OptionsBase) {
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.read)
 
   // Get all active app versions we might possibly be able to cleanup
-  const allVersions = await getActiveAppVersions(supabase, appId, userId)
+  const allVersions = await getActiveAppVersions(supabase, appId)
 
   p.log.info(`Active versions in Capgo: ${allVersions?.length}`)
 

package/src/bundle/upload.ts

@@ -387,6 +387,7 @@ It will be also visible in your dashboard\n`)
 
     try {
       if (options.multipart !== undefined && options.multipart) {
+        p.log.info(`Uploading bundle as multipart`)
         await uploadMultipart(supabase, appid, bundle, zipped, orgId)
       }
       else {

package/src/channel/delete.ts

@@ -4,7 +4,7 @@ import * as p from '@clack/prompts'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { delChannel } from '../api/channels'
 import type { OptionsBase } from '../utils'
-import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
 
 export async function deleteChannel(channelId: string, appId: string, options: OptionsBase) {
   p.intro(`Delete channel`)
@@ -29,7 +29,11 @@ export async function deleteChannel(channelId: string, appId: string, options: O
 
   p.log.info(`Deleting channel ${appId}#${channelId} from Capgo`)
   try {
-    await delChannel(supabase, channelId, appId, userId)
+    const deleteStatus = await delChannel(supabase, channelId, appId, userId)
+    if (deleteStatus.error) {
+      p.log.error(`Cannot delete Channel 🙀 ${formatError(deleteStatus.error)}`)
+      program.error('')
+    }
     const orgId = await getOrganizationId(supabase, appId)
     p.log.success(`Channel deleted`)
     await snag.track({

package/src/utils.ts

@@ -589,7 +589,7 @@ export async function deletedFailedVersion(supabase: SupabaseClient<Database>, a
   try {
     const pathFailed = 'private/delete_failed_version'
     const res = await supabase.functions.invoke(pathFailed, { body: JSON.stringify(data), method: 'DELETE' })
-    return res.data.url
+    return res.data.status
   }
   catch (error) {
     p.log.error(`Cannot delete failed version ${formatError(error)}`)