@dereekb/firebase-server 8.10.0 → 8.11.2

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [8.11.2](https://github.com/dereekb/dbx-components/compare/v8.11.1-dev...v8.11.2) (2022-07-05)
+
+
+
+## [8.11.1](https://github.com/dereekb/dbx-components/compare/v8.11.0-dev...v8.11.1) (2022-07-05)
+
+
+### Bug Fixes
+
+* firebase storage test fix ([ff5c53a](https://github.com/dereekb/dbx-components/commit/ff5c53ab8a76a8b3ede356f2ba7d00006db3237f))
+
+
+
+# [8.11.0](https://github.com/dereekb/dbx-components/compare/v8.10.0-dev...v8.11.0) (2022-07-05)
+
+
+### Features
+
+* added specifier for crud functions ([39e366e](https://github.com/dereekb/dbx-components/commit/39e366e09936b5963cd3e74bc127ad3146d14ef7))
+
+
+
 # [8.10.0](https://github.com/dereekb/dbx-components/compare/v8.9.1-dev...v8.10.0) (2022-07-04)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase-server",
-  "version": "8.10.0",
+  "version": "8.11.2",
   "devDependencies": {
     "firebase-functions-test": "2.0.2"
   },
@@ -20,27 +20,27 @@
   "typings": "./src/index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@dereekb/firebase": "8.10.0",
+    "@dereekb/firebase": "8.11.2",
     "rxfire": "^6.0.3",
     "rxjs": "^7.0.0",
     "firebase": "^9.8.0",
-    "@dereekb/util": "8.10.0",
+    "@dereekb/util": "8.11.2",
     "make-error": "^1.3.0",
     "ts-essentials": "^9.1.2",
     "extra-set": "^2.2.11",
-    "@dereekb/rxjs": "8.10.0",
+    "@dereekb/rxjs": "8.11.2",
     "ms": "^3.0.0-canary.1",
-    "@dereekb/model": "8.10.0",
+    "@dereekb/model": "8.11.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
-    "@dereekb/date": "8.10.0",
+    "@dereekb/date": "8.11.2",
     "date-fns": "^2.28.0",
     "date-fns-tz": "^1.3.0",
     "rrule": "2.7.0",
     "firebase-functions": "^3.22.0",
     "firebase-admin": "^11.0.0",
     "@nestjs/common": "^8.4.0",
-    "@dereekb/nestjs": "8.10.0",
+    "@dereekb/nestjs": "8.11.2",
     "@nestjs/config": "^2.0.1",
     "@google-cloud/firestore": "^5.0.2",
     "@nestjs/core": "^8.4.0",

package/src/lib/nest/model/create.model.function.d.ts

@@ -1,8 +1,8 @@
 import { PromiseOrValue } from '@dereekb/util';
-import { FirestoreModelType, FirestoreModelIdentity, FirestoreModelTypes, OnCallCreateModelParams, OnCallCreateModelResult } from '@dereekb/firebase';
+import { FirestoreModelType, FirestoreModelIdentity, FirestoreModelTypes, OnCallCreateModelParams, OnCallCreateModelResult, ModelFirebaseCrudFunctionSpecifierRef } from '@dereekb/firebase';
 import { OnCallWithAuthorizedNestContext } from '../function/call';
 import { NestContextCallableRequestWithAuth } from '../function/nest';
-export declare type OnCallCreateModelFunction<N, I = unknown, O extends OnCallCreateModelResult = OnCallCreateModelResult> = (request: NestContextCallableRequestWithAuth<N, I>) => PromiseOrValue<O>;
+export declare type OnCallCreateModelFunction<N, I = unknown, O extends OnCallCreateModelResult = OnCallCreateModelResult> = (request: NestContextCallableRequestWithAuth<N, I> & ModelFirebaseCrudFunctionSpecifierRef) => PromiseOrValue<O>;
 export declare type OnCallCreateModelMap<N, T extends FirestoreModelIdentity = FirestoreModelIdentity> = {
     [K in FirestoreModelTypes<T>]?: OnCallCreateModelFunction<N, any, OnCallCreateModelResult>;
 };

package/src/lib/nest/model/create.model.function.js

@@ -15,7 +15,7 @@ function onCallCreateModel(map) {
         const modelType = (_a = request.data) === null || _a === void 0 ? void 0 : _a.modelType;
         const createFn = map[modelType];
         if (createFn) {
-            return createFn(Object.assign(Object.assign({}, request), { data: request.data.data }));
+            return createFn(Object.assign(Object.assign({}, request), { specifier: request.data.specifier, data: request.data.data }));
         }
         else {
             throw createModelUnknownModelTypeError(modelType);

package/src/lib/nest/model/create.model.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.model.function.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/model/create.model.function.ts"],"names":[],"mappings":";;;AAAA,wCAA4D;AAE5D,6CAAiD;AAWjD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAI,GAA4B;IAC/D,OAAO,CAAC,OAAO,EAAE,EAAE;;QACjB,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,IAAI,0CAAE,SAAS,CAAC;QAC1C,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;QAEhC,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,iCACV,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,IACvB,CAAC;SACJ;aAAM;YACL,MAAM,gCAAgC,CAAC,SAAS,CAAC,CAAC;SACnD;IACH,CAAC,CAAC;AACJ,CAAC;AAdD,8CAcC;AAED,SAAgB,gCAAgC,CAAC,SAA6B;IAC5E,OAAO,IAAA,0BAAe,EACpB,IAAA,kBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,iBAAiB,SAAS,cAAc;QACjD,IAAI,EAAE;YACJ,SAAS;SACV;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAXD,4EAWC"}
+{"version":3,"file":"create.model.function.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/model/create.model.function.ts"],"names":[],"mappings":";;;AAAA,wCAA4D;AAE5D,6CAAiD;AAWjD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAI,GAA4B;IAC/D,OAAO,CAAC,OAAO,EAAE,EAAE;;QACjB,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,IAAI,0CAAE,SAAS,CAAC;QAC1C,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;QAEhC,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,iCACV,OAAO,KACV,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EACjC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,IACvB,CAAC;SACJ;aAAM;YACL,MAAM,gCAAgC,CAAC,SAAS,CAAC,CAAC;SACnD;IACH,CAAC,CAAC;AACJ,CAAC;AAfD,8CAeC;AAED,SAAgB,gCAAgC,CAAC,SAA6B;IAC5E,OAAO,IAAA,0BAAe,EACpB,IAAA,kBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,iBAAiB,SAAS,cAAc;QACjD,IAAI,EAAE;YACJ,SAAS;SACV;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAXD,4EAWC"}

package/src/lib/nest/model/delete.model.function.d.ts

@@ -1,8 +1,8 @@
 import { PromiseOrValue } from '@dereekb/util';
-import { FirestoreModelType, FirestoreModelIdentity, FirestoreModelTypes, OnCallDeleteModelParams } from '@dereekb/firebase';
+import { FirestoreModelType, FirestoreModelIdentity, FirestoreModelTypes, OnCallDeleteModelParams, ModelFirebaseCrudFunctionSpecifierRef } from '@dereekb/firebase';
 import { NestContextCallableRequestWithAuth } from '../function/nest';
 import { OnCallWithAuthorizedNestContext } from '../function/call';
-export declare type OnCallDeleteModelFunction<N, I = unknown, O = void> = (request: NestContextCallableRequestWithAuth<N, I>) => PromiseOrValue<O>;
+export declare type OnCallDeleteModelFunction<N, I = unknown, O = void> = (request: NestContextCallableRequestWithAuth<N, I> & ModelFirebaseCrudFunctionSpecifierRef) => PromiseOrValue<O>;
 export declare type OnCallDeleteModelMap<N, T extends FirestoreModelIdentity = FirestoreModelIdentity> = {
     [K in FirestoreModelTypes<T>]?: OnCallDeleteModelFunction<N, any, any>;
 };

package/src/lib/nest/model/delete.model.function.js

@@ -15,7 +15,7 @@ function onCallDeleteModel(map) {
         const modelType = (_a = request.data) === null || _a === void 0 ? void 0 : _a.modelType;
         const deleteFn = map[modelType];
         if (deleteFn) {
-            return deleteFn(Object.assign(Object.assign({}, request), { data: request.data.data }));
+            return deleteFn(Object.assign(Object.assign({}, request), { specifier: request.data.specifier, data: request.data.data }));
         }
         else {
             throw deleteModelUnknownModelTypeError(modelType);

package/src/lib/nest/model/delete.model.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete.model.function.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/model/delete.model.function.ts"],"names":[],"mappings":";;;AAAA,wCAA4D;AAE5D,6CAAiD;AAWjD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAI,GAA4B;IAC/D,OAAO,CAAC,OAAO,EAAE,EAAE;;QACjB,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,IAAI,0CAAE,SAAS,CAAC;QAC1C,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;QAEhC,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,iCACV,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,IACvB,CAAC;SACJ;aAAM;YACL,MAAM,gCAAgC,CAAC,SAAS,CAAC,CAAC;SACnD;IACH,CAAC,CAAC;AACJ,CAAC;AAdD,8CAcC;AAED,SAAgB,gCAAgC,CAAC,SAA6B;IAC5E,OAAO,IAAA,0BAAe,EACpB,IAAA,kBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,yBAAyB;QAClC,IAAI,EAAE;YACJ,SAAS;SACV;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAXD,4EAWC"}
+{"version":3,"file":"delete.model.function.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/model/delete.model.function.ts"],"names":[],"mappings":";;;AAAA,wCAA4D;AAE5D,6CAAiD;AAWjD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAI,GAA4B;IAC/D,OAAO,CAAC,OAAO,EAAE,EAAE;;QACjB,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,IAAI,0CAAE,SAAS,CAAC;QAC1C,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;QAEhC,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,iCACV,OAAO,KACV,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EACjC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,IACvB,CAAC;SACJ;aAAM;YACL,MAAM,gCAAgC,CAAC,SAAS,CAAC,CAAC;SACnD;IACH,CAAC,CAAC;AACJ,CAAC;AAfD,8CAeC;AAED,SAAgB,gCAAgC,CAAC,SAA6B;IAC5E,OAAO,IAAA,0BAAe,EACpB,IAAA,kBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,yBAAyB;QAClC,IAAI,EAAE;YACJ,SAAS;SACV;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAXD,4EAWC"}

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

@@ -1,4 +1,5 @@
 export * from './permission.error';
+export * from './specifier.function';
 export * from './create.model.function';
 export * from './update.model.function';
 export * from './delete.model.function';

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./permission.error"), exports);
+tslib_1.__exportStar(require("./specifier.function"), exports);
 tslib_1.__exportStar(require("./create.model.function"), exports);
 tslib_1.__exportStar(require("./update.model.function"), exports);
 tslib_1.__exportStar(require("./delete.model.function"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/model/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,kEAAwC;AACxC,kEAAwC;AACxC,kEAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/model/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,+DAAqC;AACrC,kEAAwC;AACxC,kEAAwC;AACxC,kEAAwC"}

package/src/lib/nest/model/specifier.function.d.ts

@@ -0,0 +1,14 @@
+import { ModelFirebaseCrudFunctionSpecifier, ModelFirebaseCrudFunctionSpecifierRef } from '@dereekb/firebase';
+import { PromiseOrValue } from '@dereekb/util';
+import { NestContextCallableRequestWithAuth } from '../function/nest';
+export declare type OnCallSpecifierHandlerNestContextRequest<N, I = unknown> = NestContextCallableRequestWithAuth<N, I> & ModelFirebaseCrudFunctionSpecifierRef;
+export declare type OnCallSpecifierHandlerFunction<N, I = unknown, O = void> = (request: OnCallSpecifierHandlerNestContextRequest<N, I>) => PromiseOrValue<O>;
+export declare type OnCallSpecifierHandlerConfig<N> = {
+    /**
+     * The default handler function.
+     */
+    _: OnCallSpecifierHandlerFunction<N, any, any>;
+    [key: string]: OnCallSpecifierHandlerFunction<N, any, any>;
+};
+export declare function onCallSpecifierHandler<N>(config: OnCallSpecifierHandlerConfig<N>): OnCallSpecifierHandlerFunction<N>;
+export declare function unknownModelCrudFunctionSpecifierError(specifier: ModelFirebaseCrudFunctionSpecifier): import("firebase-functions/v1/auth").HttpsError;

package/src/lib/nest/model/specifier.function.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unknownModelCrudFunctionSpecifierError = exports.onCallSpecifierHandler = void 0;
+const tslib_1 = require("tslib");
+const firebase_1 = require("@dereekb/firebase");
+const util_1 = require("@dereekb/util");
+const function_1 = require("../../function");
+function onCallSpecifierHandler(config) {
+    const map = (0, util_1.objectToMap)(config);
+    return (request) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { specifier = firebase_1.MODEL_FUNCTION_FIREBASE_CRUD_FUNCTION_SPECIFIER_DEFAULT } = request;
+        const handler = map.get(specifier);
+        if (handler != null) {
+            return yield handler(request);
+        }
+        else {
+            throw unknownModelCrudFunctionSpecifierError(specifier);
+        }
+    });
+}
+exports.onCallSpecifierHandler = onCallSpecifierHandler;
+function unknownModelCrudFunctionSpecifierError(specifier) {
+    return (0, function_1.badRequestError)((0, util_1.serverError)({
+        status: 400,
+        code: 'UNKNOWN_SPECIFIER_ERROR',
+        message: 'Invalid/unknown specifier for this function.',
+        data: {
+            specifier
+        }
+    }));
+}
+exports.unknownModelCrudFunctionSpecifierError = unknownModelCrudFunctionSpecifierError;
+//# sourceMappingURL=specifier.function.js.map

package/src/lib/nest/model/specifier.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"specifier.function.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/model/specifier.function.ts"],"names":[],"mappings":";;;;AAAA,gDAAuK;AACvK,wCAAyE;AAEzE,6CAAiD;AAcjD,SAAgB,sBAAsB,CAAI,MAAuC;IAC/E,MAAM,GAAG,GAAG,IAAA,kBAAW,EAAC,MAAM,CAAC,CAAC;IAEhC,OAAO,CAAO,OAAO,EAAE,EAAE;QACvB,MAAM,EAAE,SAAS,GAAG,kEAAuD,EAAE,GAAG,OAAO,CAAC;QACxF,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEnC,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;SAC/B;aAAM;YACL,MAAM,sCAAsC,CAAC,SAAS,CAAC,CAAC;SACzD;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AAbD,wDAaC;AAED,SAAgB,sCAAsC,CAAC,SAA6C;IAClG,OAAO,IAAA,0BAAe,EACpB,IAAA,kBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,yBAAyB;QAC/B,OAAO,EAAE,8CAA8C;QACvD,IAAI,EAAE;YACJ,SAAS;SACV;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAXD,wFAWC"}

package/src/lib/nest/model/update.model.function.d.ts

@@ -1,8 +1,8 @@
 import { PromiseOrValue } from '@dereekb/util';
-import { FirestoreModelType, FirestoreModelIdentity, FirestoreModelTypes, OnCallUpdateModelParams } from '@dereekb/firebase';
+import { FirestoreModelType, FirestoreModelIdentity, FirestoreModelTypes, OnCallUpdateModelParams, ModelFirebaseCrudFunctionSpecifierRef } from '@dereekb/firebase';
 import { OnCallWithAuthorizedNestContext } from '../function/call';
 import { NestContextCallableRequestWithAuth } from '../function/nest';
-export declare type OnCallUpdateModelFunction<N, I = unknown, O = void> = (request: NestContextCallableRequestWithAuth<N, I>) => PromiseOrValue<O>;
+export declare type OnCallUpdateModelFunction<N, I = unknown, O = void> = (request: NestContextCallableRequestWithAuth<N, I> & ModelFirebaseCrudFunctionSpecifierRef) => PromiseOrValue<O>;
 export declare type OnCallUpdateModelMap<N, T extends FirestoreModelIdentity = FirestoreModelIdentity> = {
     [K in FirestoreModelTypes<T>]?: OnCallUpdateModelFunction<N, any, any>;
 };

package/src/lib/nest/model/update.model.function.js

@@ -15,7 +15,7 @@ function onCallUpdateModel(map) {
         const modelType = (_a = request.data) === null || _a === void 0 ? void 0 : _a.modelType;
         const updateFn = map[modelType];
         if (updateFn) {
-            return updateFn(Object.assign(Object.assign({}, request), { data: request.data.data }));
+            return updateFn(Object.assign(Object.assign({}, request), { specifier: request.data.specifier, data: request.data.data }));
         }
         else {
             throw updateModelUnknownModelTypeError(modelType);

package/src/lib/nest/model/update.model.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.model.function.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/model/update.model.function.ts"],"names":[],"mappings":";;;AAAA,wCAA4D;AAE5D,6CAAiD;AAWjD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAI,GAA4B;IAC/D,OAAO,CAAC,OAAO,EAAE,EAAE;;QACjB,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,IAAI,0CAAE,SAAS,CAAC;QAC1C,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;QAEhC,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,iCACV,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,IACvB,CAAC;SACJ;aAAM;YACL,MAAM,gCAAgC,CAAC,SAAS,CAAC,CAAC;SACnD;IACH,CAAC,CAAC;AACJ,CAAC;AAdD,8CAcC;AAED,SAAgB,gCAAgC,CAAC,SAA6B;IAC5E,OAAO,IAAA,0BAAe,EACpB,IAAA,kBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,yBAAyB;QAClC,IAAI,EAAE;YACJ,SAAS;SACV;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAXD,4EAWC"}
+{"version":3,"file":"update.model.function.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/model/update.model.function.ts"],"names":[],"mappings":";;;AAAA,wCAA4D;AAE5D,6CAAiD;AAWjD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAI,GAA4B;IAC/D,OAAO,CAAC,OAAO,EAAE,EAAE;;QACjB,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,IAAI,0CAAE,SAAS,CAAC;QAC1C,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;QAEhC,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,iCACV,OAAO,KACV,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EACjC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,IACvB,CAAC;SACJ;aAAM;YACL,MAAM,gCAAgC,CAAC,SAAS,CAAC,CAAC;SACnD;IACH,CAAC,CAAC;AACJ,CAAC;AAfD,8CAeC;AAED,SAAgB,gCAAgC,CAAC,SAA6B;IAC5E,OAAO,IAAA,0BAAe,EACpB,IAAA,kBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,yBAAyB;QAClC,IAAI,EAAE;YACJ,SAAS;SACV;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAXD,4EAWC"}

package/src/lib/storage/storage.nest.js

@@ -30,7 +30,7 @@ FirebaseServerStorageModule = tslib_1.__decorate([
         providers: [
             {
                 provide: exports.FIREBASE_STORAGE_TOKEN,
-                useFactory: (app) => app.storage(),
+                useFactory: (app) => (0, storage_1.googleCloudStorageFromFirebaseAdminStorage)(app.storage()),
                 inject: [firebase_nest_1.FIREBASE_APP_TOKEN]
             }
         ],

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

@@ -1 +1 @@
-{"version":3,"file":"storage.nest.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/storage/storage.nest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"storage.nest.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/storage/storage.nest.ts"],"names":[],"mappings":"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"}

package/test/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [8.11.2](https://github.com/dereekb/dbx-components/compare/v8.11.1-dev...v8.11.2) (2022-07-05)
+
+
+
+## [8.11.1](https://github.com/dereekb/dbx-components/compare/v8.11.0-dev...v8.11.1) (2022-07-05)
+
+
+### Bug Fixes
+
+* firebase storage test fix ([ff5c53a](https://github.com/dereekb/dbx-components/commit/ff5c53ab8a76a8b3ede356f2ba7d00006db3237f))
+
+
+
+# [8.11.0](https://github.com/dereekb/dbx-components/compare/v8.10.0-dev...v8.11.0) (2022-07-05)
+
+
+
 # [8.10.0](https://github.com/dereekb/dbx-components/compare/v8.9.1-dev...v8.10.0) (2022-07-04)
 
 

package/test/package.json

@@ -1,37 +1,37 @@
 {
   "name": "@dereekb/firebase-server/test",
-  "version": "8.10.0",
+  "version": "8.11.2",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@dereekb/firebase": "8.10.0",
+    "@dereekb/firebase": "8.11.2",
     "rxfire": "^6.0.3",
     "rxjs": "^7.0.0",
     "firebase": "^9.8.0",
-    "@dereekb/util": "8.10.0",
+    "@dereekb/util": "8.11.2",
     "make-error": "^1.3.0",
     "ts-essentials": "^9.1.2",
     "extra-set": "^2.2.11",
-    "@dereekb/rxjs": "8.10.0",
+    "@dereekb/rxjs": "8.11.2",
     "ms": "^3.0.0-canary.1",
-    "@dereekb/model": "8.10.0",
+    "@dereekb/model": "8.11.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
-    "@dereekb/date": "8.10.0",
+    "@dereekb/date": "8.11.2",
     "date-fns": "^2.28.0",
     "date-fns-tz": "^1.3.0",
     "rrule": "2.7.0",
-    "@dereekb/util/test": "8.10.0",
+    "@dereekb/util/test": "8.11.2",
     "firebase-admin": "^11.0.0",
     "jsonwebtoken": "^8.0.0",
     "firebase-functions": "^3.22.0",
     "@nestjs/common": "^8.4.0",
     "@google-cloud/firestore": "^5.0.2",
-    "@dereekb/firebase/test": "8.10.0",
-    "@dereekb/firebase-server": "8.10.0",
-    "@dereekb/nestjs": "8.10.0",
+    "@dereekb/firebase/test": "8.11.2",
+    "@dereekb/firebase-server": "8.11.2",
+    "@dereekb/nestjs": "8.11.2",
     "@nestjs/config": "^2.0.1",
     "@nestjs/core": "^8.4.0",
     "@nestjs/platform-express": "^8.4.0",

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

@@ -51,7 +51,8 @@ class FirebaseAdminTestContextInstance {
         });
         this.getTestFirebaseStorageInstance = (0, util_1.cachedGetter)(() => {
             const drivers = (0, test_1.makeTestingFirebaseStorageDrivers)((0, firebase_server_1.googleCloudFirebaseStorageDrivers)());
-            return new storage_1.GoogleCloudTestFirebaseStorageInstance(drivers, this.storage);
+            const defaultBucketId = this.app.options.storageBucket;
+            return new storage_1.GoogleCloudTestFirebaseStorageInstance(drivers, this.storage, defaultBucketId);
         });
     }
     get auth() {

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

@@ -1 +1 @@
-{"version":3,"file":"firebase.admin.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/test/src/lib/firebase/firebase.admin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"firebase.admin.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/test/src/lib/firebase/firebase.admin.ts"],"names":[],"mappings":"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"}