@dereekb/firebase-server 4.1.0 → 5.1.0

package/src/lib/nest/index.js

@@ -2,5 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./function"), exports);
+tslib_1.__exportStar(require("./middleware"), exports);
 tslib_1.__exportStar(require("./app"), exports);
+tslib_1.__exportStar(require("./nest.provider"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/nest/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/nest/index.ts"],"names":[],"mappings":";;;AAAA,qDAA2B;AAC3B,gDAAsB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/nest/index.ts"],"names":[],"mappings":";;;AAAA,qDAA2B;AAC3B,uDAA6B;AAC7B,gDAAsB;AACtB,0DAAgC"}

package/src/lib/nest/middleware/appcheck.d.ts

@@ -0,0 +1,4 @@
+import { Request } from 'express';
+export interface AppCheckRequest extends Request {
+    skipAppCheck?: boolean;
+}

package/src/lib/nest/middleware/appcheck.decorator.d.ts

@@ -0,0 +1,4 @@
+/**
+ * nestjs decorator that will instruct FirebaseAppCheckMiddleware to skip AppCheck for related requests.
+ */
+export declare const SkipAppCheck: (...dataOrPipes: any[]) => ParameterDecorator;

package/src/lib/nest/middleware/appcheck.decorator.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SkipAppCheck = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
+/**
+ * nestjs decorator that will instruct FirebaseAppCheckMiddleware to skip AppCheck for related requests.
+ */
+exports.SkipAppCheck = (0, common_1.createParamDecorator)((_, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const req = context.switchToHttp().getRequest();
+    req.skipAppCheck = true;
+}));
+//# sourceMappingURL=appcheck.decorator.js.map

package/src/lib/nest/middleware/appcheck.decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appcheck.decorator.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/middleware/appcheck.decorator.ts"],"names":[],"mappings":";;;;AAEA,2CAAwE;AAExE;;GAEG;AACU,QAAA,YAAY,GAAG,IAAA,6BAAoB,EAAC,CAAO,CAAC,EAAE,OAAyB,EAAE,EAAE;IACtF,MAAM,GAAG,GAAY,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAW,CAAC;IACjE,GAAuB,CAAC,YAAY,GAAG,IAAI,CAAC;AAC/C,CAAC,CAAA,CAAC,CAAC"}

package/src/lib/nest/middleware/appcheck.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=appcheck.js.map

package/src/lib/nest/middleware/appcheck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appcheck.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/middleware/appcheck.ts"],"names":[],"mappings":""}

package/src/lib/nest/middleware/appcheck.middleware.d.ts

@@ -0,0 +1,24 @@
+import { NestMiddleware } from '@nestjs/common';
+import { Request } from 'firebase-functions/v2/https';
+import { Response } from 'express';
+import { Maybe } from '@dereekb/util';
+/**
+ * Middleware that verifies the X-Firebase-AppCheck header using admin.
+ *
+ * It ignores all webhook paths by default.
+ */
+export declare class FirebaseAppCheckMiddleware implements NestMiddleware {
+    private readonly logger;
+    static isIgnoredRequest(req: Request): boolean;
+    static isIgnoredPath(path: string): boolean;
+    use(req: Request, res: Response, next: (error?: Error | unknown) => void): Promise<void>;
+}
+/**
+ * Verifies the AppCheck parameter. If it fails, a value is returned.
+ *
+ * @param req
+ * @param res
+ * @param next
+ * @returns
+ */
+export declare function verifyAppCheckInRequest(req: Request): Promise<Maybe<Error>>;

package/src/lib/nest/middleware/appcheck.middleware.js

@@ -0,0 +1,71 @@
+"use strict";
+var FirebaseAppCheckMiddleware_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyAppCheckInRequest = exports.FirebaseAppCheckMiddleware = void 0;
+const tslib_1 = require("tslib");
+const admin = require("firebase-admin");
+const common_1 = require("@nestjs/common");
+const nestjs_1 = require("@dereekb/nestjs");
+/**
+ * Middleware that verifies the X-Firebase-AppCheck header using admin.
+ *
+ * It ignores all webhook paths by default.
+ */
+let FirebaseAppCheckMiddleware = FirebaseAppCheckMiddleware_1 = class FirebaseAppCheckMiddleware {
+    constructor() {
+        this.logger = new common_1.Logger('FirebaseAppCheckMiddleware');
+    }
+    static isIgnoredRequest(req) {
+        const isIgnoredRoute = req.skipAppCheck || FirebaseAppCheckMiddleware_1.isIgnoredPath(req.baseUrl);
+        return isIgnoredRoute;
+    }
+    static isIgnoredPath(path) {
+        return path.startsWith(nestjs_1.DEFAULT_BASE_WEBHOOK_PATH);
+    }
+    use(req, res, next) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const isIgnoredRoute = FirebaseAppCheckMiddleware_1.isIgnoredRequest(req);
+            let error;
+            if (!isIgnoredRoute) {
+                error = yield verifyAppCheckInRequest(req);
+                if (error) {
+                    this.logger.error('app check token failed verify');
+                }
+            }
+            next(error);
+        });
+    }
+};
+FirebaseAppCheckMiddleware = FirebaseAppCheckMiddleware_1 = tslib_1.__decorate([
+    (0, common_1.Injectable)()
+], FirebaseAppCheckMiddleware);
+exports.FirebaseAppCheckMiddleware = FirebaseAppCheckMiddleware;
+/**
+ * Verifies the AppCheck parameter. If it fails, a value is returned.
+ *
+ * @param req
+ * @param res
+ * @param next
+ * @returns
+ */
+function verifyAppCheckInRequest(req) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const appCheckToken = req.header('X-Firebase-AppCheck');
+        let error;
+        if (!appCheckToken) {
+            error = new common_1.ForbiddenException();
+        }
+        else {
+            // verify the token
+            try {
+                yield admin.appCheck().verifyToken(appCheckToken);
+            }
+            catch (e) {
+                error = new common_1.ForbiddenException();
+            }
+        }
+        return error;
+    });
+}
+exports.verifyAppCheckInRequest = verifyAppCheckInRequest;
+//# sourceMappingURL=appcheck.middleware.js.map

package/src/lib/nest/middleware/appcheck.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appcheck.middleware.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/middleware/appcheck.middleware.ts"],"names":[],"mappings":";;;;;AAAA,wCAAwC;AACxC,2CAAwF;AAKxF,4CAA4D;AAE5D;;;;GAIG;AAEH,IAAa,0BAA0B,kCAAvC,MAAa,0BAA0B;IAAvC;QAEmB,WAAM,GAAG,IAAI,eAAM,CAAC,4BAA4B,CAAC,CAAC;IA2BrE,CAAC;IAzBC,MAAM,CAAC,gBAAgB,CAAC,GAAY;QAClC,MAAM,cAAc,GAAI,GAAuB,CAAC,YAAY,IAAI,4BAA0B,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtH,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAY;QAC/B,OAAO,IAAI,CAAC,UAAU,CAAC,kCAAyB,CAAC,CAAC;IACpD,CAAC;IAEK,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAuC;;YAC5E,MAAM,cAAc,GAAG,4BAA0B,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAExE,IAAI,KAAmB,CAAC;YAExB,IAAI,CAAC,cAAc,EAAE;gBACnB,KAAK,GAAG,MAAM,uBAAuB,CAAC,GAAG,CAAC,CAAC;gBAE3C,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;iBACpD;aACF;YAED,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;KAAA;CAEF,CAAA;AA7BY,0BAA0B;IADtC,IAAA,mBAAU,GAAE;GACA,0BAA0B,CA6BtC;AA7BY,gEAA0B;AA+BvC;;;;;;;GAOG;AACH,SAAsB,uBAAuB,CAAC,GAAY;;QACxD,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACxD,IAAI,KAAmB,CAAC;QAExB,IAAI,CAAC,aAAa,EAAE;YAClB,KAAK,GAAG,IAAI,2BAAkB,EAAE,CAAC;SAClC;aAAM;YAEL,mBAAmB;YACnB,IAAI;gBACF,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;aACnD;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,GAAG,IAAI,2BAAkB,EAAE,CAAC;aAClC;SACF;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAjBD,0DAiBC"}

package/src/lib/nest/middleware/appcheck.module.d.ts

@@ -0,0 +1,8 @@
+import { MiddlewareConsumer } from '@nestjs/common';
+/**
+ * Convenience class that mirrors the ConfigureAppCheckMiddlewareModule class in @dereekb/nestjs, but for Firebase apps.
+ */
+export declare class ConfigureFirebaseAppCheckMiddlewareModule {
+    private readonly logger;
+    configure(consumer: MiddlewareConsumer): void;
+}

package/src/lib/nest/middleware/appcheck.module.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigureFirebaseAppCheckMiddlewareModule = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
+const appcheck_middleware_1 = require("./appcheck.middleware");
+/**
+ * Convenience class that mirrors the ConfigureAppCheckMiddlewareModule class in @dereekb/nestjs, but for Firebase apps.
+ */
+let ConfigureFirebaseAppCheckMiddlewareModule = class ConfigureFirebaseAppCheckMiddlewareModule {
+    constructor() {
+        this.logger = new common_1.Logger('ConfigureFirebaseAppCheckMiddlewareModule');
+    }
+    configure(consumer) {
+        consumer.apply(appcheck_middleware_1.FirebaseAppCheckMiddleware).forRoutes('*');
+        this.logger.debug('Configured firebase webhook routes with proper middleware.');
+    }
+};
+ConfigureFirebaseAppCheckMiddlewareModule = tslib_1.__decorate([
+    (0, common_1.Module)({})
+], ConfigureFirebaseAppCheckMiddlewareModule);
+exports.ConfigureFirebaseAppCheckMiddlewareModule = ConfigureFirebaseAppCheckMiddlewareModule;
+//# sourceMappingURL=appcheck.module.js.map

package/src/lib/nest/middleware/appcheck.module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appcheck.module.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/middleware/appcheck.module.ts"],"names":[],"mappings":";;;;AAAA,2CAAoE;AACpE,+DAAmE;AAEnE;;GAEG;AAEH,IAAa,yCAAyC,GAAtD,MAAa,yCAAyC;IAAtD;QAEmB,WAAM,GAAG,IAAI,eAAM,CAAC,2CAA2C,CAAC,CAAC;IAOpF,CAAC;IALQ,SAAS,CAAC,QAA4B;QAC3C,QAAQ,CAAC,KAAK,CAAC,gDAA0B,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAClF,CAAC;CAEF,CAAA;AATY,yCAAyC;IADrD,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,yCAAyC,CASrD;AATY,8FAAyC"}

package/src/lib/nest/middleware/index.d.ts

@@ -0,0 +1,6 @@
+export * from './appcheck';
+export * from './appcheck.middleware';
+export * from './appcheck.module';
+export * from './appcheck.decorator';
+export * from './rawbody.middleware';
+export * from './webhook';

package/src/lib/nest/middleware/index.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./appcheck"), exports);
+tslib_1.__exportStar(require("./appcheck.middleware"), exports);
+tslib_1.__exportStar(require("./appcheck.module"), exports);
+tslib_1.__exportStar(require("./appcheck.decorator"), exports);
+tslib_1.__exportStar(require("./rawbody.middleware"), exports);
+tslib_1.__exportStar(require("./webhook"), exports);
+//# sourceMappingURL=index.js.map

package/src/lib/nest/middleware/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/middleware/index.ts"],"names":[],"mappings":";;;AAAA,qDAA2B;AAC3B,gEAAsC;AACtC,4DAAkC;AAClC,+DAAqC;AACrC,+DAAqC;AACrC,oDAA0B"}

package/src/lib/nest/middleware/rawbody.middleware.d.ts

@@ -0,0 +1,6 @@
+import { NestMiddleware } from '@nestjs/common';
+import { Request } from 'firebase-functions/v2/https';
+import { Response } from 'express';
+export declare class FirebaseRawBodyMiddleware implements NestMiddleware {
+    use(req: Request, res: Response, next: () => void): void;
+}

package/src/lib/nest/middleware/rawbody.middleware.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FirebaseRawBodyMiddleware = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
+let FirebaseRawBodyMiddleware = class FirebaseRawBodyMiddleware {
+    use(req, res, next) {
+        req.body = req.rawBody;
+        next();
+    }
+};
+FirebaseRawBodyMiddleware = tslib_1.__decorate([
+    (0, common_1.Injectable)()
+], FirebaseRawBodyMiddleware);
+exports.FirebaseRawBodyMiddleware = FirebaseRawBodyMiddleware;
+//# sourceMappingURL=rawbody.middleware.js.map

package/src/lib/nest/middleware/rawbody.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rawbody.middleware.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/middleware/rawbody.middleware.ts"],"names":[],"mappings":";;;;AAAA,2CAA4D;AAK5D,IAAa,yBAAyB,GAAtC,MAAa,yBAAyB;IACpC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB;QAC/C,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC;QACvB,IAAI,EAAE,CAAC;IACT,CAAC;CACF,CAAA;AALY,yBAAyB;IADrC,IAAA,mBAAU,GAAE;GACA,yBAAyB,CAKrC;AALY,8DAAyB"}

package/src/lib/nest/middleware/webhook.d.ts

@@ -0,0 +1,10 @@
+import { MiddlewareConsumer } from '@nestjs/common';
+/**
+ * Convenience class that mirrors the ConfigureWebhookMiddlewareModule class in @dereekb/nestjs, but for Firebase apps.
+ *
+ * Requests to /webhook/* have their request.body value set to the rawBody.
+ */
+export declare class ConfigureFirebaseWebhookMiddlewareModule {
+    private readonly logger;
+    configure(consumer: MiddlewareConsumer): void;
+}

package/src/lib/nest/middleware/webhook.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigureFirebaseWebhookMiddlewareModule = void 0;
+const tslib_1 = require("tslib");
+const nestjs_1 = require("@dereekb/nestjs");
+const common_1 = require("@nestjs/common");
+const rawbody_middleware_1 = require("./rawbody.middleware");
+/**
+ * Convenience class that mirrors the ConfigureWebhookMiddlewareModule class in @dereekb/nestjs, but for Firebase apps.
+ *
+ * Requests to /webhook/* have their request.body value set to the rawBody.
+ */
+let ConfigureFirebaseWebhookMiddlewareModule = class ConfigureFirebaseWebhookMiddlewareModule {
+    constructor() {
+        this.logger = new common_1.Logger('ConfigureFirebaseWebhookMiddlewareModule');
+    }
+    configure(consumer) {
+        consumer.apply(rawbody_middleware_1.FirebaseRawBodyMiddleware).forRoutes(nestjs_1.DEFAULT_WEBHOOK_MIDDLEWARE_ROUTE_INFO);
+        this.logger.debug('Configured firebase webhook routes with proper middleware.');
+    }
+};
+ConfigureFirebaseWebhookMiddlewareModule = tslib_1.__decorate([
+    (0, common_1.Module)({})
+], ConfigureFirebaseWebhookMiddlewareModule);
+exports.ConfigureFirebaseWebhookMiddlewareModule = ConfigureFirebaseWebhookMiddlewareModule;
+//# sourceMappingURL=webhook.js.map

package/src/lib/nest/middleware/webhook.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/middleware/webhook.ts"],"names":[],"mappings":";;;;AAAA,4CAAwE;AACxE,2CAAmF;AACnF,6DAAiE;AAEjE;;;;GAIG;AAEH,IAAa,wCAAwC,GAArD,MAAa,wCAAwC;IAArD;QAEmB,WAAM,GAAG,IAAI,eAAM,CAAC,0CAA0C,CAAC,CAAC;IAOnF,CAAC;IALQ,SAAS,CAAC,QAA4B;QAC3C,QAAQ,CAAC,KAAK,CAAC,8CAAyB,CAAC,CAAC,SAAS,CAAC,8CAAqC,CAAC,CAAC;QAC3F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAClF,CAAC;CAEF,CAAA;AATY,wCAAwC;IADpD,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,wCAAwC,CASpD;AATY,4FAAwC"}

package/src/lib/nest/nest.provider.d.ts

@@ -0,0 +1,23 @@
+import { Getter } from '@dereekb/util';
+import { INestApplicationContext } from '@nestjs/common';
+/**
+ * Getter for an INestApplicationContext promise. Nest should be initialized when the promise resolves.
+ */
+export declare type NestApplicationPromiseGetter = Getter<Promise<INestApplicationContext>>;
+/**
+ * Generates a function from the passed NestApplicationPromiseGetter/context.
+ *
+ * This pattern is available to allow generating similar content for differenting contexts, such as production and testing.
+ */
+export declare type NestApplicationFunctionFactory<F> = (nestAppPromiseGetter: NestApplicationPromiseGetter) => F;
+/**
+ * Getter for an INestApplicationContext promise. Nest should be initialized when the promise resolves.
+ */
+export declare type MakeNestContext<C> = (nest: INestApplicationContext) => C;
+/**
+ * Abstract class that wraps an INestApplicationContext value.
+ */
+export declare abstract class AbstractNestContext {
+    readonly nest: INestApplicationContext;
+    constructor(nest: INestApplicationContext);
+}

package/src/lib/nest/nest.provider.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractNestContext = void 0;
+/**
+ * Abstract class that wraps an INestApplicationContext value.
+ */
+class AbstractNestContext {
+    constructor(nest) {
+        this.nest = nest;
+    }
+}
+exports.AbstractNestContext = AbstractNestContext;
+//# sourceMappingURL=nest.provider.js.map

package/src/lib/nest/nest.provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nest.provider.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/nest/nest.provider.ts"],"names":[],"mappings":";;;AAoBA;;GAEG;AACH,MAAsB,mBAAmB;IACvC,YAAqB,IAA6B;QAA7B,SAAI,GAAJ,IAAI,CAAyB;IAAG,CAAC;CACvD;AAFD,kDAEC"}

package/test/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+# [5.1.0](https://github.com/dereekb/dbx-components/compare/v5.0.1-dev...v5.1.0) (2022-05-27)
+
+
+
+## [5.0.1](https://github.com/dereekb/dbx-components/compare/v5.0.0-dev...v5.0.1) (2022-05-26)
+
+
+
+# [5.0.0](https://github.com/dereekb/dbx-components/compare/v4.1.0-dev...v5.0.0) (2022-05-25)
+
+
+### Features
+
+* added firebase functions v2 nest context components ([e5ca892](https://github.com/dereekb/dbx-components/commit/e5ca89250c7b7cf99f75d8edb0fc16a4618cbc21))
+
+
+
 # [4.1.0](https://github.com/dereekb/dbx-components/compare/v4.0.1-dev...v4.1.0) (2022-05-17)
 
 

package/test/package.json

@@ -1,35 +1,36 @@
 {
   "name": "@dereekb/firebase-server/test",
-  "version": "4.1.0",
+  "version": "5.1.0",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@dereekb/firebase": "4.1.0",
+    "@dereekb/firebase": "5.1.0",
     "rxjs": "^7.0.0",
     "rxfire": "^6.0.3",
     "firebase": "^9.8.0",
-    "@dereekb/util": "4.1.0",
+    "@dereekb/util": "5.1.0",
     "make-error": "^1.3.0",
     "extra-set": "^2.2.11",
-    "change-case": "^4.1.2",
-    "@dereekb/rxjs": "4.1.0",
+    "@dereekb/rxjs": "5.1.0",
     "ms": "^3.0.0-canary.1",
-    "@dereekb/date": "4.1.0",
+    "@dereekb/date": "5.1.0",
     "class-transformer": "^0.5.1",
     "date-fns": "^2.28.0",
     "class-validator": "^0.13.2",
     "date-fns-tz": "^1.3.0",
     "rrule": "git+https://git@github.com/dereekb/rrule.git#17adf5708d6567b4d01a3a8afd106261421ea492",
-    "@dereekb/model": "4.1.0",
-    "@dereekb/util/test": "4.1.0",
+    "@dereekb/model": "5.1.0",
+    "@dereekb/util/test": "5.1.0",
     "firebase-admin": "^10.2.0",
     "jsonwebtoken": "^8.0.0",
-    "firebase-functions": "^3.21.0",
+    "firebase-functions": "^3.21.2",
     "@nestjs/common": "^8.4.0",
     "@google-cloud/firestore": "^5.0.2",
-    "@dereekb/firebase/test": "4.1.0",
-    "@dereekb/firebase-server": "4.1.0",
+    "@dereekb/firebase/test": "5.1.0",
+    "@dereekb/firebase-server": "5.1.0",
+    "@dereekb/nestjs": "5.1.0",
+    "@nestjs/config": "^2.0.1",
     "@nestjs/core": "^8.4.0",
     "@nestjs/platform-express": "^8.4.0",
     "tslib": "^2.0.0"

package/test/src/lib/firebase/firebase.admin.auth.d.ts

@@ -1,7 +1,7 @@
 import { FirebaseAuthUserId } from '@dereekb/firebase';
-import { Factory, GetterOrValue, PromiseOrValue } from "@dereekb/util";
-import { AbstractChildJestTestContextFixture, JestTestContextFixture } from "@dereekb/util/test";
-import { FirebaseAdminTestContext } from "./firebase.admin";
+import { Factory, GetterOrValue, PromiseOrValue } from '@dereekb/util';
+import { AbstractChildJestTestContextFixture, JestTestContextFixture } from '@dereekb/util/test';
+import { FirebaseAdminTestContext } from './firebase.admin';
 import { CreateRequest } from 'firebase-admin/lib/auth/auth-config';
 import { UserRecord } from 'firebase-admin/lib/auth/user-record';
 import { DecodedIdToken } from 'firebase-admin/lib/auth/token-verifier';

package/test/src/lib/firebase/firebase.admin.auth.js

@@ -45,10 +45,10 @@ class AuthorizedUserTestContextInstance {
         return this.loadUserRecord().then((record) => createTestFunctionContextOptions(this.testContext.auth, record));
     }
     callCloudFunction(fn, params) {
-        return this.makeContextOptions().then(options => fn(params, options));
+        return this.makeContextOptions().then((options) => fn(params, options));
     }
     callEventCloudFunction(fn, params, contextOptions) {
-        return this.makeContextOptions().then(options => fn(params, (contextOptions) ? Object.assign(Object.assign({}, contextOptions), options) : options));
+        return this.makeContextOptions().then((options) => fn(params, contextOptions ? Object.assign(Object.assign({}, contextOptions), options) : options));
     }
 }
 exports.AuthorizedUserTestContextInstance = AuthorizedUserTestContextInstance;
@@ -59,13 +59,12 @@ function authorizedUserContext(config, buildTests) {
     authorizedUserContextFactory(config)({ f: config.f }, buildTests);
 }
 exports.authorizedUserContext = authorizedUserContext;
-;
 /**
  * Creates a new Jest Context that has a random user for authorization for use in firebase server tests.
  */
 function authorizedUserContextFactory(config) {
     const { uid: uidGetter, makeInstance = (uid, testInstance) => new AuthorizedUserTestContextInstance(uid, testInstance), makeFixture = (f) => new AuthorizedUserTestContextFixture(f), makeUserDetails = () => ({}), initUser } = config;
-    const makeUid = (uidGetter) ? (0, util_1.asGetter)(uidGetter) : exports.testUidFactory;
+    const makeUid = uidGetter ? (0, util_1.asGetter)(uidGetter) : exports.testUidFactory;
     return (params, buildTests) => {
         const { f, user: inputUser } = params;
         return (0, test_1.useJestContextFixture)({
@@ -94,13 +93,12 @@ function authorizedUserContextFactory(config) {
     };
 }
 exports.authorizedUserContextFactory = authorizedUserContextFactory;
-;
 /**
  * Incrementing number factory for generating test UID values.
  *
  * Has the format 'test-uid-<number>'
  */
-exports.testUidFactory = (0, util_1.mapGetter)((0, util_1.incrementingNumberFactory)(), (i) => `test-uid-${i}`);
+exports.testUidFactory = (0, util_1.mapGetter)((0, util_1.incrementingNumberFactory)(), (i) => `test-uid-${i}+${new Date().toISOString()}`);
 /**
  * Creates a CallableContextOptions with auth attached corresponding to the input UserRecord.
  *
@@ -153,9 +151,9 @@ function testFirestoreClaimsFromUserRecord(userRecord) {
     var _a;
     // Copy claims to be similar to DecodedIdToken pieces.
     const baseClaims = {
-        "picture": userRecord.photoURL,
-        "email": userRecord.email,
-        "email_verified": (_a = userRecord.emailVerified) !== null && _a !== void 0 ? _a : false,
+        picture: userRecord.photoURL,
+        email: userRecord.email,
+        email_verified: (_a = userRecord.emailVerified) !== null && _a !== void 0 ? _a : false,
         firebase: {
             sign_in_provider: '@dereekb/firebase-server/test',
             identities: []

package/test/src/lib/firebase/firebase.admin.auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"firebase.admin.auth.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/test/src/lib/firebase/firebase.admin.auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"firebase.admin.auth.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/test/src/lib/firebase/firebase.admin.auth.ts"],"names":[],"mappings":";;;;AACA,wCAAoI;AACpI,6CAAwH;AAMxH,+CAAmD;AAgBnD,MAAa,gCAA8P,SAAQ,0CAA0C;IAC3T,8CAA8C;IAC9C,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;IAC3B,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;IACxC,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IAC5C,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IAC5C,CAAC;IAED,iBAAiB,CAAmB,EAAiD,EAAE,MAAW;QAChG,OAAO,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;CACF;AAzBD,4EAyBC;AAID,MAAa,iCAAiC;IAC5C,YAAqB,GAAuB,EAAW,WAAe;QAAjD,QAAG,GAAH,GAAG,CAAoB;QAAW,gBAAW,GAAX,WAAW,CAAI;IAAG,CAAC;IAE1E,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,4CAA4C,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7H,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;IACvE,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,gCAAgC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IACjH,CAAC;IAED,iBAAiB,CAAmB,EAAiD,EAAE,MAAW;QAChG,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,sBAAsB,CAAmB,EAAiD,EAAE,MAAW,EAAE,cAA8C;QACrJ,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,iCAAM,cAAc,GAAK,OAAO,EAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/H,CAAC;CACF;AA1BD,8EA0BC;AAsDD;;GAEG;AACH,SAAgB,qBAAqB,CACnC,MAAqD,EACrD,UAA0B;IAE1B,4BAA4B,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;AACpE,CAAC;AALD,sDAKC;AAaD;;GAEG;AACH,SAAgB,4BAA4B,CAM1C,MAA4D;IAC5D,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,GAAG,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,iCAAiC,CAAC,GAAG,EAAE,YAAY,CAAM,EAAE,WAAW,GAAG,CAAC,CAAK,EAAE,EAAE,CAAC,IAAI,gCAAgC,CAAY,CAAC,CAAC,EAAE,eAAe,GAAG,GAAG,EAAE,CAAC,CAAC,EAA+C,CAAA,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACxS,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,sBAAc,CAAC;IAEjE,OAAO,CAAC,MAAS,EAAE,UAA0B,EAAE,EAAE;QAC/C,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAEtC,OAAO,IAAA,4BAAqB,EAAO;YACjC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAM;YAC5B,UAAU;YACV,YAAY,EAAE,GAAS,EAAE;gBACvB,MAAM,GAAG,GAAG,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,KAAI,OAAO,EAAE,CAAC;gBACxC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACzD,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAE7B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,+BACtC,GAAG,EACH,WAAW,EAAE,aAAa,IACvB,OAAO,GACP,SAAS,EACZ,CAAC;gBAEH,IAAI,MAAM,EAAE;oBACV,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;iBAC7C;gBAED,MAAM,QAAQ,GAAM,MAAM,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;gBAE5E,IAAI,QAAQ,EAAE;oBACZ,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;iBAClC;gBAED,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAA;YACD,eAAe,EAAE,CAAO,QAAW,EAAE,EAAE;gBACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC;gBACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;gBACzB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC,CAAA;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AA/CD,oEA+CC;AAED;;;;GAIG;AACU,QAAA,cAAc,GAAgC,IAAA,gBAAS,EAAC,IAAA,gCAAyB,GAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AAUtJ;;;;;;GAMG;AACH,SAAsB,gCAAgC,CAAC,IAAU,EAAE,UAAsB;;QACvF,MAAM,WAAW,GAAG,MAAM,qCAAqC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAElF,MAAM,cAAc,GAA2B;YAC7C,IAAI,EAAE,WAAW;SAClB,CAAC;QAEF,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AARD,4EAQC;AAED;;;;;;GAMG;AACH,SAAgB,qCAAqC,CAAC,IAAU,EAAE,UAAsB;IACtF,OAAO,4CAA4C,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;AACnH,CAAC;AAFD,sFAEC;AAED;;;;;;GAMG;AACH,SAAgB,4CAA4C,CAAC,IAAU,EAAE,UAAsB;IAC7F,4IAA4I;IAE5I,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,EAAE,iCAAiC,CAAC,UAAU,CAAC,CAAC,CAAC;AAC/F,CAAC;AAJD,oGAIC;AAED,SAAgB,oCAAoC,CAAC,KAAgC;;IACnF,MAAM,OAAO,GAAG,IAAA,qBAAS,EAAC,KAAK,CAA4C,CAAC;IAC5E,MAAM,YAAY,iDACb,OAAO,GACP,OAAO,CAAC,MAAM,KACjB,SAAS,EAAE,OAAO,CAAC,GAAG,EACtB,QAAQ,EAAE,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,QAAQ,mCAAI,EAAE,GACzC,CAAC;IAEF,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,yCAAyC;IAErE,OAAO,YAAY,CAAC;AACtB,CAAC;AAZD,oFAYC;AAED,SAAgB,iCAAiC,CAAC,UAAsB;;IACtE,sDAAsD;IACtD,MAAM,UAAU,GAAyC;QACvD,OAAO,EAAE,UAAU,CAAC,QAAQ;QAC5B,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,cAAc,EAAE,MAAA,UAAU,CAAC,aAAa,mCAAI,KAAK;QACjD,QAAQ,EAAE;YACR,gBAAgB,EAAE,+BAA+B;YACjD,UAAU,EAAE,EAAE;SACf;KACF,CAAC;IAEF,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;IAC7C,MAAM,MAAM,mCACP,YAAY,GACZ,UAAU,CACd,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAnBD,8EAmBC"}

package/test/src/lib/firebase/firebase.admin.collection.d.ts

@@ -1,7 +1,7 @@
 import { FirestoreCollection, FirestoreDocument, DocumentReference } from '@dereekb/firebase';
 import { ModelKey, PromiseOrValue } from '@dereekb/util';
-import { JestTestContextFixture, AbstractChildJestTestContextFixture } from "@dereekb/util/test";
-import { FirebaseAdminTestContext } from "./firebase.admin";
+import { JestTestContextFixture, AbstractChildJestTestContextFixture } from '@dereekb/util/test';
+import { FirebaseAdminTestContext } from './firebase.admin';
 /**
  * Testing context for a single model.
  */

package/test/src/lib/firebase/firebase.admin.collection.js

@@ -57,5 +57,4 @@ function modelTestContextFactory(config) {
     };
 }
 exports.modelTestContextFactory = modelTestContextFactory;
-;
 //# sourceMappingURL=firebase.admin.collection.js.map

package/test/src/lib/firebase/firebase.admin.collection.js.map

@@ -1 +1 @@
-{"version":3,"file":"firebase.admin.collection.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/test/src/lib/firebase/firebase.admin.collection.ts"],"names":[],"mappings":";;;;AAEA,6CAAwH;AAYxH,MAAa,uBAMX,SAAQ,0CAA0C;IAGlD,qCAAqC;IACrC,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;IACnC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAChC,CAAC;CAEF;AAtBD,0DAsBC;AAED,MAAa,wBAAwB;IAKnC,YAAqB,UAAqC,EAAW,GAAyB,EAAW,WAAe;QAAnG,eAAU,GAAV,UAAU,CAA2B;QAAW,QAAG,GAAH,GAAG,CAAsB;QAAW,gBAAW,GAAX,WAAW,CAAI;IAAI,CAAC;IAE7H,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACrB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;CAEF;AAnBD,4DAmBC;AAgDD;;GAEG;AACH,SAAgB,uBAAuB,CAOrC,MAA4D;IAC5D,MAAM,EACJ,aAAa,EACb,OAAO,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,WAAW,EAAE,CAAC,WAAW,EACjF,YAAY,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,wBAAwB,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,CAAM,EAClH,WAAW,GAAG,CAAC,CAAK,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAkB,CAAC,CAAC,EACxE,YAAY,EACb,GAAG,MAAM,CAAC;IAEX,OAAO,CAAC,MAAyC,EAAE,UAA0B,EAAE,EAAE;QAC/E,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;QACrB,OAAO,IAAA,4BAAqB,EAAO;YACjC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAM;YAC5B,UAAU;YACV,YAAY,EAAE,GAAS,EAAE;gBACvB,MAAM,cAAc,GAAG,CAAC,CAAC,QAAQ,CAAC;gBAClC,MAAM,UAAU,GAAG,aAAa,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;gBACzD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;gBAC9D,MAAM,QAAQ,GAAM,MAAM,YAAY,CAAC,UAAU,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;gBAExE,IAAI,YAAY,EAAE;oBAChB,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;iBACtC;gBAED,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAA;SACF,CAAC,CAAC;IACL,CAAC,CAAA;AACH,CAAC;AAnCD,0DAmCC;AAAA,CAAC"}
+{"version":3,"file":"firebase.admin.collection.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/test/src/lib/firebase/firebase.admin.collection.ts"],"names":[],"mappings":";;;;AAEA,6CAAwH;AAYxH,MAAa,uBAAyS,SAAQ,0CAA0C;IACtW,qCAAqC;IACrC,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;IACnC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAChC,CAAC;CACF;AAbD,0DAaC;AAED,MAAa,wBAAwB;IACnC,YAAqB,UAAqC,EAAW,GAAyB,EAAW,WAAe;QAAnG,eAAU,GAAV,UAAU,CAA2B;QAAW,QAAG,GAAH,GAAG,CAAsB;QAAW,gBAAW,GAAX,WAAW,CAAI;IAAG,CAAC;IAE5H,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACrB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;CACF;AAdD,4DAcC;AA0CD;;GAEG;AACH,SAAgB,uBAAuB,CAQrC,MAA4D;IAC5D,MAAM,EAAE,aAAa,EAAE,OAAO,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,YAAY,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,wBAAwB,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,CAAM,EAAE,WAAW,GAAG,CAAC,CAAK,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAkB,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAEhU,OAAO,CAAC,MAAyC,EAAE,UAA0B,EAAE,EAAE;QAC/E,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;QACrB,OAAO,IAAA,4BAAqB,EAAO;YACjC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAM;YAC5B,UAAU;YACV,YAAY,EAAE,GAAS,EAAE;gBACvB,MAAM,cAAc,GAAG,CAAC,CAAC,QAAQ,CAAC;gBAClC,MAAM,UAAU,GAAG,aAAa,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;gBACzD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;gBAC9D,MAAM,QAAQ,GAAM,MAAM,YAAY,CAAC,UAAU,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;gBAExE,IAAI,YAAY,EAAE;oBAChB,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;iBACtC;gBAED,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAA;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AA9BD,0DA8BC"}

package/test/src/lib/firebase/firebase.admin.d.ts

@@ -2,24 +2,12 @@ import * as admin from 'firebase-admin';
 import { Firestore } from '@google-cloud/firestore';
 import { Auth } from 'firebase-admin/lib/auth/auth';
 import { JestTestFirestoreContextFactory, TestFirestoreContext, TestFirestoreContextFixture, TestFirestoreInstance } from '@dereekb/firebase/test';
-import { AbstractJestTestContextFixture, JestBuildTestsWithContextFunction, JestTestContextFactory, JestTestContextFixture } from "@dereekb/util/test";
+import { AbstractJestTestContextFixture, JestBuildTestsWithContextFunction, JestTestContextFactory, JestTestContextFixture } from '@dereekb/util/test';
 import { GoogleCloudTestFirestoreInstance } from '../firestore/firestore';
-import { CloudFunction as CloudFunctionV1 } from 'firebase-functions';
-import { wrap, WrappedFunction, WrappedScheduledFunction } from 'firebase-functions-test/lib/main';
-import { Getter } from '@dereekb/util';
+import { FirebaseAdminCloudFunctionWrapper, FirebaseAdminCloudFunctionWrapperSource } from './firebase.function';
 export interface FirebaseAdminTestConfig {
 }
-export declare type WrapCloudFunction = typeof wrap;
-export declare type WrapCloudFunctionInput<T> = CloudFunctionV1<T>;
-export declare type WrappedCloudFunction<T> = WrappedScheduledFunction | WrappedFunction<T>;
-export interface FirebaseAdminCloudFunctionWrapper {
-    /**
-     * Wrap function if available. If not in the right context/supported then this will throw an exception.
-     */
-    get wrapCloudFunction(): WrapCloudFunction;
-}
-export declare function wrapCloudFunctionForTests<I, T extends WrapCloudFunctionInput<I> = WrapCloudFunctionInput<I>>(wrapper: FirebaseAdminCloudFunctionWrapper, getter: Getter<T>): Getter<WrappedCloudFunction<I>>;
-export interface FirebaseAdminTestContext extends FirebaseAdminCloudFunctionWrapper {
+export interface FirebaseAdminTestContext extends FirebaseAdminCloudFunctionWrapperSource {
     readonly app: admin.app.App;
     readonly auth: Auth;
     readonly firestore: Firestore;
@@ -32,17 +20,17 @@ export declare class FirebaseAdminTestContextFixture extends AbstractJestTestCon
     get firestore(): Firestore;
     get firestoreInstance(): TestFirestoreInstance;
     get firestoreContext(): TestFirestoreContext;
-    get wrapCloudFunction(): WrapCloudFunction;
+    get fnWrapper(): FirebaseAdminCloudFunctionWrapper;
 }
 export declare class FirebaseAdminTestContextInstance implements FirebaseAdminTestContext {
     readonly app: admin.app.App;
-    readonly getTestFirestoreInstance: import("@dereekb/util").CachedFactoryWithInput<GoogleCloudTestFirestoreInstance, any>;
+    readonly getTestFirestoreInstance: import("@dereekb/util").CachedFactoryWithInput<GoogleCloudTestFirestoreInstance, unknown>;
     constructor(app: admin.app.App);
     get auth(): Auth;
     get firestore(): Firestore;
     get firestoreInstance(): TestFirestoreInstance;
     get firestoreContext(): TestFirestoreContext;
-    get wrapCloudFunction(): WrapCloudFunction;
+    get fnWrapper(): FirebaseAdminCloudFunctionWrapper;
 }
 export declare abstract class AbstractFirebaseAdminTestContextInstanceChild<F extends FirebaseAdminTestContextInstance = FirebaseAdminTestContextInstance> implements FirebaseAdminTestContext {
     readonly parent: F;
@@ -52,7 +40,7 @@ export declare abstract class AbstractFirebaseAdminTestContextInstanceChild<F ex
     get firestore(): Firestore;
     get firestoreInstance(): TestFirestoreInstance;
     get firestoreContext(): TestFirestoreContext;
-    get wrapCloudFunction(): WrapCloudFunction;
+    get fnWrapper(): FirebaseAdminCloudFunctionWrapper;
 }
 /**
  * A JestTestContextBuilderFunction for building firebase test context factories using firebase-admin.

package/test/src/lib/firebase/firebase.admin.function.d.ts

@@ -3,8 +3,8 @@ import { Firestore } from '@google-cloud/firestore';
 import { Auth } from 'firebase-admin/lib/auth/auth';
 import { FeaturesList } from 'firebase-functions-test/lib/features';
 import { TestFirestoreContext, TestFirestoreInstance } from '@dereekb/firebase/test';
-import { AbstractJestTestContextFixture, JestTestContextFactory, JestTestContextFixture } from "@dereekb/util/test";
-import { FirebaseAdminTestContext, FirebaseAdminTestContextInstance, WrapCloudFunction } from './firebase.admin';
+import { AbstractJestTestContextFixture, JestTestContextFactory, JestTestContextFixture } from '@dereekb/util/test';
+import { FirebaseAdminTestContext, FirebaseAdminTestContextInstance } from './firebase.admin';
 export declare function setupFirebaseAdminFunctionTestSingleton(reroll?: boolean): FeaturesList;
 export declare function rerollFirebaseAdminFunctionTestSingleton(): FeaturesList;
 export interface FirebaseAdminFunctionTestConfig {
@@ -27,12 +27,13 @@ export declare class FirebaseAdminFunctionTestContextFixture extends AbstractJes
     get firestore(): Firestore;
     get firestoreInstance(): TestFirestoreInstance;
     get firestoreContext(): TestFirestoreContext;
-    get wrapCloudFunction(): WrapCloudFunction;
+    get fnWrapper(): import("./firebase.function").FirebaseAdminCloudFunctionWrapper;
 }
 export declare class FirebaseAdminFunctionTestContextInstance extends FirebaseAdminTestContextInstance implements FirebaseAdminFunctionTestContext {
     readonly instance: FeaturesList;
+    private _fnWrapper;
     constructor(instance: FeaturesList, app: admin.app.App);
-    get wrapCloudFunction(): WrapCloudFunction;
+    get fnWrapper(): import("./firebase.function").FirebaseAdminCloudFunctionWrapper;
 }
 export declare let DEFAULT_FIREBASE_ADMIN_FUNCTION_TEST_USE_FUNCTION_SINGLETON_CONTEXT: boolean;
 export declare function setDefaultFirebaseAdminFunctionTestUseFunctionSingleton(use: boolean): void;