@capgo/cli 3.13.11 → 3.13.14

package/src/api/app.ts

@@ -3,17 +3,17 @@ import { program } from 'commander';
 import { Database } from 'types/supabase.types';
 import { OptionsBase } from './utils';
 
-export const checkAppExistsAndHasPermission = async (supabase: SupabaseClient<Database>, appid: string, apikey: string,
+export const checkAppExistsAndHasPermission = async (supabase: SupabaseClient<Database>, appid: string,
   shouldExist = true) => {
   const { data: app, error: dbError0 } = await supabase
-    .rpc('exist_app', { appid, apikey })
+    .rpc('exist_app_v2', { appid })
     .single();
   return app !== shouldExist || dbError0;
 }
 
-export const checkAppExistsAndHasPermissionErr = async (supabase: SupabaseClient<Database>, appid: string, apikey: string,
+export const checkAppExistsAndHasPermissionErr = async (supabase: SupabaseClient<Database>, appid: string,
   shouldExist = true) => {
-  const res = await checkAppExistsAndHasPermission(supabase, appid, apikey, shouldExist);
+  const res = await checkAppExistsAndHasPermission(supabase, appid, shouldExist);
   if (res) {
     program.error(`App ${appid} does not exist or you don't have permission to access it`);
   }
@@ -25,4 +25,4 @@ export interface Options extends OptionsBase {
   retention?: number;
 }
 
-export const newIconPath = "assets/icon.png"
+export const newIconPath = "assets/icon.png"

package/src/app/add.ts

@@ -33,9 +33,9 @@ export const addApp = async (appId: string, options: Options, shouldExit = true)
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
   // Check we have app access to this appId
   if (shouldExit) {
-    await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey, false);
+    await checkAppExistsAndHasPermissionErr(supabase, appId, false);
   } else {
-    const res = await checkAppExistsAndHasPermission(supabase, appId, options.apikey, false);
+    const res = await checkAppExistsAndHasPermission(supabase, appId, false);
     if (res) {
       return false
     }
@@ -70,15 +70,6 @@ export const addApp = async (appId: string, options: Options, shouldExit = true)
     p.log.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`);
   }
 
-  // check if app already exist
-  const { data: app, error: dbError0 } = await supabase
-    .rpc('exist_app_v2', { appid: appId })
-    .single()
-  if (app || dbError0) {
-    p.log.error(`App ${appId} already exists ${formatError(dbError0)}`);
-    program.error('');
-  }
-
   const fileName = `icon_${randomUUID()}`
   let signedURL = 'https://xvwzpoazmxkqosrdewyv.supabase.co/storage/v1/object/public/images/capgo.png'
 
@@ -149,4 +140,4 @@ export const addApp = async (appId: string, options: Options, shouldExit = true)
 
 export const addCommand = async (apikey: string, options: Options) => {
   addApp(apikey, options, true)
-}
+}

package/src/app/debug.ts

@@ -165,7 +165,7 @@ export const debugApp = async (appId: string, options: OptionsBaseDebug) => {
   p.log.info(`Getting active bundle in Capgo`);
 
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+  await checkAppExistsAndHasPermissionErr(supabase, appId);
 
   const doRun = await p.confirm({ message: `Automatic check if update working in device ?` });
   await cancelCommand('debug', doRun, userId, snag);

package/src/app/delete.ts

@@ -21,7 +21,7 @@ export const deleteApp = async (appId: string, options: OptionsBase) => {
 
     const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
     // Check we have app access to this appId
-    await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+    await checkAppExistsAndHasPermissionErr(supabase, appId);
 
     const { error } = await supabase
         .storage
@@ -60,4 +60,4 @@ export const deleteApp = async (appId: string, options: OptionsBase) => {
     p.log.success(`App deleted in Capgo`);
     p.outro('Done ✅');
     process.exit()
-}
+}

package/src/app/list.ts

@@ -62,7 +62,7 @@ export const listApp = async (appId: string, options: OptionsBase) => {
   p.log.info(`Getting active bundle in Capgo`);
 
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+  await checkAppExistsAndHasPermissionErr(supabase, appId);
 
   // Get all active app versions we might possibly be able to cleanup
   const allApps = await getActiveApps(supabase, userId);

package/src/app/set.ts

@@ -24,7 +24,7 @@ export const setApp = async (appId: string, options: Options) => {
 
     const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
     // Check we have app access to this appId
-    await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+    await checkAppExistsAndHasPermissionErr(supabase, appId);
 
     const { name, icon, retention } = options;
 

package/src/bundle/cleanup.ts

@@ -62,7 +62,7 @@ export const cleanupBundle = async (appid: string, options: Options) => {
   const userId = await verifyUser(supabase, apikey);
 
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, appid, apikey);
+  await checkAppExistsAndHasPermissionErr(supabase, appid);
   p.log.info(`Querying all available versions in Capgo`);
 
   // Get all active app versions we might possibly be able to cleanup

package/src/bundle/delete.ts

@@ -27,7 +27,7 @@ export const deleteBundle = async (bundleId: string, appId: string, options: Opt
 
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+  await checkAppExistsAndHasPermissionErr(supabase, appId);
 
   const apikey = options.apikey || findSavedKey()
 

package/src/bundle/list.ts

@@ -29,7 +29,7 @@ export const listBundle = async (appId: string, options: OptionsBase) => {
     p.log.info(`Querying available versions of: ${appId} in Capgo`);
 
     // Check we have app access to this appId
-    await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+    await checkAppExistsAndHasPermissionErr(supabase, appId);
 
     // Get all active app versions we might possibly be able to cleanup
     const allVersions = await getActiveAppVersions(supabase, appId, userId);

package/src/bundle/unlink.ts

@@ -40,7 +40,7 @@ export const unlinkDevice = async (channel: string, appId: string, options: Opti
 
     const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
     // Check we have app access to this appId
-    await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+    await checkAppExistsAndHasPermissionErr(supabase, appId);
 
     if (!channel) {
         p.log.error("Missing argument, you need to provide a channel");
@@ -68,4 +68,4 @@ export const unlinkDevice = async (channel: string, appId: string, options: Opti
     }
     p.outro('Done ✅');
     process.exit()
-}
+}

package/src/bundle/upload.ts

@@ -26,7 +26,8 @@ interface Options extends OptionsBase {
   channel?: string
   displayIvSession?: boolean
   external?: string
-  key?: boolean | string
+  key?: boolean | string,
+  bundleUrl?: boolean
 }
 
 export const uploadBundle = async (appid: string, options: Options, shouldExit = true) => {
@@ -72,17 +73,8 @@ export const uploadBundle = async (appid: string, options: Options, shouldExit =
   const userId = await verifyUser(supabase, apikey, ['write', 'all', 'upload']);
   await checkPlanValid(supabase, userId, false)
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, appid, apikey);
+  await checkAppExistsAndHasPermissionErr(supabase, appid);
 
-  // checking if user has access rights before uploading
-  const { data: versionExist, error: versionExistError } = await supabase
-    .rpc('exist_app_versions', { apikey, name_version: bundle, appid })
-    .single()
-
-  if (versionExist || versionExistError) {
-    p.log.error(`This app bundle already exist or was deleted, you cannot re-upload it ${formatError(versionExistError)}`);
-    program.error('');
-  }
   const { data: isTrial, error: isTrialsError } = await supabase
     .rpc('is_trial', { userid: userId })
     .single()
@@ -91,14 +83,6 @@ export const uploadBundle = async (appid: string, options: Options, shouldExit =
     p.log.warn(`Upgrade here: ${hostWeb}/dashboard/settings/plans`);
   }
 
-  const { data: app, error: appError } = await supabase
-    .rpc('exist_app', { appid, apikey })
-    .single()
-
-  if (!app || appError) {
-    p.log.error(`Cannot find app ${appid} in your account ${formatError(appError)}`);
-    program.error('');
-  }
   // check if app already exist
   const { data: appVersion, error: appVersionError } = await supabase
     .rpc('exist_app_versions', { appid, apikey, name_version: bundle })
@@ -245,16 +229,21 @@ It will be also visible in your dashboard\n`);
       app_id: appid,
       created_by: userId,
       version: versionId,
-    }, apikey)
+    })
     if (dbError3) {
       p.log.error(`Cannot set channel, the upload key is not allowed to do that, use the "all" for this.`);
       program.error('');
     }
     const appidWeb = convertAppName(appid)
+    const bundleUrl = `${hostWeb}/app/p/${appidWeb}/channel/${data.id}`
     if (data?.public) {
       p.log.info('Your update is now available in your public channel 🎉')
     } else if (data?.id) {
-      p.log.info(`Link device to this bundle to try it: ${hostWeb}/app/p/${appidWeb}/channel/${data.id}`);
+      p.log.info(`Link device to this bundle to try it: ${bundleUrl}`);
+    }
+
+    if(options.bundleUrl) {
+      p.log.info(`Bundle url: ${bundleUrl}`);
     }
   } else {
     p.log.warn('Cannot set bundle with upload key, use key with more rights for that');

package/src/channel/add.ts

@@ -28,7 +28,7 @@ export const addChannel = async (channelId: string, appId: string, options: Opti
 
     const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
     // Check we have app access to this appId
-    await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+    await checkAppExistsAndHasPermissionErr(supabase, appId);
 
     p.log.info(`Creating channel ${appId}#${channelId} to Capgo`);
     try {
@@ -69,4 +69,4 @@ export const addChannel = async (channelId: string, appId: string, options: Opti
 
 export const addChannelCommand = async (apikey: string, appId: string, options: Options) => {
     addChannel(apikey, appId, options, true)
-}
+}

package/src/channel/delete.ts

@@ -24,7 +24,7 @@ export const deleteChannel = async (channelId: string, appId: string, options: O
 
     const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
     // Check we have app access to this appId
-    await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+    await checkAppExistsAndHasPermissionErr(supabase, appId);
 
     p.log.info(`Deleting channel ${appId}#${channelId} from Capgo`);
     try {
@@ -46,4 +46,4 @@ export const deleteChannel = async (channelId: string, appId: string, options: O
     }
     p.outro(`Done ✅`);
     process.exit()
-}
+}

package/src/channel/list.ts

@@ -23,12 +23,12 @@ export const listChannels = async (appId: string, options: OptionsBase) => {
 
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+  await checkAppExistsAndHasPermissionErr(supabase, appId);
 
   p.log.info(`Querying available channels in Capgo`);
 
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+  await checkAppExistsAndHasPermissionErr(supabase, appId);
 
   // Get all active app versions we might possibly be able to cleanup
   const allVersions = await getActiveChannels(supabase, appId, userId);

package/src/channel/set.ts

@@ -39,7 +39,7 @@ export const setChannel = async (channel: string, appId: string, options: Option
 
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+  await checkAppExistsAndHasPermissionErr(supabase, appId);
 
   const { bundle, latest, downgrade, upgrade, ios, android, selfAssign, state } = options;
   if (!channel) {
@@ -64,7 +64,7 @@ export const setChannel = async (channel: string, appId: string, options: Option
   try {
     await checkPlanValid(supabase, userId)
     // Check we have app access to this appId
-    await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
+    await checkAppExistsAndHasPermissionErr(supabase, appId);
     const channelPayload: Database['public']['Tables']['channels']['Insert'] = {
       created_by: userId,
       app_id: appId,
@@ -116,7 +116,7 @@ export const setChannel = async (channel: string, appId: string, options: Option
       channelPayload.allow_device_self_set = !!selfAssign
     }
     try {
-      const { error: dbError } = await updateOrCreateChannel(supabase, channelPayload, options.apikey)
+      const { error: dbError } = await updateOrCreateChannel(supabase, channelPayload)
       if (dbError) {
         p.log.error(`Cannot set channel the upload key is not allowed to do that, use the "all" for this.`);
         program.error('');
@@ -142,4 +142,4 @@ export const setChannel = async (channel: string, appId: string, options: Option
   }
   p.outro(`Done ✅`);
   process.exit()
-}
+}

package/src/index.ts

@@ -112,6 +112,7 @@ bundle
   .option('-c, --channel <channel>', 'channel to link to')
   .option('-e, --external <url>', 'link to external url intead of upload to Capgo Cloud')
   .option('--key <key>', 'custom path for public signing key')
+  .option('--bundle-url', 'prints bundle url into stdout')
   .option('--keyData <keyData>', 'base64 public signing key')
   .option('--no-key', 'ignore signing key and send clear update')
   .option('--display-iv-session', 'Show in the console the iv and session key used to encrypt the update')
@@ -243,6 +244,7 @@ program
   .option('-c, --channel <channel>', 'channel to link to')
   .option('-e, --external <url>', 'link to external url intead of upload to Capgo Cloud')
   .option('--key <key>', 'custom path for public signing key')
+  .option('--bundle-url', 'prints bundle url into stdout')
   .option('--keyData <keyData>', 'base64 public signing key')
   .option('--no-key', 'ignore signing key and send clear update')
   .option('--display-iv-session', 'Show in the console the iv and session key used to encrypt the update')