@capgo/cli 5.0.0-alpha.3 → 5.0.0-alpha.7

package/src/bundle/upload.ts

@@ -8,6 +8,10 @@ import * as p from '@clack/prompts'
 import { checksum as getChecksum } from '@tomasklaen/checksum'
 import ciDetect from 'ci-info'
 import ky from 'ky'
+import {
+  PutObjectCommand,
+  S3Client,
+} from '@aws-sdk/client-s3'
 import { checkLatest } from '../api/update'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { encryptSource } from '../api/crypto'
@@ -15,6 +19,7 @@ import type {
   OptionsBase,
 } from '../utils'
 import {
+  EMPTY_UUID,
   OrganizationPerm,
   baseKey,
   checKOldEncryption,
@@ -28,6 +33,7 @@ import {
   getConfig,
   getLocalConfig,
   getLocalDepenencies,
+  getOrganizationId,
   hasOrganizationPerm,
   regexSemver,
   requireUpdateMetadata,
@@ -50,6 +56,10 @@ interface Options extends OptionsBase {
   key?: boolean | string
   keyData?: string
   ivSessionKey?: string
+  s3Region?: string
+  s3Apikey?: string
+  s3Apisecret?: string
+  s3BucketName?: string
   bundleUrl?: boolean
   codeCheck?: boolean
   minUpdateVersion?: string
@@ -63,6 +73,21 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   let { bundle, path, channel } = options
   const { external, key, displayIvSession, autoMinUpdateVersion, ignoreMetadataCheck } = options
   let { minUpdateVersion } = options
+  const { s3Region, s3Apikey, s3Apisecret, s3BucketName } = options
+  let useS3 = false
+  let s3Client
+  if (s3Region && s3Apikey && s3Apisecret && s3BucketName) {
+    p.log.info('Uploading to S3')
+    useS3 = true
+    s3Client = new S3Client({
+      region: s3Region,
+      credentials: {
+        accessKeyId: s3Apikey,
+        secretAccessKey: s3Apisecret,
+      },
+    })
+  }
+
   options.apikey = options.apikey || findSavedKey()
   const snag = useLogSnag()
 
@@ -91,6 +116,13 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
     p.log.error('Missing argument, you need to provide a appid and a bundle and a path, or be in a capacitor project')
     program.error('')
   }
+  // if one S3 variable is set, check that all are set
+  if (s3BucketName || s3Region || s3Apikey || s3Apisecret) {
+    if (!s3BucketName || !s3Region || !s3Apikey || !s3Apisecret) {
+      p.log.error('Missing argument, for S3 upload you need to provide a bucket name, region, API key, and API secret')
+      program.error('')
+    }
+  }
   // check if path exist
   if (!existsSync(path)) {
     p.log.error(`Path ${path} does not exist, build your app first, or provide a valid path`)
@@ -119,9 +151,12 @@ 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)
 
-  const updateMetadataRequired = await requireUpdateMetadata(supabase, channel)
+  // 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)
 
   // Check compatibility here
   const { data: channelData, error: channelError } = await supabase
@@ -197,11 +232,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
@@ -213,14 +249,11 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
     p.log.error(`Version already exists ${formatError(appVersionError)}`)
     program.error('')
   }
-  // make bundle safe for s3 name https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html
-  const safeBundle = bundle.replace(/[^a-zA-Z0-9-_.!*'()]/g, '__')
-  const fileName = `${safeBundle}.zip`
 
   let sessionKey
   let checksum = ''
   let zipped: Buffer | null = null
-  if (!external) {
+  if (!external && useS3 === false) {
     const zip = new AdmZip()
     zip.addLocalFolder(path)
     zipped = zip.toBuffer()
@@ -241,7 +274,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
         if (ciDetect.isCI)
           program.error('')
 
-        const res = await p.confirm({ message: 'Do you want to use our public key ?' })
+        const res = await p.confirm({ message: 'Do you want to use our private key ?' })
         if (!res) {
           p.log.error(`Error: Missing public key`)
           program.error('')
@@ -264,6 +297,10 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
         keyData = keyFile.toString()
       }
       // encrypt
+      if (keyData && !keyData.startsWith('-----BEGIN RSA PRIVATE KEY-----')) {
+        p.log.error(`the private key provided is not a valid RSA Private key`)
+        program.error('')
+      }
       p.log.info(`Encrypting your bundle`)
       const res = encryptSource(zipped, keyData)
       sessionKey = res.ivSessionKey
@@ -295,6 +332,15 @@ It will be also visible in your dashboard\n`)
     program.error('')
   }
   else {
+    if (useS3) {
+      const zip = new AdmZip()
+      zip.addLocalFolder(path)
+      zipped = zip.toBuffer()
+      const s = p.spinner()
+      s.start(`Calculating checksum`)
+      checksum = await getChecksum(zipped, 'crc32')
+      s.stop(`Checksum: ${checksum}`)
+    }
     await snag.track({
       channel: 'app',
       event: 'App external',
@@ -319,8 +365,7 @@ It will be also visible in your dashboard\n`)
   const appOwner = await getAppOwner(supabase, appid)
 
   const versionData = {
-    bucket_id: external ? undefined : fileName,
-    user_id: appOwner,
+    // bucket_id: external ? undefined : fileName,
     name: bundle,
     app_id: appid,
     session_key: sessionKey,
@@ -328,6 +373,8 @@ It will be also visible in your dashboard\n`)
     storage_provider: external ? 'external' : 'r2-direct',
     minUpdateVersion,
     native_packages: nativePackages,
+    owner_org: EMPTY_UUID,
+    user_id: userId,
     checksum,
   }
   const { error: dbError } = await updateOrCreateVersion(supabase, versionData)
@@ -339,22 +386,29 @@ It will be also visible in your dashboard\n`)
     const spinner = p.spinner()
     spinner.start(`Uploading Bundle`)
 
-    const url = await uploadUrl(supabase, appid, fileName)
+    const url = await uploadUrl(supabase, appid, bundle)
     if (!url) {
       p.log.error(`Cannot get upload url`)
       program.error('')
     }
-    await ky.put(url, {
-      timeout: 60000,
-      body: zipped,
-      headers: (!localS3
-        ? {
-            'Content-Type': 'application/octet-stream',
-            'Cache-Control': 'public, max-age=456789, immutable',
-            'x-amz-meta-crc32': checksum,
-          }
-        : undefined),
-    })
+    try {
+      await ky.put(url, {
+        timeout: 60000,
+        retry: 5,
+        body: zipped,
+        headers: (!localS3
+          ? {
+              'Content-Type': 'application/octet-stream',
+              'Cache-Control': 'public, max-age=456789, immutable',
+              'x-amz-meta-crc32': checksum,
+            }
+          : undefined),
+      })
+    }
+    catch (errorUpload) {
+      p.log.error(`Cannot upload bundle ${formatError(errorUpload)}`)
+      program.error('')
+    }
     versionData.storage_provider = 'r2'
     const { error: dbError2 } = await updateOrCreateVersion(supabase, versionData)
     if (dbError2) {
@@ -363,6 +417,33 @@ It will be also visible in your dashboard\n`)
     }
     spinner.stop('Bundle Uploaded 💪')
   }
+  else if (useS3 && zipped) {
+    const spinner = p.spinner()
+    spinner.start(`Uploading Bundle`)
+
+    const fileName = `${appid}-${bundle}`
+    const encodeFileName = encodeURIComponent(fileName)
+    const command: PutObjectCommand = new PutObjectCommand({
+      Bucket: s3BucketName,
+      Key: fileName,
+      Body: zipped,
+    })
+
+    const response = await s3Client.send(command)
+    if (response.$metadata.httpStatusCode !== 200) {
+      p.log.error(`Cannot upload to S3`)
+      program.error('')
+    }
+
+    versionData.storage_provider = 'external'
+    versionData.external_url = `https://${s3BucketName}.s3.amazonaws.com/${encodeFileName}`
+    const { error: dbError2 } = await updateOrCreateVersion(supabase, versionData)
+    if (dbError2) {
+      p.log.error(`Cannot update bundle ${formatError(dbError2)}`)
+      program.error('')
+    }
+    spinner.stop('Bundle Uploaded 💪')
+  }
   const { data: versionId } = await supabase
     .rpc('get_app_versions', { apikey: options.apikey, name_version: bundle, appid })
     .single()
@@ -373,6 +454,7 @@ It will be also visible in your dashboard\n`)
       app_id: appid,
       created_by: appOwner,
       version: versionId,
+      owner_org: EMPTY_UUID,
     })
     if (dbError3) {
       p.log.error(`Cannot set channel, the upload key is not allowed to do that, use the "all" for this. ${formatError(dbError3)}`)

package/src/bundle/zip.ts

@@ -112,15 +112,6 @@ export async function zipBundle(appId: string, options: Options) {
   if (!json)
     s2.stop(`Saved to ${name}`)
 
-  if (options.json) {
-    const output = {
-      bundle,
-      filename: name,
-      checksum,
-    }
-    p.log.info(formatError(output))
-  }
-
   await snag.track({
     channel: 'app',
     event: 'App zip',
@@ -133,5 +124,16 @@ export async function zipBundle(appId: string, options: Options) {
 
   if (!json)
     p.outro(`Done ✅`)
+
+  if (json) {
+    const output = {
+      bundle,
+      filename: name,
+      checksum,
+    }
+    // Keep the console log and stringify for user who parse the output
+    // eslint-disable-next-line no-console
+    console.log(JSON.stringify(output, null, 2))
+  }
   process.exit()
 }

package/src/channel/add.ts

@@ -1,10 +1,10 @@
 import process from 'node:process'
 import { program } from 'commander'
 import * as p from '@clack/prompts'
-import { checkAppExistsAndHasPermissionErr } from '../api/app'
+import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { createChannel, findUnknownVersion } from '../api/channels'
 import type { OptionsBase } from '../utils'
-import { createSupabaseClient, findSavedKey, getConfig, useLogSnag, verifyUser } from '../utils'
+import { EMPTY_UUID, OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, useLogSnag, verifyUser } from '../utils'
 
 interface Options extends OptionsBase {
   default?: boolean
@@ -29,7 +29,7 @@ export async function addChannel(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, options.apikey, appId)
+  await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.admin)
 
   p.log.info(`Creating channel ${appId}#${channelId} to Capgo`)
   try {
@@ -42,7 +42,7 @@ export async function addChannel(channelId: string, appId: string, options: Opti
       name: channelId,
       app_id: appId,
       version: data.id,
-      created_by: userId,
+      owner_org: EMPTY_UUID,
     })
     p.log.success(`Channel created ✅`)
     await snag.track({

package/src/channel/currentBundle.ts

@@ -1,9 +1,9 @@
 import process from 'node:process'
 import { program } from 'commander'
 import * as p from '@clack/prompts'
-import { checkAppExistsAndHasPermissionErr } from '../api/app'
+import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import type { OptionsBase } from '../utils'
-import { createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils'
 
 interface Options extends OptionsBase {
   channel?: string
@@ -36,9 +36,9 @@ export async function currentBundle(channel: string, appId: string, options: Opt
   }
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all', 'read'])
+  const _userId = await verifyUser(supabase, options.apikey, ['write', 'all', 'read'])
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appId)
+  await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.read)
 
   if (!channel) {
     p.log.error(`Please provide a channel to get the bundle from.`)
@@ -50,7 +50,6 @@ export async function currentBundle(channel: string, appId: string, options: Opt
     .select('version ( name )')
     .eq('name', channel)
     .eq('app_id', appId)
-    .eq('created_by', userId)
     .limit(1)
 
   if (error || supabaseChannel.length === 0) {

package/src/channel/delete.ts

@@ -1,10 +1,10 @@
 import process from 'node:process'
 import { program } from 'commander'
 import * as p from '@clack/prompts'
-import { checkAppExistsAndHasPermissionErr } from '../api/app'
+import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { delChannel } from '../api/channels'
 import type { OptionsBase } from '../utils'
-import { createSupabaseClient, findSavedKey, getConfig, useLogSnag, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, useLogSnag, verifyUser } from '../utils'
 
 export async function deleteChannel(channelId: string, appId: string, options: OptionsBase) {
   p.intro(`Delete channel`)
@@ -25,7 +25,7 @@ export async function deleteChannel(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, options.apikey, appId)
+  await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.admin)
 
   p.log.info(`Deleting channel ${appId}#${channelId} from Capgo`)
   try {

package/src/channel/list.ts

@@ -1,10 +1,10 @@
 import process from 'node:process'
 import { program } from 'commander'
 import * as p from '@clack/prompts'
-import { checkAppExistsAndHasPermissionErr } from '../api/app'
+import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { displayChannels, getActiveChannels } from '../api/channels'
 import type { OptionsBase } from '../utils'
-import { createSupabaseClient, findSavedKey, getConfig, useLogSnag, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, useLogSnag, verifyUser } from '../utils'
 
 export async function listChannels(appId: string, options: OptionsBase) {
   p.intro(`List channels`)
@@ -24,7 +24,7 @@ export async function listChannels(appId: string, options: OptionsBase) {
 
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload'])
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appId)
+  await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.read)
 
   p.log.info(`Querying available channels in Capgo`)
 

package/src/channel/set.ts

@@ -2,16 +2,18 @@ import process from 'node:process'
 import { program } from 'commander'
 import * as p from '@clack/prompts'
 import type { Database } from '../types/supabase.types'
-import { checkAppExistsAndHasPermissionErr } from '../api/app'
+import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import type {
   OptionsBase,
 } from '../utils'
 import {
+  OrganizationPerm,
   checkPlanValid,
   createSupabaseClient,
   findSavedKey,
   formatError,
   getConfig,
+  getOrganizationId,
   updateOrCreateChannel,
   useLogSnag,
   verifyUser,
@@ -30,7 +32,7 @@ interface Options extends OptionsBase {
   channel?: string
 }
 
-const disableAutoUpdatesPossibleOptions = ['major', 'minor', 'metadata', 'none']
+const disableAutoUpdatesPossibleOptions = ['major', 'minor', 'metadata', 'patch', 'none']
 
 export async function setChannel(channel: string, appId: string, options: Options) {
   p.intro(`Set channel`)
@@ -51,7 +53,8 @@ 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 checkAppExistsAndHasPermissionErr(supabase, options.apikey, 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) {
@@ -75,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/index.ts

@@ -113,6 +113,10 @@ bundle
   .option('-c, --channel <channel>', 'channel to link to')
   .option('-e, --external <url>', 'link to external url intead of upload to Capgo Cloud')
   .option('--iv-session-key <key>', 'Set the iv and session key for bundle url external')
+  .option('--s3-region <region>', 'Region for your AWS S3 bucket')
+  .option('--s3-apikey <apikey>', 'apikey for your AWS S3 account')
+  .option('--s3-apisecret <apisecret>', 'api secret for your AWS S3 account')
+  .option('--s3-bucket-name <bucketName>', 'Name for your AWS S3 bucket')
   .option('--key <key>', 'custom path for public signing key')
   .option('--key-data <keyData>', 'base64 public signing key')
   .option('--bundle-url', 'prints bundle url into stdout')
@@ -148,12 +152,13 @@ bundle
   .action(listBundle)
   .option('-a, --apikey <apikey>', 'apikey to link to your account')
 
-bundle
-  .command('unlink [appId]')
-  .description('Unlink a bundle in Capgo Cloud')
-  .action(listBundle)
-  .option('-a, --apikey <apikey>', 'apikey to link to your account')
-  .option('-b, --bundle <bundle>', 'bundle version number of the bundle to unlink')
+// TODO: Fix this command!
+// bundle
+//   .command('unlink [appId]')
+//   .description('Unlink a bundle in Capgo Cloud')
+//   .action(listBundle)
+//   .option('-a, --apikey <apikey>', 'apikey to link to your account')
+//   .option('-b, --bundle <bundle>', 'bundle version number of the bundle to unlink')
 
 bundle
   .command('cleanup [appId]')
@@ -242,7 +247,7 @@ channel
   .option('--no-android', 'Disable sending update to android devices')
   .option('--self-assign', 'Allow to device to self assign to this channel')
   .option('--no-self-assign', 'Disable devices to self assign to this channel')
-  .option('--disable-auto-update <disableAutoUpdate>', 'Disable auto update strategy for this channel.The possible options are: major, minor, metadata, none')
+  .option('--disable-auto-update <disableAutoUpdate>', 'Disable auto update strategy for this channel.The possible options are: major, minor, metadata, patch, none')
 
 const key = program
   .command('key')