@capgo/cli 3.9.2 → 3.10.0

package/src/bundle/upload.ts

@@ -4,6 +4,7 @@ import { randomUUID } from 'crypto';
 import * as p from '@clack/prompts';
 import { existsSync, readFileSync } from 'fs';
 import { checksum as getChecksum } from '@tomasklaen/checksum';
+import ciDetect from '@npmcli/ci-detect';
 import { checkLatest } from '../api/update';
 import { OptionsBase } from '../api/utils';
 import { checkAppExistsAndHasPermissionErr } from "../api/app";
@@ -12,7 +13,7 @@ import {
   hostWeb, getConfig, createSupabaseClient,
   updateOrCreateChannel, updateOrCreateVersion,
   formatError, findSavedKey, checkPlanValid,
-  useLogSnag, verifyUser, regexSemver, baseKeyPub, convertAppName
+  useLogSnag, verifyUser, regexSemver, baseKeyPub, convertAppName, defaulPublicKey
 } from '../utils';
 
 const alertMb = 20;
@@ -27,6 +28,7 @@ interface Options extends OptionsBase {
 }
 
 export const uploadBundle = async (appid: string, options: Options, shouldExit = true) => {
+  p.intro(`Uploading`);
   await checkLatest();
   let { bundle, path, channel } = options;
   const { external, key = false, displayIvSession } = options;
@@ -34,7 +36,6 @@ export const uploadBundle = async (appid: string, options: Options, shouldExit =
   const snag = useLogSnag()
 
   channel = channel || 'dev';
-  p.intro(`Uploading`);
 
   const config = await getConfig();
   appid = appid || config?.app?.appId
@@ -115,16 +116,36 @@ export const uploadBundle = async (appid: string, options: Options, shouldExit =
     s.stop(`Checksum: ${checksum}`);
     if (key || existsSync(baseKeyPub)) {
       const publicKey = typeof key === 'string' ? key : baseKeyPub
+      let keyData = ''
       // check if publicKey exist
       if (!existsSync(publicKey)) {
         p.log.error(`Cannot find public key ${publicKey}`);
-        program.error('');
+        if (ciDetect()) {
+          program.error('');
+        }
+        const res = await p.confirm({ message: 'Do you want to use our public key ?' })
+        if (!res) {
+          p.log.error(`Error: Missing public key`);
+          program.error('');
+        }
+        keyData = defaulPublicKey
       }
+      await snag.publish({
+        channel: 'app',
+        event: 'App encryption',
+        icon: '🔑',
+        tags: {
+          'user-id': userId,
+          'app-id': appid,
+        },
+        notify: false,
+      }).catch()
       // open with fs publicKey path
       const keyFile = readFileSync(publicKey)
+      keyData = keyFile.toString()
       // encrypt
       p.log.info(`Encrypting your bundle`);
-      const res = encryptSource(zipped, keyFile.toString())
+      const res = encryptSource(zipped, keyData)
       sessionKey = res.ivSessionKey
       if (displayIvSession) {
         p.log.info(`Your Iv Session key is ${sessionKey},
@@ -166,6 +187,17 @@ It will be also visible in your dashboard\n`);
   } else if (external && !external.startsWith('https://')) {
     p.log.error(`External link should should start with "https://" current is "${external}"`);
     program.error('');
+  } else {
+    await snag.publish({
+      channel: 'app',
+      event: 'App external',
+      icon: '📤',
+      tags: {
+        'user-id': userId,
+        'app-id': appid,
+      },
+      notify: false,
+    }).catch()
   }
   const { error: dbError } = await updateOrCreateVersion(supabase, {
     bucket_id: external ? undefined : fileName,
@@ -225,6 +257,6 @@ export const uploadCommand = async (apikey: string, options: Options) => {
 }
 
 export const uploadDeprecatedCommand = async (apikey: string, options: Options) => {
-  console.log('⚠️  This command is deprecated, use "npx @capgo/cli bundle upload" instead ⚠️')
+  p.log.warn('⚠️  This command is deprecated, use "npx @capgo/cli bundle upload" instead ⚠️')
   uploadBundle(apikey, options, true)
 }

package/src/channel/add.ts

@@ -1,4 +1,5 @@
 import { program } from "commander";
+import * as p from '@clack/prompts';
 import { checkAppExistsAndHasPermissionErr } from "../api/app";
 import { createChannel, findUnknownVersion } from "../api/channels";
 import { OptionsBase } from "../api/utils";
@@ -9,16 +10,19 @@ interface Options extends OptionsBase {
 }
 
 export const addChannel = async (channelId: string, appId: string, options: Options, shouldExit = true) => {
+    p.intro(`Create channel`);
     options.apikey = options.apikey || findSavedKey()
     const config = await getConfig();
     appId = appId || config?.app?.appId
     const snag = useLogSnag()
 
     if (!options.apikey) {
-        program.error("Missing API key, you need to provide a API key to upload your bundle");
+        p.log.error("Missing API key, you need to provide a API key to upload your bundle");
+        program.error('');
     }
     if (!appId) {
-        program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
+        p.log.error("Missing argument, you need to provide a appId, or be in a capacitor project");
+        program.error('');
     }
     const supabase = createSupabaseClient(options.apikey)
 
@@ -26,11 +30,12 @@ export const addChannel = async (channelId: string, appId: string, options: Opti
     // Check we have app access to this appId
     await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
 
-    console.log(`Create channel ${appId}#${channelId} to Capgo cloud`);
+    p.log.info(`Creating channel ${appId}#${channelId} to Capgo`);
     try {
         const data = await findUnknownVersion(supabase, appId)
         if (!data) {
-            program.error(`Cannot find default version for channel creation, please contact Capgo support 🤨`);
+            p.log.error(`Cannot find default version for channel creation, please contact Capgo support 🤨`);
+            program.error('');
         }
         await createChannel(supabase, {
             name: channelId,
@@ -38,7 +43,7 @@ export const addChannel = async (channelId: string, appId: string, options: Opti
             version: data.id,
             created_by: userId
         });
-        console.log(`Channel created ✅`);
+        p.log.success(`Channel created ✅`);
         await snag.publish({
             channel: 'channel',
             event: 'Create channel',
@@ -51,11 +56,11 @@ export const addChannel = async (channelId: string, appId: string, options: Opti
             notify: false,
         }).catch()
     } catch (error) {
-        console.log(`Cannot create Channel 🙀`, error);
+        p.log.error(`Cannot create Channel 🙀`);
         return false
     }
     if (shouldExit) {
-        console.log(`Done ✅`);
+        p.outro(`Done ✅`);
         process.exit()
     }
     return true

package/src/channel/delete.ts

@@ -1,20 +1,24 @@
 import { program } from "commander";
+import * as p from '@clack/prompts';
 import { checkAppExistsAndHasPermissionErr } from "../api/app";
 import { delChannel } from "../api/channels";
 import { OptionsBase } from "../api/utils";
 import { findSavedKey, getConfig, useLogSnag, createSupabaseClient, verifyUser } from "../utils";
 
 export const deleteChannel = async (channelId: string, appId: string, options: OptionsBase) => {
+    p.intro(`Delete channel`);
     options.apikey = options.apikey || findSavedKey()
     const config = await getConfig();
     appId = appId || config?.app?.appId
     const snag = useLogSnag()
 
     if (!options.apikey) {
-        program.error("Missing API key, you need to provide a API key to upload your bundle");
+        p.log.error("Missing API key, you need to provide a API key to upload your bundle");
+        program.error('');
     }
     if (!appId) {
-        program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
+        p.log.error("Missing argument, you need to provide a appId, or be in a capacitor project");
+        program.error('');
     }
     const supabase = createSupabaseClient(options.apikey)
 
@@ -22,10 +26,10 @@ export const deleteChannel = async (channelId: string, appId: string, options: O
     // Check we have app access to this appId
     await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
 
-    console.log(`Delete channel ${appId}#${channelId} to Capgo cloud`);
+    p.log.info(`Deleting channel ${appId}#${channelId} from Capgo`);
     try {
         await delChannel(supabase, channelId, appId, userId);
-        console.log(`Channel Delete ✅`);
+        p.log.success(`Channel deleted`);
         await snag.publish({
             channel: 'channel',
             event: 'Delete channel',
@@ -38,8 +42,8 @@ export const deleteChannel = async (channelId: string, appId: string, options: O
             notify: false,
         }).catch()
     } catch (error) {
-        console.log(`Cannot delete Channel 🙀`, error);
+        p.log.error(`Cannot delete Channel 🙀`);
     }
-    console.log(`Done ✅`);
+    p.outro(`Done ✅`);
     process.exit()
 }

package/src/channel/list.ts

@@ -1,20 +1,23 @@
 import { program } from 'commander';
+import * as p from '@clack/prompts';
 import { checkAppExistsAndHasPermissionErr } from '../api/app';
 import { getActiveChannels, displayChannels } from '../api/channels';
 import { OptionsBase } from '../api/utils';
 import { findSavedKey, getConfig, createSupabaseClient, verifyUser, useLogSnag } from '../utils';
 
 export const listChannels = async (appId: string, options: OptionsBase) => {
+  p.intro(`List channels`);
   options.apikey = options.apikey || findSavedKey()
   const config = await getConfig();
   appId = appId || config?.app?.appId
   const snag = useLogSnag()
 
   if (!options.apikey) {
-    program.error("Missing API key, you need to provide a API key to upload your bundle");
+    p.log.error("Missing API key, you need to provide a API key to upload your bundle");
   }
   if (!appId) {
-    program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
+    p.log.error("Missing argument, you need to provide a appId, or be in a capacitor project");
+    program.error('');
   }
   const supabase = createSupabaseClient(options.apikey)
 
@@ -22,7 +25,7 @@ export const listChannels = async (appId: string, options: OptionsBase) => {
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
 
-  console.log(`Querying available versions in Capgo`);
+  p.log.info(`Querying available channels in Capgo`);
 
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionErr(supabase, appId, options.apikey);
@@ -30,7 +33,7 @@ export const listChannels = async (appId: string, options: OptionsBase) => {
   // Get all active app versions we might possibly be able to cleanup
   const allVersions = await getActiveChannels(supabase, appId, userId);
 
-  console.log(`Active channels in Capgo: ${allVersions?.length}`);
+  p.log.info(`Active channels in Capgo: ${allVersions?.length}`);
 
   displayChannels(allVersions);
   await snag.publish({
@@ -43,6 +46,6 @@ export const listChannels = async (appId: string, options: OptionsBase) => {
     },
     notify: false,
   }).catch()
-  console.log(`Done ✅`);
+  p.outro(`Done ✅`);
   process.exit()
 }

package/src/channel/set.ts

@@ -1,5 +1,6 @@
 import { program } from 'commander';
 import { Database } from 'types/supabase.types';
+import * as p from '@clack/prompts';
 import { OptionsBase } from '../api/utils';
 import { checkAppExistsAndHasPermissionErr } from "../api/app";
 import {
@@ -20,16 +21,19 @@ interface Options extends OptionsBase {
 }
 
 export const setChannel = async (channel: string, appId: string, options: Options) => {
+  p.intro(`Set channel`);
   options.apikey = options.apikey || findSavedKey()
   const config = await getConfig();
   appId = appId || config?.app?.appId
   const snag = useLogSnag()
 
   if (!options.apikey) {
-    program.error("Missing API key, you need to provide a API key to upload your bundle");
+    p.log.error("Missing API key, you need to provide a API key to upload your bundle");
+    program.error('');
   }
   if (!appId) {
-    program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
+    p.log.error("Missing argument, you need to provide a appId, or be in a capacitor project");
+    program.error('');
   }
   const supabase = createSupabaseClient(options.apikey)
 
@@ -39,10 +43,12 @@ export const setChannel = async (channel: string, appId: string, options: Option
 
   const { bundle, latest, downgrade, upgrade, ios, android, selfAssign, state } = options;
   if (!channel) {
-    program.error("Missing argument, you need to provide a channel");
+    p.log.error("Missing argument, you need to provide a channel");
+    program.error('');
   }
   if (latest && bundle) {
-    program.error("Cannot set latest and bundle at the same time");
+    p.log.error("Cannot set latest and bundle at the same time");
+    program.error('');
   }
   if (bundle == null &&
     state == null &&
@@ -52,7 +58,8 @@ export const setChannel = async (channel: string, appId: string, options: Option
     ios == null &&
     android == null &&
     selfAssign == null) {
-    program.error("Missing argument, you need to provide a option to set");
+    p.log.error("Missing argument, you need to provide a option to set");
+    program.error('');
   }
   try {
     await checkPlanValid(supabase, userId)
@@ -74,45 +81,50 @@ export const setChannel = async (channel: string, appId: string, options: Option
         .eq('user_id', userId)
         .eq('deleted', false)
         .single()
-      if (vError || !data)
-        program.error(`Cannot find version ${bundleVersion}`);
-      console.log(`Set ${appId} channel: ${channel} to @${bundleVersion}`);
+      if (vError || !data) {
+        p.log.error(`Cannot find version ${bundleVersion}`);
+        program.error('');
+      }
+      p.log.info(`Set ${appId} channel: ${channel} to @${bundleVersion}`);
       channelPayload.version = data.id
     }
     if (state != null) {
       if (state === 'public' || state === 'private') {
-        console.log(`Set ${appId} channel: ${channel} to public or private is deprecated, use default or normal instead`);
+        p.log.info(`Set ${appId} channel: ${channel} to public or private is deprecated, use default or normal instead`);
       }
-      console.log(`Set ${appId} channel: ${channel} to ${state === 'public' || state === 'default' ? 'default' : 'normal'}`);
+      p.log.info(`Set ${appId} channel: ${channel} to ${state === 'public' || state === 'default' ? 'default' : 'normal'}`);
       channelPayload.public = state === 'public' || state === 'default'
     }
     if (downgrade != null) {
-      console.log(`Set ${appId} channel: ${channel} to ${downgrade ? 'allow' : 'disallow'} downgrade`);
+      p.log.info(`Set ${appId} channel: ${channel} to ${downgrade ? 'allow' : 'disallow'} downgrade`);
       channelPayload.disableAutoUpdateUnderNative = !downgrade
     }
     if (upgrade != null) {
-      console.log(`Set ${appId} channel: ${channel} to ${upgrade ? 'allow' : 'disallow'} upgrade`);
+      p.log.info(`Set ${appId} channel: ${channel} to ${upgrade ? 'allow' : 'disallow'} upgrade`);
       channelPayload.disableAutoUpdateToMajor = !upgrade
     }
     if (ios != null) {
-      console.log(`Set ${appId} channel: ${channel} to ${ios ? 'allow' : 'disallow'} ios update`);
+      p.log.info(`Set ${appId} channel: ${channel} to ${ios ? 'allow' : 'disallow'} ios update`);
       channelPayload.ios = !!ios
     }
     if (android != null) {
-      console.log(`Set ${appId} channel: ${channel} to ${android ? 'allow' : 'disallow'} android update`);
+      p.log.info(`Set ${appId} channel: ${channel} to ${android ? 'allow' : 'disallow'} android update`);
       channelPayload.android = !!android
     }
     if (selfAssign != null) {
-      console.log(`Set ${appId} channel: ${channel} to ${selfAssign ? 'allow' : 'disallow'} self assign to this channel`);
+      p.log.info(`Set ${appId} channel: ${channel} to ${selfAssign ? 'allow' : 'disallow'} self assign to this channel`);
       channelPayload.allow_device_self_set = !!selfAssign
     }
     try {
       const { error: dbError } = await updateOrCreateChannel(supabase, channelPayload, options.apikey)
-      if (dbError)
-        program.error(`Cannot set channel the upload key is not allowed to do that, use the "all" for this.`);
+      if (dbError) {
+        p.log.error(`Cannot set channel the upload key is not allowed to do that, use the "all" for this.`);
+        program.error('');
+      }
     }
     catch (e) {
-      program.error(`Cannot set channel the upload key is not allowed to do that, use the "all" for this.`);
+      p.log.error(`Cannot set channel the upload key is not allowed to do that, use the "all" for this.`);
+      program.error('');
     }
     await snag.publish({
       channel: 'channel',
@@ -125,8 +137,9 @@ export const setChannel = async (channel: string, appId: string, options: Option
       notify: false,
     }).catch()
   } catch (err) {
-    program.error(`Unknow error ${formatError(err)}`);
+    p.log.error(`Unknow error ${formatError(err)}`);
+    program.error('');
   }
-  console.log(`Done ✅`);
+  p.outro(`Done ✅`);
   process.exit()
 }

package/src/init.ts

@@ -392,13 +392,13 @@ const step10 = async (userId: string, snag: LogSnag,
 }
 
 export const initApp = async (apikey: string, appId: string, options: SuperOptions) => {
+    p.intro(`Capgo onboarding 🛫`);
     await checkLatest();
     const snag = useLogSnag()
     const config = await getConfig();
     appId = appId || config?.app?.appId
     apikey = apikey || findSavedKey()
 
-    p.intro(`Capgo init`);
     const log = p.spinner();
     log.start('Running: npx @capgo/cli@latest login ***');
     const loginRes = await login(apikey, options, false);

package/src/key.ts

@@ -1,6 +1,7 @@
 import { program } from 'commander'
 import { existsSync, readFileSync, writeFileSync } from 'fs'
 import { writeConfig } from '@capacitor/cli/dist/config';
+import * as p from '@clack/prompts';
 import { createRSA } from './api/crypto';
 import { baseKey, baseKeyPub, getConfig } from './utils';
 import { checkLatest } from './api/update';
@@ -15,7 +16,8 @@ interface Options {
 
 export const saveKey = async (options: saveOptions, log = true) => {
   if (!existsSync('.git')) {
-    program.error('To use local you should be in a git repository');
+    p.log.error('To use local you should be in a git repository');
+    program.error('');
   }
 
   const config = await getConfig();
@@ -28,7 +30,8 @@ export const saveKey = async (options: saveOptions, log = true) => {
 
   if (!existsSync(keyPath) && !privateKey) {
     if (log) {
-      program.error(`Cannot find public key ${keyPath} or as keyData option or in ${config.app.extConfigFilePath}`)
+      p.log.error(`Cannot find public key ${keyPath} or as keyData option or in ${config.app.extConfigFilePath}`);
+      program.error('');
     } else {
       return false
     }
@@ -50,28 +53,33 @@ export const saveKey = async (options: saveOptions, log = true) => {
     writeConfig(extConfig, config.app.extConfigFilePath)
   }
   if (log) {
-    console.log(`private key saved into ${config.app.extConfigFilePath} file in local directory`);
-    console.log(`your app will decode the zip archive with this key\n`);
+    p.log.success(`private key saved into ${config.app.extConfigFilePath} file in local directory`);
+    p.log.success(`your app will decode the zip archive with this key`);
   }
   return true
 }
 export const saveKeyCommand = async (options: saveOptions) => {
+  p.intro(`Save keys 🔑`);
   await checkLatest();
   await saveKey(options)
 }
 
 export const createKey = async (options: Options, log = true) => {
   // write in file .capgo the apikey in home directory
-
+  if (log) {
+    p.intro(`Create keys 🔑`);
+  }
   if (!existsSync('.git')) {
-    program.error('To use local you should be in a git repository');
+    p.log.error('To use local you should be in a git repository');
+    program.error('');
   }
   const { publicKey, privateKey } = createRSA()
 
   // check if baseName already exist
   if (existsSync(baseKeyPub) && !options.force) {
     if (log) {
-      program.error(`Public Key already exists, use --force to overwrite`);
+      p.log.error('Public Key already exists, use --force to overwrite');
+      program.error('');
     } else {
       return false
     }
@@ -79,7 +87,8 @@ export const createKey = async (options: Options, log = true) => {
   writeFileSync(baseKeyPub, publicKey);
   if (existsSync(baseKey) && !options.force) {
     if (log) {
-      program.error(`Private Key already exists, use --force to overwrite`);
+      p.log.error('Private Key already exists, use --force to overwrite');
+      program.error('');
     } else {
       return false
     }
@@ -101,12 +110,15 @@ export const createKey = async (options: Options, log = true) => {
   }
 
   if (log) {
-    console.log(`Your RSA key has been generated\n`);
-    console.log(`public key saved into ${baseKeyPub} file in local directory\n`);
-    console.log(`This key will be use to encode AES key used to crypt your zipped bundle before sending it to Capgo,
-  than make them unreadable by Capgo and unmodifiable by anyone\n`);
-    console.log(`Private key saved into ${config.app.extConfigFilePath} file in local directory`);
-    console.log(`Your app will decode with this RSA key the AES key and use it to decode the zipped bundle\n`);
+    p.log.success('Your RSA key has been generated')
+    p.log.success(`Public key saved in ${baseKeyPub}`)
+    p.log.success('This key will be use to crypt your bundle before sending it to Capgo')
+    p.log.success('Than make them unreadable by Capgo and unmodifiable by anyone')
+    p.log.success(`Private key saved in ${config.app.extConfigFilePath}`);
+    p.log.success('Your app will be the only one having it');
+    p.log.success('Only your users can decrypt your update');
+    p.log.success('Only you can send them an update');
+    p.outro(`Done ✅`);
   }
   return true
 }

package/src/login.ts

@@ -1,6 +1,7 @@
 import { program } from 'commander';
 import { existsSync, writeFileSync, appendFileSync } from 'fs'
 import { homedir } from 'os'
+import * as p from '@clack/prompts';
 import { createSupabaseClient, useLogSnag, verifyUser } from './utils';
 import { checkLatest } from './api/update';
 
@@ -9,6 +10,10 @@ interface Options {
 }
 
 export const login = async (apikey: string, options: Options, shouldExit = true) => {
+
+  if (shouldExit) {
+    p.intro(`Login to Capgo`);
+  }
   if (!apikey) {
     if (shouldExit) {
       program.error("Missing API key, you need to provide a API key to upload your bundle");
@@ -23,7 +28,8 @@ export const login = async (apikey: string, options: Options, shouldExit = true)
 
     if (local) {
       if (!existsSync('.git')) {
-        program.error('To use local you should be in a git repository');
+        p.log.error('To use local you should be in a git repository');
+        program.error('');
       }
       writeFileSync('.capgo', `${apikey}\n`);
       appendFileSync('.gitignore', '.capgo\n');
@@ -42,13 +48,13 @@ export const login = async (apikey: string, options: Options, shouldExit = true)
       },
       notify: false,
     }).catch()
-    console.log(`login saved into .capgo file in ${local ? 'local' : 'home'} directory`);
+    p.log.success(`login saved into .capgo file in ${local ? 'local' : 'home'} directory`);
   } catch (e) {
-    console.error(e);
+    p.log.error(`Error while saving login`);
     process.exit(1);
   }
   if (shouldExit) {
-    console.log(`Done ✅`);
+    p.outro('Done ✅');
     process.exit()
   }
   return true

package/src/utils.ts

@@ -8,6 +8,7 @@ import { LogSnag } from 'logsnag';
 import { Database } from 'types/supabase.types';
 import { resolve } from 'path';
 import open from 'open';
+import * as p from '@clack/prompts';
 
 export const baseKey = '.capgo_key';
 export const baseKeyPub = `${baseKey}.pub`;
@@ -16,6 +17,15 @@ export const hostWeb = 'https://web.capgo.app';
 export const hostSupa = process.env.SUPA_DB === 'production'
     ? 'https://xvwzpoazmxkqosrdewyv.supabase.co' : process.env.SUPA_DB || 'https://aucsybvnhavogdmzwtcw.supabase.co';
 
+export const defaulPublicKey = `-----BEGIN RSA PUBLIC KEY-----
+    MIIBCgKCAQEA4pW9olT0FBXXivRCzd3xcImlWZrqkwcF2xTkX/FwXmj9eh9HkBLr
+    sQmfsC+PJisRXIOGq6a0z3bsGq6jBpp3/Jr9jiaW5VuPGaKeMaZZBRvi/N5fIMG3
+    hZXSOcy0IYg+E1Q7RkYO1xq5GLHseqG+PXvJsNe4R8R/Bmd/ngq0xh/cvcrHHpXw
+    O0Aj9tfprlb+rHaVV79EkVRWYPidOLnK1n0EFHFJ1d/MyDIp10TEGm2xHpf/Brlb
+    1an8wXEuzoC0DgYaczgTjovwR+ewSGhSHJliQdM0Qa3o1iN87DldWtydImMsPjJ3
+    DUwpsjAMRe5X8Et4+udFW2ciYnQo9H0CkwIDAQAB
+    -----END RSA PUBLIC KEY-----`
+
 if (process.env.SUPA_DB !== 'production') {
     console.log('hostSupa', hostSupa);
 }
@@ -89,7 +99,7 @@ export const isAllowedAction = async (supabase: SupabaseClient<Database>, userId
 export const checkPlanValid = async (supabase: SupabaseClient<Database>, userId: string, warning = true) => {
     const validPlan = await isAllowedAction(supabase, userId)
     if (!validPlan) {
-        console.error(`You need to upgrade your plan to continue to use capgo.\n Upgrade here: ${hostWeb}/dashboard/settings/plans\n`);
+        p.log.error(`You need to upgrade your plan to continue to use capgo.\n Upgrade here: ${hostWeb}/dashboard/settings/plans\n`);
         setTimeout(() => {
             open(`${hostWeb}/dashboard/settings/plans`)
             program.error('')
@@ -97,7 +107,7 @@ export const checkPlanValid = async (supabase: SupabaseClient<Database>, userId:
     }
     const trialDays = await isTrial(supabase, userId)
     if (trialDays > 0 && warning) {
-        console.log(`WARNING !!\nTrial expires in ${trialDays} days, upgrade here: ${hostWeb}/dashboard/settings/plans\n`);
+        p.log.warn(`WARNING !!\nTrial expires in ${trialDays} days, upgrade here: ${hostWeb}/dashboard/settings/plans\n`);
     }
 }
 
@@ -107,12 +117,12 @@ export const findSavedKey = () => {
     let key
     let keyPath = `${userHomeDir}/.capgo`;
     if (existsSync(keyPath)) {
-        console.log(`Use global apy key ${keyPath}`)
+        p.log.info(`Use global apy key ${keyPath}`)
         key = readFileSync(keyPath, 'utf8').trim();
     }
     keyPath = `.capgo`;
     if (!key && existsSync(keyPath)) {
-        console.log(`Use local apy key ${keyPath}`)
+        p.log.info(`Use local apy key ${keyPath}`)
         key = readFileSync(keyPath, 'utf8').trim();
     }
     if (!key)
@@ -145,7 +155,7 @@ export const findMainFile = async () => {
         const folders = f.split('/').length - pwdL
         if (folders <= 2 && mainRegex.test(f)) {
             mainFile = f
-            console.log('Found main file here', f)
+            p.log.info(`Found main file here ${f}`)
             break
         }
     }