Merge branch 'launch.next' into inlined.refactor

firebase · inlined · Jun 27, 2022 · Jun 17, 2022 · Jun 17, 2022 · Jun 18, 2022
commit a83ba0d587fa2ad3006ba384c6a794847622d763
diff --git a/integration_test/run_tests.sh b/integration_test/run_tests.sh
@@ -65,9 +65,9 @@ function delete_all_functions {
   # Try to delete, if there are errors it is because the project is already empty,
   # in that case do nothing.
   if [[ "${TOKEN}" == "" ]]; then
-    firebase functions:delete integrationTests v1 v2 --force --project=$PROJECT_ID || : &
+    firebase functions:delete integration-tests --force --project=$PROJECT_ID || : &
   else
-    firebase functions:delete integrationTests v1 v2 --force --project=$PROJECT_ID --token=$TOKEN || : &
+    firebase functions:delete integration-tests --force --project=$PROJECT_ID --token=$TOKEN || : &
   fi
   wait
   announce "Project emptied."

diff --git a/package.json b/package.json
@@ -169,7 +169,6 @@
     "@types/express": "4.17.3",
     "cors": "^2.8.5",
     "express": "^4.17.1",
-    "lodash": "^4.17.14",
     "node-fetch": "^2.6.7"
   },
   "devDependencies": {
@@ -179,7 +178,6 @@
     "@types/chai": "^4.1.7",
     "@types/chai-as-promised": "^7.1.0",
     "@types/jsonwebtoken": "^8.3.2",
-    "@types/lodash": "^4.14.135",
     "@types/mocha": "^5.2.7",
     "@types/mock-require": "^2.0.0",
     "@types/nock": "^10.0.3",
@@ -219,4 +217,4 @@
   "engines": {
     "node": ">=14.10.0"
   }
-}
+}
diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts
@@ -1,8 +1,8 @@
 import { expect } from 'chai';
-import * as firebase from 'firebase-admin';
+import { App, deleteApp, initializeApp } from 'firebase-admin/app';
 import * as sinon from 'sinon';
 
-import { apps as appsNamespace } from '../../../src/common/apps';
+import { getApp, setApp } from '../../../src/common/app';
 import * as debug from '../../../src/common/debug';
 import * as https from '../../../src/common/providers/https';
 import * as mocks from '../../fixtures/credential/key.json';
@@ -76,7 +76,7 @@ async function runCallableTest(test: CallTest): Promise<any> {
 }
 
 describe('onCallHandler', () => {
-  let app: firebase.app.App;
+  let app: App;
 
   before(() => {
     const credential = {
@@ -92,16 +92,16 @@ describe('onCallHandler', () => {
         };
       },
     };
-    app = firebase.initializeApp({
+    app = initializeApp({
       projectId: 'aProjectId',
       credential,
     });
-    Object.defineProperty(appsNamespace(), 'admin', { get: () => app });
+    setApp(app);
   });
 
   after(() => {
-    app.delete();
-    delete appsNamespace.singleton;
+    deleteApp(app);
+    setApp(undefined);
   });
 
   it('should handle success', () => {
@@ -288,7 +288,7 @@ describe('onCallHandler', () => {
 
   it('should handle auth', async () => {
     const mock = mockFetchPublicKeys();
-    const projectId = appsNamespace().admin.options.projectId;
+    const projectId = getApp().options.projectId;
     const idToken = generateIdToken(projectId);
     await runCallableTest({
       httpRequest: mockRequest(null, 'application/json', {
@@ -313,7 +313,7 @@ describe('onCallHandler', () => {
   });
 
   it('should reject bad auth', async () => {
-    const projectId = appsNamespace().admin.options.projectId;
+    const projectId = getApp().options.projectId;
     const idToken = generateUnsignedIdToken(projectId);
     await runCallableTest({
       httpRequest: mockRequest(null, 'application/json', {
@@ -341,7 +341,7 @@ describe('onCallHandler', () => {
 
   it('should handle AppCheck token', async () => {
     const mock = mockFetchAppCheckPublicJwks();
-    const projectId = appsNamespace().admin.options.projectId;
+    const projectId = getApp().options.projectId;
     const appId = '123:web:abc';
     const appCheckToken = generateAppCheckToken(projectId, appId);
     await runCallableTest({
@@ -365,7 +365,7 @@ describe('onCallHandler', () => {
   });
 
   it('should reject bad AppCheck token', async () => {
-    const projectId = appsNamespace().admin.options.projectId;
+    const projectId = getApp().options.projectId;
     const appId = '123:web:abc';
     const appCheckToken = generateUnsignedAppCheckToken(projectId, appId);
     await runCallableTest({
@@ -536,7 +536,7 @@ describe('onCallHandler', () => {
     });
 
     it('should skip auth token verification', async () => {
-      const projectId = appsNamespace().admin.options.projectId;
+      const projectId = getApp().options.projectId;
       const idToken = generateUnsignedIdToken(projectId);
       await runCallableTest({
         httpRequest: mockRequest(null, 'application/json', {
@@ -560,7 +560,7 @@ describe('onCallHandler', () => {
     });
 
     it('should skip app check token verification', async () => {
-      const projectId = appsNamespace().admin.options.projectId;
+      const projectId = getApp().options.projectId;
       const appId = '123:web:abc';
       const appCheckToken = generateUnsignedAppCheckToken(projectId, appId);
       await runCallableTest({

diff --git a/spec/common/providers/tasks.spec.ts b/spec/common/providers/tasks.spec.ts
@@ -21,9 +21,9 @@
 // SOFTWARE.
 
 import { expect } from 'chai';
-import * as firebase from 'firebase-admin';
+import { App, deleteApp, initializeApp } from 'firebase-admin/app';
 
-import { apps as appsNamespace } from '../../../src/common/apps';
+import { getApp, setApp } from '../../../src/common/app';
 import * as https from '../../../src/common/providers/https';
 import {
   onDispatchHandler,
@@ -78,7 +78,7 @@ export async function runTaskTest(test: TaskTest): Promise<any> {
 }
 
 describe('onEnqueueHandler', () => {
-  let app: firebase.app.App;
+  let app: App;
 
   function mockEnqueueRequest(
     data: unknown,
@@ -102,16 +102,16 @@ describe('onEnqueueHandler', () => {
         };
       },
     };
-    app = firebase.initializeApp({
+    app = initializeApp({
       projectId: 'aProjectId',
       credential,
     });
-    Object.defineProperty(appsNamespace(), 'admin', { get: () => app });
+    setApp(app);
   });
 
   after(() => {
-    app.delete();
-    delete appsNamespace.singleton;
+    deleteApp(app);
+    setApp(undefined);
   });
 
   it('should handle success', () => {
@@ -201,7 +201,7 @@ describe('onEnqueueHandler', () => {
   });
 
   it('should handle auth', async () => {
-    const projectId = appsNamespace().admin.options.projectId;
+    const projectId = getApp().options.projectId;
     const idToken = generateIdToken(projectId);
     await runTaskTest({
       httpRequest: mockEnqueueRequest(null, 'application/json', {
@@ -221,7 +221,7 @@ describe('onEnqueueHandler', () => {
   });
 
   it('should accept unsigned auth too', async () => {
-    const projectId = appsNamespace().admin.options.projectId;
+    const projectId = getApp().options.projectId;
     const idToken = generateUnsignedIdToken(projectId);
     await runTaskTest({
       httpRequest: mockEnqueueRequest(null, 'application/json', {

diff --git a/spec/fixtures/mockrequest.ts b/spec/fixtures/mockrequest.ts
@@ -1,6 +1,5 @@
 import * as jwt from 'jsonwebtoken';
 import * as jwkToPem from 'jwk-to-pem';
-import * as _ from 'lodash';
 import * as nock from 'nock';
 import * as mockJWK from '../fixtures/credential/jwk.json';
 import * as mockKey from '../fixtures/credential/key.json';
@@ -32,7 +31,7 @@ export function mockRequest(
   } = {}
 ) {
   const body: any = {};
-  if (!_.isUndefined(data)) {
+  if (typeof data !== 'undefined') {
     body.data = data;
   }
 

diff --git a/spec/v1/apps.spec.ts b/spec/v1/apps.spec.ts
diff --git a/spec/v1/cloud-functions.spec.ts b/spec/v1/cloud-functions.spec.ts
@@ -21,7 +21,6 @@
 // SOFTWARE.
 
 import { expect } from 'chai';
-import * as _ from 'lodash';
 
 import {
   Change,
@@ -160,9 +159,10 @@ describe('makeCloudFunction', () => {
   });
 
   it('should construct the right context for event', () => {
-    const args: any = _.assign({}, cloudFunctionArgs, {
+    const args: any = {
+      ...cloudFunctionArgs,
       handler: (data: any, context: EventContext) => context,
-    });
+    };
     const cf = makeCloudFunction(args);
     const test: Event = {
       context: {
@@ -190,10 +190,11 @@ describe('makeCloudFunction', () => {
   });
 
   it('should throw error when context.params accessed in handler environment', () => {
-    const args: any = _.assign({}, cloudFunctionArgs, {
+    const args: any = {
+      ...cloudFunctionArgs,
       handler: (data: any, context: EventContext) => context,
       triggerResource: () => null,
-    });
+    };
     const cf = makeCloudFunction(args);
     const test: Event = {
       context: {
@@ -413,7 +414,9 @@ describe('Change', () => {
 
     it('should apply the customizer function to `before` and `after`', () => {
       function customizer<T>(input: any) {
-        _.set(input, 'another', 'value');
+        if (input) {
+          input.another = 'value';
+        }
         return input as T;
       }
       const created = Change.fromJSON<object>(