prettier things

supabase · Feb 7, 2022 · 9850273 · 9850273
1 parent c053c0d
commit 9850273
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 41 deletions.
diff --git a/src/plugins/postgrest.ts b/src/plugins/postgrest.ts
@@ -13,13 +13,8 @@ declare module 'fastify' {
 }
 
 async function getPostgrestClient(request: FastifyRequest, jwt: string): Promise<PostgrestClient> {
-  const {
-    anonKey,
-    isMultitenant,
-    postgrestURL,
-    postgrestURLSuffix,
-    xForwardedHostRegExp,
-  } = getConfig()
+  const { anonKey, isMultitenant, postgrestURL, postgrestURLSuffix, xForwardedHostRegExp } =
+    getConfig()
   let url = postgrestURL
   let apiKey = anonKey
   if (isMultitenant && xForwardedHostRegExp) {

diff --git a/src/routes/bucket/createBucket.ts b/src/routes/bucket/createBucket.ts
@@ -62,7 +62,11 @@ export default async function routes(fastify: FastifyInstance) {
           .send(createResponse('The key contains invalid characters', '400', 'Invalid key'))
       }
 
-      const { data: results, error, status } = await request.postgrest
+      const {
+        data: results,
+        error,
+        status,
+      } = await request.postgrest
         .from<Bucket>('buckets')
         .insert(
           [

diff --git a/src/routes/bucket/getAllBuckets.ts b/src/routes/bucket/getAllBuckets.ts
@@ -33,7 +33,11 @@ export default async function routes(fastify: FastifyInstance) {
     },
     async (request, response) => {
       // get list of all buckets
-      const { data: results, error, status } = await request.postgrest
+      const {
+        data: results,
+        error,
+        status,
+      } = await request.postgrest
         .from<Bucket>('buckets')
         .select('id, name, public, owner, created_at, updated_at')
 

diff --git a/src/routes/object/copyObject.ts b/src/routes/object/copyObject.ts
@@ -105,7 +105,11 @@ export default async function routes(fastify: FastifyInstance) {
         owner,
       })
       request.log.info({ origObject }, 'newObject')
-      const { data: results, error, status } = await request.postgrest
+      const {
+        data: results,
+        error,
+        status,
+      } = await request.postgrest
         .from<Obj>('objects')
         .insert([newObject], {
           returning: 'minimal',

diff --git a/src/routes/object/listObjects.ts b/src/routes/object/listObjects.ts
@@ -72,7 +72,11 @@ export default async function routes(fastify: FastifyInstance) {
       request.log.info(request.body)
       request.log.info(`searching for %s`, prefix)
 
-      const { data: results, error, status } = await request.postgrest
+      const {
+        data: results,
+        error,
+        status,
+      } = await request.postgrest
         .rpc('search', {
           prefix,
           bucketname: bucketName,

diff --git a/src/server.ts b/src/server.ts
@@ -8,7 +8,7 @@ import { getConfig } from './utils/config'
 import { runMultitenantMigrations, runMigrations } from './utils/migrate'
 import { cacheTenantConfigsFromDbAndRunMigrations } from './utils/tenant'
 
-let logger = pino({
+const logger = pino({
   formatters: {
     level(label) {
       return { level: label }
@@ -19,36 +19,36 @@ let logger = pino({
 
 const exposeDocs = true
 
-  ; (async () => {
-    const { isMultitenant } = getConfig()
-    if (isMultitenant) {
-      await runMultitenantMigrations()
-      await cacheTenantConfigsFromDbAndRunMigrations()
-
-      const adminApp: FastifyInstance<Server, IncomingMessage, ServerResponse> = buildAdmin({
-        logger,
-      })
-
-      try {
-        await adminApp.listen(5001, '0.0.0.0')
-      } catch (err) {
-        adminApp.log.error(err)
-        process.exit(1)
-      }
-    } else {
-      await runMigrations()
-    }
+;(async () => {
+  const { isMultitenant } = getConfig()
+  if (isMultitenant) {
+    await runMultitenantMigrations()
+    await cacheTenantConfigsFromDbAndRunMigrations()
 
-    const app: FastifyInstance<Server, IncomingMessage, ServerResponse> = build({
+    const adminApp: FastifyInstance<Server, IncomingMessage, ServerResponse> = buildAdmin({
       logger,
-      exposeDocs,
     })
 
-    app.listen(5000, '0.0.0.0', (err, address) => {
-      if (err) {
-        console.error(err)
-        process.exit(1)
-      }
-      console.log(`Server listening at ${address}`)
-    })
-  })()
+    try {
+      await adminApp.listen(5001, '0.0.0.0')
+    } catch (err) {
+      adminApp.log.error(err)
+      process.exit(1)
+    }
+  } else {
+    await runMigrations()
+  }
+
+  const app: FastifyInstance<Server, IncomingMessage, ServerResponse> = build({
+    logger,
+    exposeDocs,
+  })
+
+  app.listen(5000, '0.0.0.0', (err, address) => {
+    if (err) {
+      console.error(err)
+      process.exit(1)
+    }
+    console.log(`Server listening at ${address}`)
+  })
+})()