@capgo/cli 0.8.6 → 0.11.0

package/src/bin/set.ts

@@ -1,19 +1,21 @@
-import { loadConfig } from '@capacitor/cli/dist/config';
-import axios from 'axios';
-import prettyjson from 'prettyjson';
 import { program } from 'commander';
-import { host } from './utils';
+import { getConfig, createSupabaseClient, updateOrCreateChannel, host, formatError, findSavedKey } from './utils';
+import { definitions } from './types_supabase';
 
-export const setChannel = async (appid, options) => {
-  const { apikey, version, state, channel = 'dev' } = options;
-  let config;
-  let res;
-  try {
-    config = await loadConfig();
-  } catch (err) {
-    program.error("No capacitor config file found, run `cap init` first");
-  }
+interface Options {
+  apikey: string;
+  version: string;
+  state: string;
+  channel?: string;
+}
+
+export const setChannel = async (appid: string, options: Options) => {
+  let { version } = options;
+  const { state, channel = 'dev' } = options;
+  const apikey = options.apikey || findSavedKey()
+  const config = await getConfig();
   appid = appid || config?.app?.appId
+  version = version || config?.app?.package?.version
   let parsedState
   if (state === 'public' || state === 'private')
     parsedState = state === 'public'
@@ -32,25 +34,50 @@ export const setChannel = async (appid, options) => {
     console.log(`Set${channel} to @${state} in ${appid}`);
   }
   try {
-    res = await axios({
-      method: 'POST',
-      url: `${host}/api/channel`,
-      data: {
-        version,
-        public: parsedState,
-        appid,
-        channel,
-      },
-      validateStatus: () => true,
-      headers: {
-        'authorization': apikey
-      }
-    })
+    const supabase = createSupabaseClient(apikey)
+    const { data: apiAccess, error: apiAccessError } = await supabase
+      .rpc('is_allowed_capgkey', { apikey, keymode: ['write', 'all'], app_id: appid })
+
+    if (!apiAccess || apiAccessError) {
+      program.error("Invalid API key or insufisant rights");
+    }
+    const { data: dataUser, error: userIdError } = await supabase
+      .rpc<string>('get_user_id', { apikey })
+
+    const userId = dataUser ? dataUser.toString() : '';
+
+    if (!userId || userIdError) {
+      program.error('Cannot verify user')
+    }
+    const channelPayload: Partial<definitions['channels']> = {
+      created_by: userId,
+      app_id: appid,
+      name: channel,
+    }
+    if (version) {
+      const { data, error: vError } = await supabase
+        .from<definitions['app_versions']>('app_versions')
+        .select()
+        .eq('app_id', appid)
+        .eq('name', version)
+        .eq('user_id', userId)
+        .eq('deleted', false)
+      if (vError || !data || !data.length)
+        program.error(`Cannot find version ${version}`);
+      channelPayload.version = data[0].id
+    }
+    if (parsedState !== undefined)
+      channelPayload.public = parsedState
+    try {
+      const { error: dbError } = await updateOrCreateChannel(supabase, channelPayload, apikey)
+      if (dbError)
+        program.error(`Cannot set channel ${formatError(dbError)}`);
+    }
+    catch (e) {
+      program.error(`Cannot set channel ${formatError(e)}`);
+    }
   } catch (err) {
-    program.error(`Network Error \n${prettyjson.render(err.response.data)}`);
-  }
-  if (!res || res.status !== 200) {
-    program.error(`Server Error \n${prettyjson.render(res.data)}`);
+    program.error(`Unknow error ${formatError(err)}`);
   }
   if (version) {
     console.log(`Done ✅`);

package/src/bin/types.d.ts

@@ -0,0 +1,6 @@
+// CapacitorConfig
+
+declare module '@capacitor/cli/dist/config' {
+    export function loadConfig(): CapacitorConfig;
+};
+