@capgo/cli 3.14.55 → 3.14.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "3.14.55",
+  "version": "3.14.57",
   "description": "A CLI to upload to capgo servers",
   "main": "dist/index.js",
   "bin": {

package/src/api/app.ts

@@ -2,7 +2,7 @@ import { SupabaseClient } from '@supabase/supabase-js';
 import * as p from '@clack/prompts';
 import { program } from 'commander';
 import { Database } from 'types/supabase.types';
-import { isAllowedApp, OptionsBase } from '../utils';
+import { isAllowedApp, isAllowedAppOrg, OptionsBase, OrganizationPerm } from '../utils';
 
 export const checkAppExists = async (supabase: SupabaseClient<Database>, appid: string) => {
   const { data: app } = await supabase
@@ -30,6 +30,46 @@ export const checkAppExistsAndHasPermissionErr = async (supabase: SupabaseClient
   }
 }
 
+export const checkAppExistsAndHasPermissionOrgErr = async (
+  supabase: SupabaseClient<Database>, 
+  apikey: string, 
+  appid: string, 
+  requiredPermission: OrganizationPerm
+) => {
+  const permissions = await isAllowedAppOrg(supabase, apikey, appid)
+  if (!permissions.okay) {
+    // eslint-disable-next-line default-case
+    switch (permissions.error) {
+      case 'INVALID_APIKEY': {
+        p.log.error('Invalid apikey, such apikey does not exists!')
+        program.error('');
+        break
+      }
+      case 'NO_APP': {
+        p.log.error(`App ${appid} does not exist`);
+        program.error('');
+        break
+      }
+      case 'NO_ORG': {
+        p.log.error('Could not find organization, please contact support to resolve this!')
+        program.error('')
+        break
+      }
+    }
+  }
+
+  const remotePermNumber = permissions.data as number
+  const requiredPermNumber = requiredPermission as number
+
+  if (requiredPermNumber > remotePermNumber) {
+    // eslint-disable-next-line max-len
+    p.log.error(`Insuficcent permissions for app ${appid}. Current permission: ${OrganizationPerm[permissions.data]}, required for this action: ${OrganizationPerm[requiredPermission]}.`)
+    program.error('')
+  }
+
+  return permissions.data
+}
+
 export interface Options extends OptionsBase {
   name?: string;
   icon?: string;

package/src/api/channels.ts

@@ -87,12 +87,12 @@ export const displayChannels = (data: (Database['public']['Tables']['channels'][
   p.log.success(t.render());
 }
 
-export const getActiveChannels = async (supabase: SupabaseClient<Database>, appid: string, userId: string) => {
+export const getActiveChannels = async (supabase: SupabaseClient<Database>, appid: string) => {
   const { data, error: vError } = await supabase
     .from('channels')
     .select()
     .eq('app_id', appid)
-    .eq('created_by', userId)
+    // .eq('created_by', userId)
     .order('created_at', { ascending: false });
 
   if (vError) {

package/src/app/list.ts

@@ -24,11 +24,11 @@ const displayApp = (data: Database['public']['Tables']['apps']['Row'][]) => {
   p.log.success(t.render());
 }
 
-export const getActiveApps = async (supabase: SupabaseClient<Database>, userId: string) => {
+export const getActiveApps = async (supabase: SupabaseClient<Database>) => {
   const { data, error: vError } = await supabase
     .from('apps')
     .select()
-    .eq('user_id', userId)
+    // .eq('user_id', userId)
     .order('created_at', { ascending: false });
 
   if (vError) {
@@ -46,12 +46,12 @@ export const listApp = async (options: OptionsBase) => {
 
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload']);
+  await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload']);
 
   p.log.info(`Getting active bundle in Capgo`);
 
   // Get all active app versions we might possibly be able to cleanup
-  const allApps = await getActiveApps(supabase, userId);
+  const allApps = await getActiveApps(supabase);
 
   p.log.info(`Active app in Capgo: ${allApps?.length}`);
 

package/src/bundle/upload.ts

@@ -7,7 +7,7 @@ import { checksum as getChecksum } from '@tomasklaen/checksum';
 import ciDetect from 'ci-info';
 import axios from "axios";
 import { checkLatest } from '../api/update';
-import { checkAppExistsAndHasPermissionErr } from "../api/app";
+import { checkAppExistsAndHasPermissionOrgErr } from "../api/app";
 import { encryptSource } from '../api/crypto';
 import {
   OptionsBase,
@@ -15,8 +15,11 @@ import {
   uploadUrl,
   updateOrCreateChannel, updateOrCreateVersion,
   formatError, findSavedKey, checkPlanValid,
-  useLogSnag, verifyUser, regexSemver, baseKeyPub, convertAppName, getLocalConfig, checkCompatibility, requireUpdateMetadata,
-  getLocalDepenencies
+  useLogSnag, regexSemver, baseKeyPub, convertAppName, getLocalConfig, checkCompatibility, requireUpdateMetadata,
+  getLocalDepenencies,
+  verifyUser,
+  OrganizationPerm,
+  hasOrganizationPerm
 } from '../utils';
 import { checkIndexPosition, searchInDirectory } from './check';
 
@@ -99,7 +102,9 @@ export const uploadBundle = async (appid: string, options: Options, shouldExit =
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all', 'upload']);
   await checkPlanValid(supabase, userId, false)
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appid);
+  // await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appid);
+
+  const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, OrganizationPerm.upload)
 
   const updateMetadataRequired = await requireUpdateMetadata(supabase, channel)
 
@@ -334,7 +339,8 @@ It will be also visible in your dashboard\n`);
   const { data: versionId } = await supabase
     .rpc('get_app_versions', { apikey: options.apikey, name_version: bundle, appid })
     .single()
-  if (versionId) {
+
+  if (versionId && hasOrganizationPerm(permissions, OrganizationPerm.write)) {
     const { error: dbError3, data } = await updateOrCreateChannel(supabase, {
       name: channel,
       app_id: appid,
@@ -356,9 +362,11 @@ It will be also visible in your dashboard\n`);
     if(options.bundleUrl) {
       p.log.info(`Bundle url: ${bundleUrl}`);
     }
-  } else {
+  } else if (!versionId) {
     p.log.warn('Cannot set bundle with upload key, use key with more rights for that');
     program.error('');
+  } else if (!hasOrganizationPerm(permissions, OrganizationPerm.write)) {
+    p.log.warn('Cannot set channel as a upload organization member')
   }
   await snag.track({
     channel: 'app',

package/src/channel/list.ts

@@ -27,7 +27,7 @@ export const listChannels = async (appId: string, options: OptionsBase) => {
   p.log.info(`Querying available channels in Capgo`);
 
   // Get all active app versions we might possibly be able to cleanup
-  const allVersions = await getActiveChannels(supabase, appId, userId);
+  const allVersions = await getActiveChannels(supabase, appId);
 
   p.log.info(`Active channels in Capgo: ${allVersions?.length}`);