@capgo/cli 4.10.12 → 4.10.14

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.10.14](https://github.com/Cap-go/CLI/compare/v4.10.13...v4.10.14) (2024-06-09)
+
+
+### Bug Fixes
+
+* better report error in init command ([af3dbf9](https://github.com/Cap-go/CLI/commit/af3dbf9e882e1dceb5d0b0ffb15484c1d4e01764))
+
+### [4.10.13](https://github.com/Cap-go/CLI/compare/v4.10.12...v4.10.13) (2024-06-08)
+
+
+### Bug Fixes
+
+* image upload ([cc42ebf](https://github.com/Cap-go/CLI/commit/cc42ebf8b297119383d5e08a73416515218bdbae))
+
 ### [4.10.12](https://github.com/Cap-go/CLI/compare/v4.10.11...v4.10.12) (2024-06-07)
 
 

package/dist/index.js

@@ -110508,7 +110508,7 @@ async function getUserId(options) {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.10.12",
+  version: "4.10.14",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -111868,7 +111868,7 @@ async function addAppInternal(appId, options, organization, throwErr = true) {
     program.error("");
   }
   const supabase = await createSupabaseClient(options.apikey);
-  const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
+  await verifyUser(supabase, options.apikey, ["write", "all"]);
   const appExist = await checkAppExists(supabase, appId);
   if (appExist) {
     f2.error(`App ${appId} already exist`);
@@ -111914,7 +111914,7 @@ async function addAppInternal(appId, options, organization, throwErr = true) {
       f2.error(`Could not add app ${formatError(error)}`);
       program.error("");
     }
-    const { data: signedURLData } = await supabase.storage.from(`images/${userId}/${appId}`).getPublicUrl(fileName);
+    const { data: signedURLData } = await supabase.storage.from(`images/org/${organizationUid}/${appId}`).getPublicUrl(fileName);
     signedURL = signedURLData?.publicUrl || signedURL;
   }
   const { error: dbError } = await supabase.from("apps").insert({
@@ -112222,17 +112222,23 @@ async function initApp(apikeyCommand, appId, options) {
   await verifyUser(supabase, apikey, ["upload", "all", "read", "write"]);
   const organization = await getOrganization(supabase, ["admin", "super_admin"]);
   const orgId = organization.gid;
-  await markStep(orgId, snag, 1);
-  await step2(organization, snag, appId, options);
-  await step3(orgId, snag, apikey, appId);
-  await step4(orgId, snag, apikey, appId);
-  await step5(orgId, snag, apikey, appId);
-  await step6(orgId, snag, apikey, appId);
-  await step7(orgId, snag, apikey, appId);
-  await step8(orgId, snag, apikey, appId);
-  await step9(orgId, snag);
-  await step10(orgId, snag, apikey, appId);
-  await markStep(orgId, snag, 0);
+  try {
+    await markStep(orgId, snag, 1);
+    await step2(organization, snag, appId, options);
+    await step3(orgId, snag, apikey, appId);
+    await step4(orgId, snag, apikey, appId);
+    await step5(orgId, snag, apikey, appId);
+    await step6(orgId, snag, apikey, appId);
+    await step7(orgId, snag, apikey, appId);
+    await step8(orgId, snag, apikey, appId);
+    await step9(orgId, snag);
+    await step10(orgId, snag, apikey, appId);
+    await markStep(orgId, snag, 0);
+  } catch (e2) {
+    console.error(e2);
+    f2.error(`Error during onboarding, please try again later`);
+    import_node_process16.default.exit(1);
+  }
   f2.info(`Welcome onboard \u2708\uFE0F!`);
   f2.info(`Your Capgo update system is setup`);
   f2.info(`Next time use \`${pm2.runner} @capgo/cli@latest bundle upload\` to only upload your bundle`);
@@ -112926,6 +112932,8 @@ async function setApp(appId, options) {
     program.error(``);
   }
   const supabase = await createSupabaseClient(options.apikey);
+  const organization = await getOrganization(supabase, ["admin", "super_admin"]);
+  const organizationUid = organization.gid;
   const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, 4 /* admin */);
   const { name, icon, retention } = options;
@@ -112954,14 +112962,14 @@ async function setApp(appId, options) {
     f2.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`);
   }
   if (iconBuff && iconType) {
-    const { error } = await supabase.storage.from(`images/${userId}/${appId}`).upload(fileName, iconBuff, {
+    const { error } = await supabase.storage.from(`images/org/${organizationUid}/${appId}`).upload(fileName, iconBuff, {
       contentType: iconType
     });
     if (error) {
       f2.error(`Could not set app ${formatError(error)}`);
       program.error(``);
     }
-    const { data: signedURLData } = await supabase.storage.from(`images/${userId}/${appId}`).getPublicUrl(fileName);
+    const { data: signedURLData } = await supabase.storage.from(`images/org/${organizationUid}/${appId}`).getPublicUrl(fileName);
     signedURL = signedURLData?.publicUrl || signedURL;
   }
   const { error: dbError } = await supabase.from("apps").update({

package/package.json

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

package/src/app/add.ts

@@ -48,7 +48,7 @@ export async function addAppInternal(appId: string, options: Options, organizati
 
   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
   const appExist = await checkAppExists(supabase, appId)
@@ -111,7 +111,7 @@ export async function addAppInternal(appId: string, options: Options, organizati
     }
     const { data: signedURLData } = await supabase
       .storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .getPublicUrl(fileName)
     signedURL = signedURLData?.publicUrl || signedURL
   }

package/src/app/delete.ts

@@ -73,6 +73,7 @@ export async function deleteApp(appId: string, options: OptionsBase) {
     p.log.error('Could not delete app logo')
   }
 
+  // TODO: make the version delete in R2 too
   const { error: delError } = await supabase
     .storage
     .from(`apps/${appId}/${userId}`)

package/src/app/set.ts

@@ -6,7 +6,7 @@ import { program } from 'commander'
 import * as p from '@clack/prompts'
 import type { Options } from '../api/app'
 import { checkAppExistsAndHasPermissionOrgErr, newIconPath } from '../api/app'
-import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, getOrganization, verifyUser } from '../utils'
 
 export async function setApp(appId: string, options: Options) {
   p.intro(`Set app`)
@@ -23,6 +23,8 @@ export async function setApp(appId: string, options: Options) {
     program.error(``)
   }
   const supabase = await createSupabaseClient(options.apikey)
+  const organization = await getOrganization(supabase, ['admin', 'super_admin'])
+  const organizationUid = organization.gid
 
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
   // Check we have app access to this appId
@@ -61,7 +63,7 @@ export async function setApp(appId: string, options: Options) {
   }
   if (iconBuff && iconType) {
     const { error } = await supabase.storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .upload(fileName, iconBuff, {
         contentType: iconType,
       })
@@ -71,7 +73,7 @@ export async function setApp(appId: string, options: Options) {
     }
     const { data: signedURLData } = await supabase
       .storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .getPublicUrl(fileName)
     signedURL = signedURLData?.publicUrl || signedURL
   }

package/src/init.ts

@@ -319,19 +319,27 @@ export async function initApp(apikeyCommand: string, appId: string, options: Sup
   const organization = await getOrganization(supabase, ['admin', 'super_admin'])
   const orgId = organization.gid
 
-  await markStep(orgId, snag, 1)
+  try {
+    await markStep(orgId, snag, 1)
 
-  await step2(organization, snag, appId, options)
-  await step3(orgId, snag, apikey, appId)
-  await step4(orgId, snag, apikey, appId)
-  await step5(orgId, snag, apikey, appId)
-  await step6(orgId, snag, apikey, appId)
-  await step7(orgId, snag, apikey, appId)
-  await step8(orgId, snag, apikey, appId)
-  await step9(orgId, snag)
-  await step10(orgId, snag, apikey, appId)
+    await step2(organization, snag, appId, options)
+    await step3(orgId, snag, apikey, appId)
+    await step4(orgId, snag, apikey, appId)
+    await step5(orgId, snag, apikey, appId)
+    await step6(orgId, snag, apikey, appId)
+    await step7(orgId, snag, apikey, appId)
+    await step8(orgId, snag, apikey, appId)
+    await step9(orgId, snag)
+    await step10(orgId, snag, apikey, appId)
+
+    await markStep(orgId, snag, 0)
+  }
+  catch (e) {
+    console.error(e)
+    p.log.error(`Error during onboarding, please try again later`)
+    process.exit(1)
+  }
 
-  await markStep(orgId, snag, 0)
   p.log.info(`Welcome onboard ✈️!`)
   p.log.info(`Your Capgo update system is setup`)
   p.log.info(`Next time use \`${pm.runner} @capgo/cli@latest bundle upload\` to only upload your bundle`)