Merge pull request #793 from SSWConsulting/firebase-update-1

Bump Firebase SDK version

api/functions/firestore.js

@@ -1,45 +1,42 @@
-const admin = require('firebase-admin');
+const { initializeApp } = require('firebase-admin/app');
+const { getFirestore } = require('firebase-admin/firestore');
 const { CONSTANTS } = require('./consts');
 
-exports.getUserIdFromApiKey = (api) => {
-	return admin
-		.firestore()
-		.collection(CONSTANTS.users)
-		.where(CONSTANTS.apiKey, '==', api)
-		.get()
-		.then((x) => (x.docs.length === 1 ? x.docs[0].id : null));
+initializeApp();
+const db = getFirestore();
+
+exports.getUserIdFromApiKey = async (api) => {
+  const q = db.collection(CONSTANTS.users);
+  const users = await q.where(CONSTANTS.apiKey, '==', api).limit(1).get();
+  return users.empty ? null : users.docs[0].id;
 };
 
-exports.updateLastBuild = (userId, apikey, runId) => {
-	return admin
-		.firestore()
-		.collection(CONSTANTS.users)
-		.doc(userId)
-		.update({
-			lastBuild: new Date(),
-			runId,
-		})
-		.then(() =>
-			admin.firestore().collection(CONSTANTS.runs).doc(runId).set({
-				apikey,
-				runId,
-			})
-		);
+exports.updateLastBuild = async (userId, apikey, runId) => {
+  await db.collection(CONSTANTS.users).doc(userId).set(
+    {
+      lastBuild: new Date(),
+      runId,
+    },
+    { merge: true }
+  );
+  await db.collection(CONSTANTS.runs).doc(runId).set(
+    {
+      apikey,
+      runId,
+    },
+    { merge: true }
+  );
 };
 
-exports.getRun = (runId) =>
-	admin
-		.firestore()
-		.collection(CONSTANTS.runs)
-		.doc(runId)
-		.get()
-		.then((doc) => doc.data());
+exports.getRun = async (runId) => {
+  const doc = await db.collection(CONSTANTS.runs).doc(runId).get();
+  return doc.data();
+};
 
-exports.getAlertEmailConfig = () => {
-	return admin
-		.firestore()
-		.collection(CONSTANTS.config)
-		.doc('alertEmailConfig')
-		.get()
-		.then((doc) => doc.data())
-};
+exports.getAlertEmailConfig = async () => {
+  const doc = await db
+    .collection(CONSTANTS.config)
+    .doc('alertEmailConfig')
+    .get();
+  return doc.data();
+};

api/functions/index.js

@@ -1,6 +1,5 @@
 const functions = require('firebase-functions');
 const express = require('express');
-const admin = require('firebase-admin');
 const R = require('ramda');
 const fetch = require('node-fetch');
 const Queue = require('better-queue');
@@ -55,7 +54,6 @@ const {
 } = require('./firestore');
 
 var cors = require('cors');
-admin.initializeApp();
 
 const app = express();
 // middlewares
@@ -364,5 +362,5 @@ app.post('/scanresult/:api/:buildId', async (req, res) => {
 	res.json(runId);
 });
 
-exports.api = functions.region('asia-east2').https.onRequest(app);
-exports.api2 = functions.region('asia-northeast1').https.onRequest(app);
+exports.api = functions.runWith({ timeoutSeconds: 540 }).region('asia-east2').https.onRequest(app);
+exports.api2 = functions.runWith({ timeoutSeconds: 540 }).region('asia-northeast1').https.onRequest(app);

api/functions/package.json

@@ -4,7 +4,7 @@
 	"scripts": {
 		"lint": "eslint .",
 		"test": "jest",
-		"serve": "firebase serve --only functions --port 5001",
+		"serve": "firebase serve -o 0.0.0.0 --only functions --port 5001",
 		"shell": "firebase functions:shell",
 		"start": "npm run shell",
 		"deploy": "firebase deploy --token $FIREBASETOKEN --only functions",
@@ -21,7 +21,7 @@
 		"cors": "^2.8.5",
 		"dotenv": "^8.6.0",
 		"express": "^4.18.2",
-		"firebase-admin": "^11.8.0",
+		"firebase-admin": "^11.11.1",
 		"firebase-functions": "^3.24.1",
 		"node-fetch": "^2.6.11",
 		"ramda": "^0.27.2",