@budibase/server 1.0.196 → 1.0.199

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.196",
+  "version": "1.0.199",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.196",
-    "@budibase/client": "^1.0.196",
-    "@budibase/pro": "1.0.195",
-    "@budibase/string-templates": "^1.0.196",
+    "@budibase/backend-core": "^1.0.199",
+    "@budibase/client": "^1.0.199",
+    "@budibase/pro": "1.0.198",
+    "@budibase/string-templates": "^1.0.199",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -184,5 +184,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "a7f4959e853eba49c4de3d7d355a98900eaa0591"
+  "gitHead": "2c737c1a615123b11482a239e7044356b27a268a"
 }

package/src/definitions/datasource.ts

@@ -48,7 +48,7 @@ export enum SourceNames {
   REST = "REST",
   ORACLE = "ORACLE",
   GOOGLE_SHEETS = "GOOGLE_SHEETS",
-  FIREBASE = "FIREBASE",
+  FIRESTORE = "FIRESTORE",
   REDIS = "REDIS",
 }
 

package/src/integrations/firebase.ts

@@ -11,7 +11,6 @@ module Firebase {
     email: string
     privateKey: string
     projectId: string
-    serviceAccount?: string
   }
 
   const SCHEMA: Integration = {
@@ -32,10 +31,6 @@ module Firebase {
         type: DatasourceFieldTypes.STRING,
         required: true,
       },
-      serviceAccount: {
-        type: DatasourceFieldTypes.JSON,
-        required: false,
-      },
     },
     query: {
       create: {
@@ -96,24 +91,13 @@ module Firebase {
 
     constructor(config: FirebaseConfig) {
       this.config = config
-      if (config.serviceAccount) {
-        const serviceAccount = JSON.parse(config.serviceAccount)
-        this.client = new Firestore({
-          projectId: serviceAccount.project_id,
-          credentials: {
-            client_email: serviceAccount.client_email,
-            private_key: serviceAccount.private_key,
-          },
-        })
-      } else {
-        this.client = new Firestore({
-          projectId: config.projectId,
-          credentials: {
-            client_email: config.email,
-            private_key: config.privateKey,
-          },
-        })
-      }
+      this.client = new Firestore({
+        projectId: config.projectId,
+        credentials: {
+          client_email: config.email,
+          private_key: config.privateKey?.replace(/\\n/g, "\n"),
+        },
+      })
     }
 
     async create(query: { json: object; extra: { [key: string]: string } }) {

package/src/integrations/index.ts

@@ -27,7 +27,7 @@ const DEFINITIONS = {
   [SourceNames.MYSQL]: mysql.schema,
   [SourceNames.ARANGODB]: arangodb.schema,
   [SourceNames.REST]: rest.schema,
-  [SourceNames.FIREBASE]: firebase.schema,
+  [SourceNames.FIRESTORE]: firebase.schema,
   [SourceNames.REDIS]: redis.schema,
 }
 
@@ -43,10 +43,9 @@ const INTEGRATIONS = {
   [SourceNames.MYSQL]: mysql.integration,
   [SourceNames.ARANGODB]: arangodb.integration,
   [SourceNames.REST]: rest.integration,
-  [SourceNames.FIREBASE]: firebase.integration,
+  [SourceNames.FIRESTORE]: firebase.integration,
   [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
   [SourceNames.REDIS]: redis.integration,
-  [SourceNames.FIREBASE]: firebase.integration,
 }
 
 // optionally add oracle integration if the oracle binary can be installed