@capgo/cli 4.8.1 → 4.8.2

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.8.2](https://github.com/Cap-go/CLI/compare/v4.8.1...v4.8.2) (2024-05-11)
+
 ### [4.8.1](https://github.com/Cap-go/CLI/compare/v4.8.0...v4.8.1) (2024-05-11)
 
 ## [4.8.0](https://github.com/Cap-go/CLI/compare/v4.7.0...v4.8.0) (2024-05-10)

package/dist/index.js

@@ -92373,7 +92373,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.8.1",
+  version: "4.8.2",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -94031,11 +94031,38 @@ async function updateOrCreateChannel(supabase, update) {
 }
 function useLogSnag() {
   const logsnag = new import_logsnag.LogSnag({
-    token: "c124f5e9d0ce5bdd14bbb48f815d5583",
-    project: "capgo"
+    token: import_node_process8.default.env.CAPGO_LOGSNAG ?? "c124f5e9d0ce5bdd14bbb48f815d5583",
+    project: import_node_process8.default.env.CAPGO_LOGSNAG_PROJECT ?? "capgo"
   });
   return logsnag;
 }
+async function getOrganization(supabase, roles) {
+  const { error: orgError, data: allOrganizations } = await supabase.rpc("get_orgs_v5");
+  if (orgError) {
+    f2.error("Cannot get the list of organizations - exiting");
+    f2.error(`Error ${JSON.stringify(orgError)}`);
+    program.error("");
+  }
+  const adminOrgs = allOrganizations.filter((org) => !!roles.find((role) => role === org.role));
+  if (adminOrgs.length === 0) {
+    f2.error(`Could not get organization with roles: ${roles.join(" or ")} because the user does not have any org`);
+    program.error("");
+  }
+  const organizationUidRaw = adminOrgs.length > 1 ? await ie({
+    message: "Please pick the organization that you want to insert to",
+    options: adminOrgs.map((org) => {
+      return { value: org.gid, label: org.name };
+    })
+  }) : adminOrgs[0].gid;
+  if (eD(organizationUidRaw)) {
+    f2.error("Canceled organization selection, exiting");
+    program.error("");
+  }
+  const organizationUid = organizationUidRaw;
+  const organization = allOrganizations.find((org) => org.gid === organizationUid);
+  f2.info(`Using the organization "${organization.name}" as the app owner`);
+  return organization;
+}
 var convertAppName = (appName) => appName.replace(/\./g, "--");
 async function verifyUser(supabase, apikey, keymod = ["all"]) {
   await checkKey(supabase, apikey, keymod);
@@ -94401,18 +94428,18 @@ function wait2(ms) {
     setTimeout(resolve2, ms);
   });
 }
-async function markSnag(channel2, userId, snag, event, icon = "\u2705") {
+async function markSnag(channel2, orgId, snag, event, icon = "\u2705") {
   await snag.track({
     channel: channel2,
     event,
     icon,
-    user_id: userId,
+    user_id: orgId,
     notify: false
   }).catch();
 }
-async function cancelCommand(channel2, command, userId, snag) {
+async function cancelCommand(channel2, command, orgId, snag) {
   if (eD(command)) {
-    await markSnag(channel2, userId, snag, "canceled", "\u{1F937}");
+    await markSnag(channel2, orgId, snag, "canceled", "\u{1F937}");
     import_node_process10.default.exit();
   }
 }
@@ -94428,13 +94455,13 @@ async function getStats(supabase, query) {
   }
   return null;
 }
-async function waitLog(channel2, supabase, appId, snag, userId, deviceId) {
+async function waitLog(channel2, supabase, appId, snag, orgId, deviceId) {
   let loop = true;
   let now = (/* @__PURE__ */ new Date()).toISOString();
   const appIdUrl = convertAppName(appId);
   const config = await getLocalConfig();
   const baseUrl = `${config.hostWeb}/app/p/${appIdUrl}`;
-  await markSnag(channel2, userId, snag, "Use waitlog");
+  await markSnag(channel2, orgId, snag, "Use waitlog");
   const query = {
     appId,
     devicesId: deviceId ? [deviceId] : void 0,
@@ -94452,12 +94479,12 @@ async function waitLog(channel2, supabase, appId, snag, userId, deviceId) {
       f2.info(`Log from Device: ${data.device_id}`);
       if (data.action === "get") {
         f2.info("Update Sent your your device, wait until event download complete");
-        await markSnag(channel2, userId, snag, "done");
+        await markSnag(channel2, orgId, snag, "done");
       } else if (data.action.startsWith("download_")) {
         const action = data.action.split("_")[1];
         if (action === "complete") {
           f2.info("Your bundle has been downloaded on your device, background the app now and open it again to see the update");
-          await markSnag(channel2, userId, snag, "downloaded");
+          await markSnag(channel2, orgId, snag, "downloaded");
         } else if (action === "fail") {
           f2.error("Your bundle has failed to download on your device.");
           f2.error("Please check if you have network connection and try again");
@@ -94467,7 +94494,7 @@ async function waitLog(channel2, supabase, appId, snag, userId, deviceId) {
       } else if (data.action === "set") {
         f2.info("Your bundle has been set on your device \u2764\uFE0F");
         loop = false;
-        await markSnag(channel2, userId, snag, "set");
+        await markSnag(channel2, orgId, snag, "set");
         return Promise.resolve(data);
       } else if (data.action === "NoChannelOrOverride") {
         f2.error(`No default channel or override (channel/device) found, please create it here ${baseUrl}`);
@@ -94535,12 +94562,13 @@ async function debugApp(appId, options) {
   const userId = await verifyUser(supabase, options.apikey);
   f2.info(`Getting active bundle in Capgo`);
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, 4 /* admin */);
+  const orgId = await getOrganizationId(supabase, appId);
   const doRun = await se({ message: `Automatic check if update working in device ?` });
   await cancelCommand("debug", doRun, userId, snag);
   if (doRun) {
     f2.info(`Wait logs sent to Capgo from ${appId} device, Put the app in background and open it again.`);
     f2.info("Waiting...");
-    await waitLog("debug", supabase, appId, snag, userId, deviceId);
+    await waitLog("debug", supabase, appId, snag, orgId, deviceId);
     $e(`Done \u2705`);
   } else {
     $e(`Canceled \u274C`);
@@ -95426,13 +95454,15 @@ var src_default = new Mime_default(standard_default, other_default)._freeze();
 
 // src/app/add.ts
 async function addApp(appId, options, throwErr = true) {
+  await addAppInternal(appId, options, void 0, throwErr);
+}
+async function addAppInternal(appId, options, organization, throwErr = true) {
   if (throwErr)
     oe(`Adding`);
   await checkLatest();
   options.apikey = options.apikey || findSavedKey();
   const config = await getConfig();
   appId = appId || config?.app?.appId;
-  const snag = useLogSnag();
   if (!options.apikey) {
     f2.error(`Missing API key, you need to provide a API key to upload your bundle`);
     program.error("");
@@ -95446,7 +95476,7 @@ async function addApp(appId, options, throwErr = true) {
     program.error("");
   }
   const supabase = await createSupabaseClient(options.apikey);
-  let userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
+  const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
   const appExist = await checkAppExists(supabase, appId);
   if (throwErr && appExist) {
     f2.error(`App ${appId} already exist`);
@@ -95454,27 +95484,9 @@ async function addApp(appId, options, throwErr = true) {
   } else if (appExist) {
     return false;
   }
-  const { error: orgError, data: allOrganizations } = await supabase.rpc("get_orgs_v5");
-  if (orgError) {
-    f2.error("Cannot get the list of organizations - exiting");
-    f2.error(`Error ${JSON.stringify(orgError)}`);
-    program.error("");
-  }
-  const adminOrgs = allOrganizations.filter((org) => org.role === "admin" || org.role === "super_admin");
-  const organizationUidRaw = adminOrgs.length > 1 ? await ie({
-    message: "Please pick the organization that you want to insert to",
-    options: adminOrgs.map((org) => {
-      return { value: org.gid, label: org.name };
-    })
-  }) : adminOrgs[0].gid;
-  if (eD(organizationUidRaw)) {
-    f2.error("Canceled organization selection, exiting");
-    program.error("");
-  }
-  const organizationUid = organizationUidRaw;
-  const organization = allOrganizations.find((org) => org.gid === organizationUid);
-  userId = organization.created_by;
-  f2.info(`Using the organization "${organization.name}" as the app owner`);
+  if (!organization)
+    organization = await getOrganization(supabase, ["admin", "super_admin"]);
+  const organizationUid = organization.gid;
   await checkPlanValid(supabase, organizationUid, options.apikey, void 0, false);
   let { name, icon } = options;
   appId = appId || config?.app?.appId;
@@ -95539,16 +95551,6 @@ async function addApp(appId, options, throwErr = true) {
     f2.error(`Could not add app ${formatError(dbVersionError)}`);
     program.error("");
   }
-  await snag.track({
-    channel: "app",
-    event: "App Added",
-    icon: "\u{1F389}",
-    user_id: userId,
-    tags: {
-      "app-id": appId
-    },
-    notify: false
-  }).catch();
   f2.success(`App ${appId} added to Capgo. ${throwErr ? "You can upload a bundle now" : ""}`);
   if (throwErr) {
     $e(`Done \u2705`);
@@ -95566,23 +95568,23 @@ var codeInject = "CapacitorUpdater.notifyAppReady()";
 var regexImport = /import.*from.*/g;
 var defaultChannel = "production";
 var execOption = { stdio: "pipe" };
-async function cancelCommand2(command, userId, snag) {
+async function cancelCommand2(command, orgId, snag) {
   if (eD(command)) {
-    await markSnag("onboarding-v2", userId, snag, "canceled", "\u{1F937}");
+    await markSnag("onboarding-v2", orgId, snag, "canceled", "\u{1F937}");
     import_node_process16.default.exit();
   }
 }
-async function markStep(userId, snag, step) {
-  return markSnag("onboarding-v2", userId, snag, `onboarding-step-${step}`);
+async function markStep(orgId, snag, step) {
+  return markSnag("onboarding-v2", orgId, snag, `onboarding-step-${step}`);
 }
-async function step2(userId, snag, appId, options) {
+async function step2(organization, snag, appId, options) {
   const pm2 = getPMAndCommand();
   const doAdd = await se({ message: `Add ${appId} in Capgo?` });
-  await cancelCommand2(doAdd, userId, snag);
+  await cancelCommand2(doAdd, organization.gid, snag);
   if (doAdd) {
     const s = de();
     s.start(`Running: ${pm2.runner} @capgo/cli@latest app add ${appId}`);
-    const addRes = await addApp(appId, options, false);
+    const addRes = await addAppInternal(appId, options, organization, false);
     if (!addRes)
       s.stop(`App already add \u2705`);
     else
@@ -95590,12 +95592,12 @@ async function step2(userId, snag, appId, options) {
   } else {
     f2.info(`Run yourself "${pm2.runner} @capgo/cli@latest app add ${appId}"`);
   }
-  await markStep(userId, snag, 2);
+  await markStep(organization.gid, snag, 2);
 }
-async function step3(userId, snag, apikey, appId) {
+async function step3(orgId, snag, apikey, appId) {
   const pm2 = getPMAndCommand();
   const doChannel = await se({ message: `Create default channel ${defaultChannel} for ${appId} in Capgo?` });
-  await cancelCommand2(doChannel, userId, snag);
+  await cancelCommand2(doChannel, orgId, snag);
   if (doChannel) {
     const s = de();
     s.start(`Running: ${pm2.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default`);
@@ -95610,14 +95612,14 @@ async function step3(userId, snag, apikey, appId) {
   } else {
     f2.info(`Run yourself "${pm2.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`);
   }
-  await markStep(userId, snag, 3);
+  await markStep(orgId, snag, 3);
 }
 var urlMigrateV6 = "https://capacitorjs.com/docs/updating/6-0";
 var urlMigrateV5 = "https://capacitorjs.com/docs/updating/5-0";
-async function step4(userId, snag, apikey, appId) {
+async function step4(orgId, snag, apikey, appId) {
   const pm2 = getPMAndCommand();
   const doInstall = await se({ message: `Automatic Install "@capgo/capacitor-updater" dependency in ${appId}?` });
-  await cancelCommand2(doInstall, userId, snag);
+  await cancelCommand2(doInstall, orgId, snag);
   if (doInstall) {
     const s = de();
     s.start(`Checking if @capgo/capacitor-updater is installed`);
@@ -95654,11 +95656,11 @@ async function step4(userId, snag, apikey, appId) {
   } else {
     f2.info(`Run yourself "${pm2.installCommand} @capgo/capacitor-updater@latest"`);
   }
-  await markStep(userId, snag, 4);
+  await markStep(orgId, snag, 4);
 }
-async function step5(userId, snag, apikey, appId) {
+async function step5(orgId, snag, apikey, appId) {
   const doAddCode = await se({ message: `Automatic Add "${codeInject}" code and import in ${appId}?` });
-  await cancelCommand2(doAddCode, userId, snag);
+  await cancelCommand2(doAddCode, orgId, snag);
   if (doAddCode) {
     const s = de();
     s.start(`Adding @capacitor-updater to your main file`);
@@ -95695,7 +95697,7 @@ ${codeInject};
       (0, import_node_fs11.writeFileSync)(mainFilePath, newMainFileContent);
       s.stop(`Code added to ${mainFilePath} \u2705`);
     }
-    await markStep(userId, snag, 5);
+    await markStep(orgId, snag, 5);
   } else {
     f2.info(`Add to your main file the following code:
 
@@ -95705,10 +95707,10 @@ ${codeInject};
 `);
   }
 }
-async function step6(userId, snag, apikey, appId) {
+async function step6(orgId, snag, apikey, appId) {
   const pm2 = getPMAndCommand();
   const doEncrypt = await se({ message: `Automatic configure end-to-end encryption in ${appId} updates?` });
-  await cancelCommand2(doEncrypt, userId, snag);
+  await cancelCommand2(doEncrypt, orgId, snag);
   if (doEncrypt) {
     const s = de();
     s.start(`Running: ${pm2.runner} @capgo/cli@latest key create`);
@@ -95721,14 +95723,14 @@ async function step6(userId, snag, apikey, appId) {
     } else {
       s.stop(`key created \u{1F511}`);
     }
-    markSnag("onboarding-v2", userId, snag, "Use encryption");
+    markSnag("onboarding-v2", orgId, snag, "Use encryption");
   }
-  await markStep(userId, snag, 6);
+  await markStep(orgId, snag, 6);
 }
-async function step7(userId, snag, apikey, appId) {
+async function step7(orgId, snag, apikey, appId) {
   const pm2 = getPMAndCommand();
   const doBuild = await se({ message: `Automatic build ${appId} with "${pm2.pm} run build" ?` });
-  await cancelCommand2(doBuild, userId, snag);
+  await cancelCommand2(doBuild, orgId, snag);
   if (doBuild) {
     const s = de();
     const projectType = await findProjectType();
@@ -95746,12 +95748,12 @@ async function step7(userId, snag, apikey, appId) {
   } else {
     f2.info(`Build yourself with command: ${pm2.pm} run build && ${pm2.runner} cap sync`);
   }
-  await markStep(userId, snag, 7);
+  await markStep(orgId, snag, 7);
 }
-async function step8(userId, snag, apikey, appId) {
+async function step8(orgId, snag, apikey, appId) {
   const pm2 = getPMAndCommand();
   const doBundle = await se({ message: `Automatic upload ${appId} bundle to Capgo?` });
-  await cancelCommand2(doBundle, userId, snag);
+  await cancelCommand2(doBundle, orgId, snag);
   if (doBundle) {
     const s = de();
     s.start(`Running: ${pm2.runner} @capgo/cli@latest bundle upload`);
@@ -95770,12 +95772,12 @@ async function step8(userId, snag, apikey, appId) {
   } else {
     f2.info(`Upload yourself with command: ${pm2.runner} @capgo/cli@latest bundle upload`);
   }
-  await markStep(userId, snag, 8);
+  await markStep(orgId, snag, 8);
 }
-async function step9(userId, snag) {
+async function step9(orgId, snag) {
   const pm2 = getPMAndCommand();
   const doRun = await se({ message: `Run in device now ?` });
-  await cancelCommand2(doRun, userId, snag);
+  await cancelCommand2(doRun, orgId, snag);
   if (doRun) {
     const plaformType = await ie({
       message: "Pick a platform to run your app",
@@ -95796,20 +95798,7 @@ async function step9(userId, snag) {
   } else {
     f2.info(`Run yourself with command: ${pm2.runner} cap run <ios|android>`);
   }
-  await markStep(userId, snag, 9);
-}
-async function step10(userId, snag, supabase, appId) {
-  const doRun = await se({ message: `Automatic check if update working in device ?` });
-  await cancelCommand2(doRun, userId, snag);
-  if (doRun) {
-    f2.info(`Wait logs sent to Capgo from ${appId} device, Put the app in background and open it again.`);
-    f2.info("Waiting...");
-    await waitLog("onboarding-v2", supabase, appId, snag, userId);
-  } else {
-    const appIdUrl = convertAppName(appId);
-    f2.info(`Check logs in https://web.capgo.app/app/p/${appIdUrl}/logs to see if update works.`);
-  }
-  await markStep(userId, snag, 10);
+  await markStep(orgId, snag, 9);
 }
 async function initApp(apikeyCommand, appId, options) {
   const pm2 = getPMAndCommand();
@@ -95826,18 +95815,19 @@ async function initApp(apikeyCommand, appId, options) {
     log.stop("Login Done \u2705");
   }
   const supabase = await createSupabaseClient(apikey);
-  const userId = await verifyUser(supabase, apikey, ["upload", "all", "read", "write"]);
-  await markStep(userId, snag, 1);
-  await step2(userId, snag, appId, options);
-  await step3(userId, snag, apikey, appId);
-  await step4(userId, snag, apikey, appId);
-  await step5(userId, snag, apikey, appId);
-  await step6(userId, snag, apikey, appId);
-  await step7(userId, snag, apikey, appId);
-  await step8(userId, snag, apikey, appId);
-  await step9(userId, snag);
-  await step10(userId, snag, supabase, appId);
-  await markStep(userId, snag, 0);
+  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 markStep(orgId, snag, 0);
   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`);

package/package.json

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

package/src/app/add.ts

@@ -7,17 +7,24 @@ import * as p from '@clack/prompts'
 import { checkLatest } from '../api/update'
 import type { Options } from '../api/app'
 import { checkAppExists, newIconPath } from '../api/app'
+import type {
+  Organization,
+} from '../utils'
 import {
   checkPlanValid,
   createSupabaseClient,
   findSavedKey,
   formatError,
   getConfig,
-  useLogSnag,
+  getOrganization,
   verifyUser,
 } from '../utils'
 
 export async function addApp(appId: string, options: Options, throwErr = true) {
+  await addAppInternal(appId, options, undefined, throwErr)
+}
+
+export async function addAppInternal(appId: string, options: Options, organization?: Organization, throwErr = true) {
   if (throwErr)
     p.intro(`Adding`)
 
@@ -25,7 +32,6 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
   options.apikey = options.apikey || findSavedKey()
   const config = await getConfig()
   appId = appId || config?.app?.appId
-  const snag = useLogSnag()
 
   if (!options.apikey) {
     p.log.error(`Missing API key, you need to provide a API key to upload your bundle`)
@@ -43,7 +49,7 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
 
   const supabase = await createSupabaseClient(options.apikey)
 
-  let userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
+  const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
 
   // Check we have app access to this appId
   const appExist = await checkAppExists(supabase, appId)
@@ -55,36 +61,10 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
     return false
   }
 
-  const { error: orgError, data: allOrganizations } = await supabase
-    .rpc('get_orgs_v5')
-
-  if (orgError) {
-    p.log.error('Cannot get the list of organizations - exiting')
-    p.log.error(`Error ${JSON.stringify(orgError)}`)
-    program.error('')
-  }
-
-  const adminOrgs = allOrganizations.filter(org => org.role === 'admin' || org.role === 'super_admin')
-
-  const organizationUidRaw = (adminOrgs.length > 1)
-    ? await p.select({
-      message: 'Please pick the organization that you want to insert to',
-      options: adminOrgs.map((org) => {
-        return { value: org.gid, label: org.name }
-      }),
-    })
-    : adminOrgs[0].gid
-
-  if (p.isCancel(organizationUidRaw)) {
-    p.log.error('Canceled organization selection, exiting')
-    program.error('')
-  }
-
-  const organizationUid = organizationUidRaw as string
-  const organization = allOrganizations.find(org => org.gid === organizationUid)!
-  userId = organization.created_by
+  if (!organization)
+    organization = await getOrganization(supabase, ['admin', 'super_admin'])
 
-  p.log.info(`Using the organization "${organization.name}" as the app owner`)
+  const organizationUid = organization.gid
 
   await checkPlanValid(supabase, organizationUid, options.apikey, undefined, false)
 
@@ -168,16 +148,6 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
     p.log.error(`Could not add app ${formatError(dbVersionError)}`)
     program.error('')
   }
-  await snag.track({
-    channel: 'app',
-    event: 'App Added',
-    icon: '🎉',
-    user_id: userId,
-    tags: {
-      'app-id': appId,
-    },
-    notify: false,
-  }).catch()
   p.log.success(`App ${appId} added to Capgo. ${throwErr ? 'You can upload a bundle now' : ''}`)
   if (throwErr) {
     p.outro(`Done ✅`)

package/src/app/debug.ts

@@ -6,7 +6,7 @@ import type LogSnag from 'logsnag'
 import type { Database } from '../types/supabase.types'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { checkLatest } from '../api/update'
-import { OrganizationPerm, convertAppName, createSupabaseClient, findSavedKey, formatError, getConfig, getLocalConfig, useLogSnag, verifyUser } from '../utils'
+import { OrganizationPerm, convertAppName, createSupabaseClient, findSavedKey, formatError, getConfig, getLocalConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
 
 function wait(ms: number) {
   return new Promise((resolve) => {
@@ -19,19 +19,19 @@ export interface OptionsBaseDebug {
   device?: string
 }
 
-export async function markSnag(channel: string, userId: string, snag: LogSnag, event: string, icon = '✅') {
+export async function markSnag(channel: string, orgId: string, snag: LogSnag, event: string, icon = '✅') {
   await snag.track({
     channel,
     event,
     icon,
-    user_id: userId,
+    user_id: orgId,
     notify: false,
   }).catch()
 }
 
-export async function cancelCommand(channel: string, command: boolean | symbol, userId: string, snag: LogSnag) {
+export async function cancelCommand(channel: string, command: boolean | symbol, orgId: string, snag: LogSnag) {
   if (p.isCancel(command)) {
-    await markSnag(channel, userId, snag, 'canceled', '🤷')
+    await markSnag(channel, orgId, snag, 'canceled', '🤷')
     process.exit()
   }
 }
@@ -65,13 +65,13 @@ export async function getStats(supabase: SupabaseClient<Database>, query: QueryS
   return null
 }
 
-export async function waitLog(channel: string, supabase: SupabaseClient<Database>, appId: string, snag: LogSnag, userId: string, deviceId?: string) {
+export async function waitLog(channel: string, supabase: SupabaseClient<Database>, appId: string, snag: LogSnag, orgId: string, deviceId?: string) {
   let loop = true
   let now = new Date().toISOString()
   const appIdUrl = convertAppName(appId)
   const config = await getLocalConfig()
   const baseUrl = `${config.hostWeb}/app/p/${appIdUrl}`
-  await markSnag(channel, userId, snag, 'Use waitlog')
+  await markSnag(channel, orgId, snag, 'Use waitlog')
   const query: QueryStats = {
     appId,
     devicesId: deviceId ? [deviceId] : undefined,
@@ -90,13 +90,13 @@ export async function waitLog(channel: string, supabase: SupabaseClient<Database
       p.log.info(`Log from Device: ${data.device_id}`)
       if (data.action === 'get') {
         p.log.info('Update Sent your your device, wait until event download complete')
-        await markSnag(channel, userId, snag, 'done')
+        await markSnag(channel, orgId, snag, 'done')
       }
       else if (data.action.startsWith('download_')) {
         const action = data.action.split('_')[1]
         if (action === 'complete') {
           p.log.info('Your bundle has been downloaded on your device, background the app now and open it again to see the update')
-          await markSnag(channel, userId, snag, 'downloaded')
+          await markSnag(channel, orgId, snag, 'downloaded')
         }
         else if (action === 'fail') {
           p.log.error('Your bundle has failed to download on your device.')
@@ -109,7 +109,7 @@ export async function waitLog(channel: string, supabase: SupabaseClient<Database
       else if (data.action === 'set') {
         p.log.info('Your bundle has been set on your device ❤️')
         loop = false
-        await markSnag(channel, userId, snag, 'set')
+        await markSnag(channel, orgId, snag, 'set')
         return Promise.resolve(data)
       }
       else if (data.action === 'NoChannelOrOverride') {
@@ -202,12 +202,14 @@ export async function debugApp(appId: string, options: OptionsBaseDebug) {
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.admin)
 
+  const orgId = await getOrganizationId(supabase, appId)
+
   const doRun = await p.confirm({ message: `Automatic check if update working in device ?` })
   await cancelCommand('debug', doRun, userId, snag)
   if (doRun) {
     p.log.info(`Wait logs sent to Capgo from ${appId} device, Put the app in background and open it again.`)
     p.log.info('Waiting...')
-    await waitLog('debug', supabase, appId, snag, userId, deviceId)
+    await waitLog('debug', supabase, appId, snag, orgId, deviceId)
     p.outro(`Done ✅`)
   }
   else {

package/src/init.ts

@@ -12,10 +12,11 @@ import { createKey } from './key'
 import { addChannel } from './channel/add'
 import { uploadBundle } from './bundle/upload'
 import { doLoginExists, login } from './login'
-import { addApp } from './app/add'
+import { addAppInternal } from './app/add'
 import { checkLatest } from './api/update'
 import type { Options } from './api/app'
-import { convertAppName, createSupabaseClient, findBuildCommandForProjectType, findMainFile, findMainFileForProjectType, findProjectType, findSavedKey, getConfig, getPMAndCommand, useLogSnag, verifyUser } from './utils'
+import type { Organization } from './utils'
+import { convertAppName, createSupabaseClient, findBuildCommandForProjectType, findMainFile, findMainFileForProjectType, findProjectType, findSavedKey, getConfig, getOrganization, getPMAndCommand, useLogSnag, verifyUser } from './utils'
 
 interface SuperOptions extends Options {
   local: boolean
@@ -27,25 +28,25 @@ const regexImport = /import.*from.*/g
 const defaultChannel = 'production'
 const execOption = { stdio: 'pipe' }
 
-async function cancelCommand(command: boolean | symbol, userId: string, snag: LogSnag) {
+async function cancelCommand(command: boolean | symbol, orgId: string, snag: LogSnag) {
   if (p.isCancel(command)) {
-    await markSnag('onboarding-v2', userId, snag, 'canceled', '🤷')
+    await markSnag('onboarding-v2', orgId, snag, 'canceled', '🤷')
     process.exit()
   }
 }
 
-async function markStep(userId: string, snag: LogSnag, step: number | string) {
-  return markSnag('onboarding-v2', userId, snag, `onboarding-step-${step}`)
+async function markStep(orgId: string, snag: LogSnag, step: number | string) {
+  return markSnag('onboarding-v2', orgId, snag, `onboarding-step-${step}`)
 }
 
-async function step2(userId: string, snag: LogSnag, appId: string, options: SuperOptions) {
+async function step2(organization: Organization, snag: LogSnag, appId: string, options: SuperOptions) {
   const pm = getPMAndCommand()
   const doAdd = await p.confirm({ message: `Add ${appId} in Capgo?` })
-  await cancelCommand(doAdd, userId, snag)
+  await cancelCommand(doAdd, organization.gid, snag)
   if (doAdd) {
     const s = p.spinner()
     s.start(`Running: ${pm.runner} @capgo/cli@latest app add ${appId}`)
-    const addRes = await addApp(appId, options, false)
+    const addRes = await addAppInternal(appId, options, organization, false)
     if (!addRes)
       s.stop(`App already add ✅`)
     else
@@ -54,13 +55,13 @@ async function step2(userId: string, snag: LogSnag, appId: string, options: Supe
   else {
     p.log.info(`Run yourself "${pm.runner} @capgo/cli@latest app add ${appId}"`)
   }
-  await markStep(userId, snag, 2)
+  await markStep(organization.gid, snag, 2)
 }
 
-async function step3(userId: string, snag: LogSnag, apikey: string, appId: string) {
+async function step3(orgId: string, snag: LogSnag, apikey: string, appId: string) {
   const pm = getPMAndCommand()
   const doChannel = await p.confirm({ message: `Create default channel ${defaultChannel} for ${appId} in Capgo?` })
-  await cancelCommand(doChannel, userId, snag)
+  await cancelCommand(doChannel, orgId, snag)
   if (doChannel) {
     const s = p.spinner()
     // create production channel public
@@ -77,15 +78,15 @@ async function step3(userId: string, snag: LogSnag, apikey: string, appId: strin
   else {
     p.log.info(`Run yourself "${pm.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`)
   }
-  await markStep(userId, snag, 3)
+  await markStep(orgId, snag, 3)
 }
 
 const urlMigrateV6 = 'https://capacitorjs.com/docs/updating/6-0'
 const urlMigrateV5 = 'https://capacitorjs.com/docs/updating/5-0'
-async function step4(userId: string, snag: LogSnag, apikey: string, appId: string) {
+async function step4(orgId: string, snag: LogSnag, apikey: string, appId: string) {
   const pm = getPMAndCommand()
   const doInstall = await p.confirm({ message: `Automatic Install "@capgo/capacitor-updater" dependency in ${appId}?` })
-  await cancelCommand(doInstall, userId, snag)
+  await cancelCommand(doInstall, orgId, snag)
   if (doInstall) {
     const s = p.spinner()
     s.start(`Checking if @capgo/capacitor-updater is installed`)
@@ -129,12 +130,12 @@ async function step4(userId: string, snag: LogSnag, apikey: string, appId: strin
   else {
     p.log.info(`Run yourself "${pm.installCommand} @capgo/capacitor-updater@latest"`)
   }
-  await markStep(userId, snag, 4)
+  await markStep(orgId, snag, 4)
 }
 
-async function step5(userId: string, snag: LogSnag, apikey: string, appId: string) {
+async function step5(orgId: string, snag: LogSnag, apikey: string, appId: string) {
   const doAddCode = await p.confirm({ message: `Automatic Add "${codeInject}" code and import in ${appId}?` })
-  await cancelCommand(doAddCode, userId, snag)
+  await cancelCommand(doAddCode, orgId, snag)
   if (doAddCode) {
     const s = p.spinner()
     s.start(`Adding @capacitor-updater to your main file`)
@@ -172,17 +173,17 @@ async function step5(userId: string, snag: LogSnag, apikey: string, appId: strin
       writeFileSync(mainFilePath, newMainFileContent)
       s.stop(`Code added to ${mainFilePath} ✅`)
     }
-    await markStep(userId, snag, 5)
+    await markStep(orgId, snag, 5)
   }
   else {
     p.log.info(`Add to your main file the following code:\n\n${importInject};\n\n${codeInject};\n`)
   }
 }
 
-async function step6(userId: string, snag: LogSnag, apikey: string, appId: string) {
+async function step6(orgId: string, snag: LogSnag, apikey: string, appId: string) {
   const pm = getPMAndCommand()
   const doEncrypt = await p.confirm({ message: `Automatic configure end-to-end encryption in ${appId} updates?` })
-  await cancelCommand(doEncrypt, userId, snag)
+  await cancelCommand(doEncrypt, orgId, snag)
   if (doEncrypt) {
     const s = p.spinner()
     s.start(`Running: ${pm.runner} @capgo/cli@latest key create`)
@@ -196,15 +197,15 @@ async function step6(userId: string, snag: LogSnag, apikey: string, appId: strin
     else {
       s.stop(`key created 🔑`)
     }
-    markSnag('onboarding-v2', userId, snag, 'Use encryption')
+    markSnag('onboarding-v2', orgId, snag, 'Use encryption')
   }
-  await markStep(userId, snag, 6)
+  await markStep(orgId, snag, 6)
 }
 
-async function step7(userId: string, snag: LogSnag, apikey: string, appId: string) {
+async function step7(orgId: string, snag: LogSnag, apikey: string, appId: string) {
   const pm = getPMAndCommand()
   const doBuild = await p.confirm({ message: `Automatic build ${appId} with "${pm.pm} run build" ?` })
-  await cancelCommand(doBuild, userId, snag)
+  await cancelCommand(doBuild, orgId, snag)
   if (doBuild) {
     const s = p.spinner()
     const projectType = await findProjectType()
@@ -224,13 +225,13 @@ async function step7(userId: string, snag: LogSnag, apikey: string, appId: strin
   else {
     p.log.info(`Build yourself with command: ${pm.pm} run build && ${pm.runner} cap sync`)
   }
-  await markStep(userId, snag, 7)
+  await markStep(orgId, snag, 7)
 }
 
-async function step8(userId: string, snag: LogSnag, apikey: string, appId: string) {
+async function step8(orgId: string, snag: LogSnag, apikey: string, appId: string) {
   const pm = getPMAndCommand()
   const doBundle = await p.confirm({ message: `Automatic upload ${appId} bundle to Capgo?` })
-  await cancelCommand(doBundle, userId, snag)
+  await cancelCommand(doBundle, orgId, snag)
   if (doBundle) {
     const s = p.spinner()
     s.start(`Running: ${pm.runner} @capgo/cli@latest bundle upload`)
@@ -251,13 +252,13 @@ async function step8(userId: string, snag: LogSnag, apikey: string, appId: strin
   else {
     p.log.info(`Upload yourself with command: ${pm.runner} @capgo/cli@latest bundle upload`)
   }
-  await markStep(userId, snag, 8)
+  await markStep(orgId, snag, 8)
 }
 
-async function step9(userId: string, snag: LogSnag) {
+async function step9(orgId: string, snag: LogSnag) {
   const pm = getPMAndCommand()
   const doRun = await p.confirm({ message: `Run in device now ?` })
-  await cancelCommand(doRun, userId, snag)
+  await cancelCommand(doRun, orgId, snag)
   if (doRun) {
     const plaformType = await p.select({
       message: 'Pick a platform to run your app',
@@ -280,22 +281,22 @@ async function step9(userId: string, snag: LogSnag) {
   else {
     p.log.info(`Run yourself with command: ${pm.runner} cap run <ios|android>`)
   }
-  await markStep(userId, snag, 9)
+  await markStep(orgId, snag, 9)
 }
 
-async function step10(userId: string, snag: LogSnag, supabase: SupabaseClient<Database>, appId: string) {
+async function _step10(orgId: string, snag: LogSnag, supabase: SupabaseClient<Database>, appId: string) {
   const doRun = await p.confirm({ message: `Automatic check if update working in device ?` })
-  await cancelCommand(doRun, userId, snag)
+  await cancelCommand(doRun, orgId, snag)
   if (doRun) {
     p.log.info(`Wait logs sent to Capgo from ${appId} device, Put the app in background and open it again.`)
     p.log.info('Waiting...')
-    await waitLog('onboarding-v2', supabase, appId, snag, userId)
+    await waitLog('onboarding-v2', supabase, appId, snag, orgId)
   }
   else {
     const appIdUrl = convertAppName(appId)
     p.log.info(`Check logs in https://web.capgo.app/app/p/${appIdUrl}/logs to see if update works.`)
   }
-  await markStep(userId, snag, 10)
+  await markStep(orgId, snag, 10)
 }
 
 export async function initApp(apikeyCommand: string, appId: string, options: SuperOptions) {
@@ -315,20 +316,24 @@ export async function initApp(apikeyCommand: string, appId: string, options: Sup
   }
 
   const supabase = await createSupabaseClient(apikey)
-  const userId = await verifyUser(supabase, apikey, ['upload', 'all', 'read', 'write'])
-  await markStep(userId, snag, 1)
+  await verifyUser(supabase, apikey, ['upload', 'all', 'read', 'write'])
 
-  await step2(userId, snag, appId, options)
-  await step3(userId, snag, apikey, appId)
-  await step4(userId, snag, apikey, appId)
-  await step5(userId, snag, apikey, appId)
-  await step6(userId, snag, apikey, appId)
-  await step7(userId, snag, apikey, appId)
-  await step8(userId, snag, apikey, appId)
-  await step9(userId, snag)
-  await step10(userId, snag, supabase, appId)
+  const organization = await getOrganization(supabase, ['admin', 'super_admin'])
+  const orgId = organization.gid
 
-  await markStep(userId, snag, 0)
+  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, supabase, appId)
+
+  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`)

package/src/utils.ts

@@ -22,6 +22,10 @@ export const defaultHost = 'https://capgo.app'
 export const defaultApiHost = 'https://api.capgo.app'
 export const defaultHostWeb = 'https://web.capgo.app'
 
+export type ArrayElement<ArrayType extends readonly unknown[]> =
+  ArrayType extends readonly (infer ElementType)[] ? ElementType : never
+export type Organization = ArrayElement<Database['public']['Functions']['get_orgs_v5']['Returns']>
+
 export const regexSemver = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
 export const formatError = (error: any) => error ? `\n${prettyjson.render(error)}` : ''
 
@@ -653,12 +657,50 @@ export async function updateOrCreateChannel(supabase: SupabaseClient<Database>,
 
 export function useLogSnag(): LogSnag {
   const logsnag = new LogSnag({
-    token: 'c124f5e9d0ce5bdd14bbb48f815d5583',
-    project: 'capgo',
+    token: process.env.CAPGO_LOGSNAG ?? 'c124f5e9d0ce5bdd14bbb48f815d5583',
+    project: process.env.CAPGO_LOGSNAG_PROJECT ?? 'capgo',
   })
   return logsnag
 }
 
+export async function getOrganization(supabase: SupabaseClient<Database>, roles: string[]): Promise<Organization> {
+  const { error: orgError, data: allOrganizations } = await supabase
+    .rpc('get_orgs_v5')
+
+  if (orgError) {
+    p.log.error('Cannot get the list of organizations - exiting')
+    p.log.error(`Error ${JSON.stringify(orgError)}`)
+    program.error('')
+  }
+
+  const adminOrgs = allOrganizations.filter(org => !!roles.find(role => role === org.role))
+
+  if (adminOrgs.length === 0) {
+    p.log.error(`Could not get organization with roles: ${roles.join(' or ')} because the user does not have any org`)
+    program.error('')
+  }
+
+  const organizationUidRaw = (adminOrgs.length > 1)
+    ? await p.select({
+      message: 'Please pick the organization that you want to insert to',
+      options: adminOrgs.map((org) => {
+        return { value: org.gid, label: org.name }
+      }),
+    })
+    : adminOrgs[0].gid
+
+  if (p.isCancel(organizationUidRaw)) {
+    p.log.error('Canceled organization selection, exiting')
+    program.error('')
+  }
+
+  const organizationUid = organizationUidRaw as string
+  const organization = allOrganizations.find(org => org.gid === organizationUid)!
+
+  p.log.info(`Using the organization "${organization.name}" as the app owner`)
+  return organization
+}
+
 export const convertAppName = (appName: string) => appName.replace(/\./g, '--')
 
 export async function verifyUser(supabase: SupabaseClient<Database>, apikey: string, keymod: Database['public']['Enums']['key_mode'][] = ['all']) {