@capgo/cli 4.2.4 → 5.0.0-alpha.3

package/src/key.ts

@@ -21,14 +21,15 @@ export async function saveKey(options: saveOptions, log = true) {
   const config = await getConfig()
   const { extConfig } = config.app
 
-  const keyPath = options.key || baseKey
+  // const keyPath = options.key || baseKey
+  const keyPath = options.key || baseKeyPub
   // check if publicKey exist
 
-  let privateKey = options.keyData || ''
+  let publicKey = options.keyData || ''
 
-  if (!existsSync(keyPath) && !privateKey) {
+  if (!existsSync(keyPath) && !publicKey) {
     if (log) {
-      p.log.error(`Cannot find public key ${keyPath} or as keyData option or in ${config.app.extConfigFilePath}`)
+      p.log.error(`Cannot find a public key at ${keyPath} or as keyData option or in ${config.app.extConfigFilePath}`)
       program.error('')
     }
     else {
@@ -38,7 +39,20 @@ export async function saveKey(options: saveOptions, log = true) {
   else if (existsSync(keyPath)) {
     // open with fs publicKey path
     const keyFile = readFileSync(keyPath)
-    privateKey = keyFile.toString()
+    publicKey = keyFile.toString()
+  }
+
+  // let's doublecheck and make sure the key we are saving is the right type based on the decryption strategy
+  if (publicKey) {
+    if (!publicKey.startsWith('-----BEGIN RSA PUBLIC KEY-----')) {
+      if (log) {
+        p.log.error(`the public key provided is not a valid RSA Public key`)
+        program.error('')
+      }
+      else {
+        return false
+      }
+    }
   }
 
   if (extConfig) {
@@ -51,12 +65,16 @@ export async function saveKey(options: saveOptions, log = true) {
     if (!extConfig.plugins.CapacitorUpdater)
       extConfig.plugins.CapacitorUpdater = {}
 
-    extConfig.plugins.CapacitorUpdater.privateKey = privateKey
+    // TODO: this might be a breaking change if user has other code looking at the specific value in the config file
+    if (extConfig.plugins.CapacitorUpdater.privateKey)
+      delete extConfig.plugins.CapacitorUpdater.privateKey
+    extConfig.plugins.CapacitorUpdater.publicKey = publicKey
+
     // console.log('extConfig', extConfig)
     writeConfig(extConfig, config.app.extConfigFilePath)
   }
   if (log) {
-    p.log.success(`private key saved into ${config.app.extConfigFilePath} file in local directory`)
+    p.log.success(`public 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
@@ -98,6 +116,7 @@ export async function createKey(options: Options, log = true) {
 
   const config = await getConfig()
   const { extConfig } = config.app
+
   if (extConfig) {
     if (!extConfig.plugins) {
       extConfig.plugins = {
@@ -105,21 +124,29 @@ export async function createKey(options: Options, log = true) {
         CapacitorUpdater: {},
       }
     }
-    extConfig.plugins.CapacitorUpdater.privateKey = privateKey
+
+    if (!extConfig.plugins.CapacitorUpdater)
+      extConfig.plugins.CapacitorUpdater = {}
+
+    // TODO: this might be a breaking change if user has other code looking at the specific value in the config file
+    if (extConfig.plugins.CapacitorUpdater.privateKey)
+      delete extConfig.plugins.CapacitorUpdater.privateKey
+    extConfig.plugins.CapacitorUpdater.publicKey = publicKey
+
     // console.log('extConfig', extConfig)
     writeConfig(extConfig, config.app.extConfigFilePath)
   }
 
   if (log) {
     p.log.success('Your RSA key has been generated')
-    p.log.success(`Public key saved in ${baseKeyPub}`)
+    p.log.success(`Private key saved in ${baseKey}`)
     p.log.success('This key will be use to encrypt your bundle before sending it to Capgo')
     p.log.success('Keep it safe')
     p.log.success('Than make it unreadable by Capgo and unmodifiable by anyone')
-    p.log.success(`Private key saved in ${config.app.extConfigFilePath}`)
+    p.log.success(`Public 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.log.success('Only your key can send them an update')
     p.outro(`Done ✅`)
   }
   return true

package/src/types/supabase.types.ts

@@ -648,42 +648,54 @@ export interface Database {
       global_stats: {
         Row: {
           apps: number
+          apps_active: number | null
           created_at: string | null
           date_id: string
           need_upgrade: number | null
           not_paying: number | null
           onboarded: number | null
           paying: number | null
+          paying_monthly: number | null
+          paying_yearly: number | null
           stars: number
           trial: number | null
           updates: number
           users: number | null
+          users_active: number | null
         }
         Insert: {
           apps: number
+          apps_active?: number | null
           created_at?: string | null
           date_id: string
           need_upgrade?: number | null
           not_paying?: number | null
           onboarded?: number | null
           paying?: number | null
+          paying_monthly?: number | null
+          paying_yearly?: number | null
           stars: number
           trial?: number | null
           updates: number
           users?: number | null
+          users_active?: number | null
         }
         Update: {
           apps?: number
+          apps_active?: number | null
           created_at?: string | null
           date_id?: string
           need_upgrade?: number | null
           not_paying?: number | null
           onboarded?: number | null
           paying?: number | null
+          paying_monthly?: number | null
+          paying_yearly?: number | null
           stars?: number
           trial?: number | null
           updates?: number
           users?: number | null
+          users_active?: number | null
         }
         Relationships: []
       }
@@ -1257,6 +1269,12 @@ export interface Database {
         }
         Returns: number
       }
+      count_active_users: {
+        Args: {
+          app_ids: string[]
+        }
+        Returns: number
+      }
       count_all_apps: {
         Args: Record<PropertyKey, never>
         Returns: number
@@ -1382,6 +1400,14 @@ export interface Database {
           }
           Returns: string
         }
+      get_customer_counts: {
+        Args: Record<PropertyKey, never>
+        Returns: {
+          yearly: number
+          monthly: number
+          total: number
+        }[]
+      }
       get_cycle_info:
         | {
           Args: Record<PropertyKey, never>
@@ -1930,35 +1956,37 @@ export interface Database {
     }
     CompositeTypes: {
       match_plan: {
-        name: string
+        name: string | null
       }
       orgs_table: {
-        id: string
-        created_by: string
-        created_at: string
-        updated_at: string
-        logo: string
-        name: string
+        id: string | null
+        created_by: string | null
+        created_at: string | null
+        updated_at: string | null
+        logo: string | null
+        name: string | null
       }
       owned_orgs: {
-        id: string
-        created_by: string
-        logo: string
-        name: string
-        role: string
+        id: string | null
+        created_by: string | null
+        logo: string | null
+        name: string | null
+        role: string | null
       }
       stats_table: {
-        mau: number
-        bandwidth: number
-        storage: number
+        mau: number | null
+        bandwidth: number | null
+        storage: number | null
       }
     }
   }
 }
 
+type PublicSchema = Database[Extract<keyof Database, 'public'>]
+
 export type Tables<
   PublicTableNameOrOptions extends
-  | keyof (Database['public']['Tables'] & Database['public']['Views'])
+  | keyof (PublicSchema['Tables'] & PublicSchema['Views'])
   | { schema: keyof Database },
   TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
     ? keyof (Database[PublicTableNameOrOptions['schema']]['Tables'] &
@@ -1971,10 +1999,10 @@ export type Tables<
     }
       ? R
       : never
-  : PublicTableNameOrOptions extends keyof (Database['public']['Tables'] &
-  Database['public']['Views'])
-    ? (Database['public']['Tables'] &
-    Database['public']['Views'])[PublicTableNameOrOptions] extends {
+  : PublicTableNameOrOptions extends keyof (PublicSchema['Tables'] &
+  PublicSchema['Views'])
+    ? (PublicSchema['Tables'] &
+    PublicSchema['Views'])[PublicTableNameOrOptions] extends {
         Row: infer R
       }
         ? R
@@ -1983,7 +2011,7 @@ export type Tables<
 
 export type TablesInsert<
   PublicTableNameOrOptions extends
-  | keyof Database['public']['Tables']
+  | keyof PublicSchema['Tables']
   | { schema: keyof Database },
   TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
     ? keyof Database[PublicTableNameOrOptions['schema']]['Tables']
@@ -1994,8 +2022,8 @@ export type TablesInsert<
   }
     ? I
     : never
-  : PublicTableNameOrOptions extends keyof Database['public']['Tables']
-    ? Database['public']['Tables'][PublicTableNameOrOptions] extends {
+  : PublicTableNameOrOptions extends keyof PublicSchema['Tables']
+    ? PublicSchema['Tables'][PublicTableNameOrOptions] extends {
       Insert: infer I
     }
       ? I
@@ -2004,7 +2032,7 @@ export type TablesInsert<
 
 export type TablesUpdate<
   PublicTableNameOrOptions extends
-  | keyof Database['public']['Tables']
+  | keyof PublicSchema['Tables']
   | { schema: keyof Database },
   TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
     ? keyof Database[PublicTableNameOrOptions['schema']]['Tables']
@@ -2015,8 +2043,8 @@ export type TablesUpdate<
   }
     ? U
     : never
-  : PublicTableNameOrOptions extends keyof Database['public']['Tables']
-    ? Database['public']['Tables'][PublicTableNameOrOptions] extends {
+  : PublicTableNameOrOptions extends keyof PublicSchema['Tables']
+    ? PublicSchema['Tables'][PublicTableNameOrOptions] extends {
       Update: infer U
     }
       ? U
@@ -2025,13 +2053,13 @@ export type TablesUpdate<
 
 export type Enums<
   PublicEnumNameOrOptions extends
-  | keyof Database['public']['Enums']
+  | keyof PublicSchema['Enums']
   | { schema: keyof Database },
   EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
     ? keyof Database[PublicEnumNameOrOptions['schema']]['Enums']
     : never = never,
 > = PublicEnumNameOrOptions extends { schema: keyof Database }
   ? Database[PublicEnumNameOrOptions['schema']]['Enums'][EnumName]
-  : PublicEnumNameOrOptions extends keyof Database['public']['Enums']
-    ? Database['public']['Enums'][PublicEnumNameOrOptions]
+  : PublicEnumNameOrOptions extends keyof PublicSchema['Enums']
+    ? PublicSchema['Enums'][PublicEnumNameOrOptions]
     : never

package/src/utils.ts

@@ -378,7 +378,6 @@ interface Config {
           resetWhenUpdate?: boolean
           updateUrl?: string
           statsUrl?: string
-          privateKey?: string
           version?: string
           directUpdate?: boolean
           periodCheckDelay?: number
@@ -389,6 +388,9 @@ interface Config {
           localSupaAnon?: string
           allowModifyUrl?: boolean
           defaultChannel?: string
+          channelUrl?: string
+          publicKey?: string
+          privateKey?: string
         }
       }
       server: {
@@ -399,6 +401,25 @@ interface Config {
   }
 }
 
+export async function checKOldEncryption() {
+  const config = await getConfig()
+  const { extConfig } = config.app
+  // console.log('localConfig - ', localConfig)
+  // console.log('config - ', config)
+
+  const hasPrivateKeyInConfig = !!extConfig?.plugins?.CapacitorUpdater?.privateKey
+  const hasPublicKeyInConfig = !!extConfig?.plugins?.CapacitorUpdater?.publicKey
+
+  if (hasPrivateKeyInConfig)
+    p.log.warning(`You still have privateKey in the capacitor config, this is deprecated, please remove it`)
+  p.log.warning(`Encryption with private will be ignored`)
+
+  if (!hasPublicKeyInConfig) {
+    p.log.warning(`publicKey not found in capacitor config, please run npx @capgo/cli key save`)
+    program.error('')
+  }
+}
+
 export async function updateOrCreateVersion(supabase: SupabaseClient<Database>, update: Database['public']['Tables']['app_versions']['Insert']) {
   return supabase.from('app_versions')
     .upsert(update, { onConflict: 'name,app_id' })