Merge pull request #19 from RoboVault/feat/cli-qol-fixes

fix logins

Author: hazelnutcloud

cli/key/delete.ts

@@ -1,10 +1,10 @@
 import { spinner } from '../spinner.ts'
-import { getSupabaseClient } from '../utils.ts'
+import { getSupabaseClientAndLogin } from '../utils.ts'
 
 export const action = async (key: string) => {
   spinner(`Deleting key ${key}`)
 
-  const client = getSupabaseClient()
+  const { supabase: client } = await getSupabaseClientAndLogin()
 
   const { error } = await client.functions.invoke('api-key', {
     method: 'DELETE',

cli/key/list.ts

@@ -1,10 +1,10 @@
 import { spinner } from '../spinner.ts'
-import { getSupabaseClient } from '../utils.ts'
+import { getSupabaseClientAndLogin } from '../utils.ts'
 
 export const action = async () => {
   spinner('Fetching API keys')
 
-  const client = getSupabaseClient()
+  const { supabase: client } = await getSupabaseClientAndLogin()
 
   const { data, error } = await client.functions.invoke<{ api_key: string }[]>(
     'api-key',

cli/key/new.ts

@@ -1,9 +1,9 @@
 import { spinner } from '../spinner.ts'
-import { getSupabaseClient } from '../utils.ts'
+import { getSupabaseClientAndLogin } from '../utils.ts'
 
 export const action = async () => {
   spinner('Generating new API key')
-  const client = getSupabaseClient()
+  const { supabase: client } = await getSupabaseClientAndLogin()
 
   const { data, error } = await client.functions.invoke('api-key', {
     method: 'POST',

cli/remove/mod.ts

@@ -1,7 +1,7 @@
 import { SUPABASE_FUNCTIONS_URL } from '../constants.ts'
-import { join, wait } from '../deps.ts'
-import { login } from '../login/mod.ts'
-import { getSupabaseClient } from '../utils.ts'
+import { join } from '../deps.ts'
+import { spinner } from '../spinner.ts'
+import { getSupabaseClientAndLogin } from '../utils.ts'
 
 export const action = async (
   options: { manifest: string },
@@ -11,7 +11,7 @@ export const action = async (
 
   if (dev) return deleteDev(options, directory)
 
-  const spinner = wait('Deleting...').start()
+  spinner('Deleting...')
 
   try {
     const { manifest: manifestPath } = options
@@ -36,26 +36,12 @@ export const action = async (
     }
 
     // delete package
-    const supabase = getSupabaseClient()
-    const sessionRes = await supabase.auth.getSession()
-
-    if (!sessionRes.data.session) {
-      await login({}, supabase)
-    }
-
-    const userRes = await supabase.auth.getUser()
-    if (userRes.error) {
-      throw userRes.error
-    }
-
-    if (!sessionRes.data.session) {
-      throw new Error('Not logged in')
-    }
+    const { session } = await getSupabaseClientAndLogin()
 
     const headers = new Headers()
     headers.append(
       'Authorization',
-      `Bearer ${sessionRes.data.session.access_token}`,
+      `Bearer ${session.access_token}`,
     )
 
     const deleteRes = await fetch(
@@ -70,9 +56,9 @@ export const action = async (
       throw new Error(await deleteRes.text())
     }
 
-    spinner.succeed('Deleted successfully!')
+    spinner().succeed('Deleted successfully!')
   } catch (error) {
-    spinner.fail('Deletion failed: ' + error.message)
+    spinner().fail('Deletion failed: ' + error.message)
     console.error(error)
   }
 

cli/start/mod.ts

@@ -33,33 +33,40 @@ export const action = async (
   }
 
   if (!options.mongoConnection && options.db) {
-    const cleanup = async () => {
-      console.log(`\nCleaning up...`)
-      const stopRes = await $`docker stop ${
-        containerId.stdout.substring(0, 12)
-      }`
-        .stdout('piped')
-      Deno.exit(stopRes.code)
-    }
-
-    const addSignalToCleanup = (signal: Deno.Signal) => {
-      try {
-        Deno.addSignalListener(signal, cleanup)
-        // deno-lint-ignore no-unused-vars no-empty
-      } catch (e) {}
+    try {
+      const cleanup = async () => {
+        console.log(`\nCleaning up...`)
+        const stopRes = await $`docker stop ${
+          containerId.stdout.substring(0, 12)
+        }`
+          .stdout('piped')
+        Deno.exit(stopRes.code)
+      }
+
+      const addSignalToCleanup = (signal: Deno.Signal) => {
+        try {
+          Deno.addSignalListener(signal, cleanup)
+          // deno-lint-ignore no-unused-vars no-empty
+        } catch (e) {}
+      }
+
+      addSignalToCleanup('SIGINT')
+      addSignalToCleanup('SIGHUP')
+      addSignalToCleanup('SIGTERM')
+      addSignalToCleanup('SIGQUIT')
+      addSignalToCleanup('SIGTSTP')
+      addSignalToCleanup('SIGABRT')
+
+      const containerId =
+        await $`docker run --name arkiver_mongodb -d -p 27017:27017 --env MONGO_INITDB_ROOT_USERNAME=admin --env MONGO_INITDB_ROOT_PASSWORD=password --rm mongo`
+          .stdout('piped')
+      await delay(3000) // wait for db to start
+    } catch (e) {
+      console.error(
+        `Failed to start mongodb container: ${e.message}, ${e.stack}`,
+      )
+      Deno.exit(1)
     }
-
-    addSignalToCleanup('SIGINT')
-    addSignalToCleanup('SIGHUP')
-    addSignalToCleanup('SIGTERM')
-    addSignalToCleanup('SIGQUIT')
-    addSignalToCleanup('SIGTSTP')
-    addSignalToCleanup('SIGABRT')
-
-    const containerId =
-      await $`docker run --name arkiver_mongodb -d -p 27017:27017 --env MONGO_INITDB_ROOT_USERNAME=admin --env MONGO_INITDB_ROOT_PASSWORD=password --rm mongo`
-        .stdout('piped')
-    await delay(3000) // wait for db to start
   }
 
   const { manifest: manifestPath } = options