code fixes and refactoring based on pull request comments

Author: jfocco

functions/.env.example.json

@@ -0,0 +1,6 @@
+{
+  "databaseURL": "",
+  "storageBucket": "",
+  "projectId": "",
+  "serviceAccountKey": ""
+}

functions/env.example.json

@@ -16,7 +16,6 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "firebase-admin": "^8.12.1",
     "firebase-functions": "^3.6.2",

functions/env.json

@@ -1,40 +1,32 @@
-import { admin, test } from '../../util/admin';
+import { admin, test } from '../../util/config';
 import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
-import * as onDelete from '../../../src/db/users/onDelete.function';
+import onDelete from '../../../src/db/users/onDelete.function';
 import 'mocha';
 
 chai.use(chaiAsPromised);
 
 describe('onDelete', () => {
   let userRecord: any;
 
-  before(async () => {
-    const user = {
-      uid: '1234',
-      email: 'user@example.com',
-      password: 'secretPassword'
-    };
-    userRecord = await admin.auth().createUser(user);
-  });
+  it('should delete the user from the authentication section', async () => {
+    userRecord = await admin.auth().createUser({ email: 'user@example.com' });
 
-  it('should delete the user from the authentication section', () => {
-    const wrapped = test.wrap(onDelete.default);
+    const wrapped = test.wrap(onDelete);
 
-    return wrapped(
+    await wrapped(
       {},
       {
         params: {
           uid: userRecord.uid
         }
       }
-    ).then(async () => {
-      await chai
-        .expect(admin.auth().getUser(userRecord.uid))
-        .to.be.rejectedWith(
-          Error,
-          'There is no user record corresponding to the provided identifier.'
-        );
-    });
+    );
+    return await chai
+      .expect(admin.auth().getUser(userRecord.uid))
+      .to.be.rejectedWith(
+        Error,
+        'There is no user record corresponding to the provided identifier.'
+      );
   });
 });

functions/package.json

@@ -1,14 +1,13 @@
-import { admin, test } from '../../util/admin';
+import { admin, test } from '../../util/config';
 import * as chai from 'chai';
-import * as onUpdate from '../../../src/db/users/onUpdate.function';
+import onUpdate from '../../../src/db/users/onUpdate.function';
 import 'mocha';
 
 describe('onUpdate', () => {
   let userRecord: any;
 
   before(async () => {
     const user = {
-      uid: '1234',
       email: 'user@example.com',
       password: 'secretPassword'
     };
@@ -25,8 +24,8 @@ describe('onUpdate', () => {
     test.cleanup();
   });
 
-  it('should update the user information in the database', () => {
-    const wrapped = test.wrap(onUpdate.default);
+  it("should update user's custom claims in auth", async () => {
+    const wrapped = test.wrap(onUpdate);
 
     const beforeSnap = test.database.makeDataSnapshot(
       { email: 'user@example.com', isAdmin: false },
@@ -39,17 +38,16 @@ describe('onUpdate', () => {
 
     const change = test.makeChange(beforeSnap, afterSnap);
 
-    return wrapped(change, {
+    await wrapped(change, {
       params: {
         uid: userRecord.uid
       }
-    }).then(() => {
-      return admin
-        .auth()
-        .getUser(userRecord.uid)
-        .then(snap => {
-          chai.assert.isTrue(snap.customClaims!.isAdmin);
-        });
     });
+    return admin
+      .auth()
+      .getUser(userRecord.uid)
+      .then(snap => {
+        chai.assert.isTrue(snap.customClaims!.isAdmin);
+      });
   });
 });

functions/test/db/users/onDelete.test.ts

@@ -1,9 +1,12 @@
-import { admin, test } from '../util/admin';
+import { admin, test } from '../util/config';
 import { https } from 'firebase-functions';
 import * as chai from 'chai';
+import * as chaiAsPromised from 'chai-as-promised';
 import * as createUser from '../../src/https/createUser.function';
 import 'mocha';
 
+chai.use(chaiAsPromised);
+
 describe('createUser', () => {
   let userRecord: any;
 

functions/test/db/users/onUpdate.test.ts

@@ -6,10 +6,9 @@
     "outDir": "lib",
     "sourceMap": true,
     "strict": true,
-    "target": "es2017"
+    "target": "es2017",
+    "resolveJsonModule": true
   },
   "compileOnSave": true,
-  "include": [
-    "src"
-  ]
+  "include": ["src"]
 }