@dereekb/firebase-server 13.15.0 → 13.17.0

package/index.cjs.js

@@ -18,7 +18,7 @@ var model = require('@dereekb/model');
 var admin = require('firebase-admin');
 var storage = require('@google-cloud/storage');
 var dateFns = require('date-fns');
-var types = require('util/types');
+var types = require('node:util/types');
 var rxjs$1 = require('@dereekb/rxjs');
 var platformExpress = require('@nestjs/platform-express');
 var express = require('express');
@@ -1335,7 +1335,7 @@ function _ts_generator$g(thisArg, body) {
                                 ];
                             case 1:
                                 claims = _state.sent();
-                                result = claims.resetPassword != null ? claims : undefined;
+                                result = claims.resetPassword == null ? undefined : claims;
                                 return [
                                     2,
                                     result
@@ -1746,15 +1746,21 @@ function _ts_generator$g(thisArg, body) {
                             case 1:
                                 userRecord = _state.sent();
                                 createdUser = false;
-                                if (!!userRecord) return [
+                                if (!userRecord) return [
                                     3,
-                                    5
+                                    2
+                                ];
+                                userRecordId = userRecord.uid;
+                                return [
+                                    3,
+                                    6
                                 ];
+                            case 2:
                                 return [
                                     4,
                                     this.createNewUser(input)
                                 ];
-                            case 2:
+                            case 3:
                                 createResult = _state.sent();
                                 // add the setup password to the user's credentials
                                 userContext = this.authService.userContext(createResult.user.uid);
@@ -1762,7 +1768,7 @@ function _ts_generator$g(thisArg, body) {
                                     4,
                                     this.addNewUserSetupClaims(userContext, createResult.password)
                                 ];
-                            case 3:
+                            case 4:
                                 _state.sent();
                                 createdUser = true;
                                 userRecordId = userContext.uid;
@@ -1770,14 +1776,8 @@ function _ts_generator$g(thisArg, body) {
                                     4,
                                     userContext.loadRecord()
                                 ];
-                            case 4:
-                                userRecord = _state.sent();
-                                return [
-                                    3,
-                                    6
-                                ];
                             case 5:
-                                userRecordId = userRecord.uid;
+                                userRecord = _state.sent();
                                 _state.label = 6;
                             case 6:
                                 if (!(createdUser && sendSetupContent === true || sendSetupContentIfUserExists)) return [
@@ -3611,10 +3611,10 @@ function _define_property$v(obj, key, value) {
         {
             key: "update",
             value: function update(data, params) {
-                if ((params === null || params === void 0 ? void 0 : params.precondition) != null) {
-                    this.batch.update(this.documentRef, data, params.precondition);
-                } else {
+                if ((params === null || params === void 0 ? void 0 : params.precondition) == null) {
                     this.batch.update(this.documentRef, data);
+                } else {
+                    this.batch.update(this.documentRef, data, params.precondition);
                 }
                 return Promise.resolve();
             }
@@ -7577,6 +7577,11 @@ function _ts_generator$9(thisArg, body) {
  * permission-denied / not-found errors surface a real message + code instead of the generic
  * `"Unknown error"` fallback the inline mapping used previously.
  *
+ * When no real message survives, the fallback is derived from the resolved error `code` so the two
+ * distinct outcomes stay distinguishable — a not-found read no longer reads as "permission denied"
+ * (and vice-versa). Only when neither a message nor a recognizable code is present does it fall back
+ * to a generic message.
+ *
  * @param entry - A failed-key entry from the underlying multi-read.
  * @returns A `{ key, message, code? }` triple safe to return to API/MCP callers.
  */ function modelAccessReadErrorFromUseMultipleModelsFailure(entry) {
@@ -7589,10 +7594,28 @@ function _ts_generator$9(thisArg, body) {
     var code = (_info_serverErrorCode = info.serverErrorCode) !== null && _info_serverErrorCode !== void 0 ? _info_serverErrorCode : info.firebaseErrorCode;
     return {
         key: entry.key,
-        message: (_ref = (_ref1 = serverMessage !== null && serverMessage !== void 0 ? serverMessage : httpsMessage) !== null && _ref1 !== void 0 ? _ref1 : plainMessage) !== null && _ref !== void 0 ? _ref : 'permission denied or not found',
+        message: (_ref = (_ref1 = serverMessage !== null && serverMessage !== void 0 ? serverMessage : httpsMessage) !== null && _ref1 !== void 0 ? _ref1 : plainMessage) !== null && _ref !== void 0 ? _ref : modelAccessReadErrorMessageFromCode(code),
         code: code
     };
 }
+/**
+ * Derives a fallback read-error message from a resolved error code, distinguishing not-found from
+ * permission-denied. Accepts both the server-error form (`NOT_FOUND` / `PERMISSION_DENIED` /
+ * `FORBIDDEN`) and the Firebase HttpsError form (`not-found` / `permission-denied`).
+ *
+ * @param code - The resolved error code (`serverErrorCode ?? firebaseErrorCode`), if any.
+ * @returns `'not found'`, `'permission denied'`, or a generic `'unknown error'` fallback.
+ */ function modelAccessReadErrorMessageFromCode(code) {
+    var message;
+    if (code === firebase.NOT_FOUND_ERROR_CODE || code === 'not-found') {
+        message = 'not found';
+    } else if (code === firebase.PERMISSION_DENIED_ERROR_CODE || code === firebase.FORBIDDEN_ERROR_CODE || code === 'permission-denied') {
+        message = 'permission denied';
+    } else {
+        message = 'unknown error';
+    }
+    return message;
+}
 // MARK: Service
 /**
  * Service for direct document reads using the `useModel()` permission-checking pattern.
@@ -9577,7 +9600,7 @@ function _object_spread_props$7(target, source) {
  *
  * @__NO_SIDE_EFFECTS__
  */ function makeBlockingFunctionWithHandler(blockingFunctionBuilder, handler, opts) {
-    var blockingFn = opts != null ? blockingFunctionBuilder(opts, handler) : blockingFunctionBuilder(handler);
+    var blockingFn = opts == null ? blockingFunctionBuilder(handler) : blockingFunctionBuilder(opts, handler);
     blockingFn.__handler = handler;
     return blockingFn;
 }
@@ -10244,7 +10267,7 @@ function _ts_generator$5(thisArg, body) {
  * @__NO_SIDE_EFFECTS__
  */ function firebaseServerActionsTransformFactory(options) {
     var logError = (options !== null && options !== void 0 ? options : {}).logError;
-    var logErrorFunction = logError !== false ? typeof logError === 'function' ? logError : defaultFirebaseServerActionsTransformFactoryLogErrorFunction : util.mapIdentityFunction;
+    var logErrorFunction = logError === false ? util.mapIdentityFunction : typeof logError === 'function' ? logError : defaultFirebaseServerActionsTransformFactoryLogErrorFunction;
     return model.transformAndValidateObjectFactory({
         handleValidationError: function handleValidationError(validationErrors) {
             return _async_to_generator$5(function() {
@@ -10556,15 +10579,11 @@ exports.FirebaseAppCheckMiddleware = __decorate([
             switch(_state.label){
                 case 0:
                     appCheckToken = req.header('X-Firebase-AppCheck');
-                    if (!!appCheckToken) return [
-                        3,
-                        1
-                    ];
-                    error = new common.ForbiddenException();
-                    return [
+                    if (!appCheckToken) return [
                         3,
-                        4
+                        5
                     ];
+                    _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
@@ -10590,6 +10609,14 @@ exports.FirebaseAppCheckMiddleware = __decorate([
                         4
                     ];
                 case 4:
+                    return [
+                        3,
+                        6
+                    ];
+                case 5:
+                    error = new common.ForbiddenException();
+                    _state.label = 6;
+                case 6:
                     return [
                         2,
                         error
@@ -11239,7 +11266,7 @@ function _ts_generator$2(thisArg, body) {
             contentEncoding: (_options_metadata3 = options.metadata) === null || _options_metadata3 === void 0 ? void 0 : _options_metadata3.contentEncoding,
             contentLanguage: (_options_metadata4 = options.metadata) === null || _options_metadata4 === void 0 ? void 0 : _options_metadata4.contentLanguage,
             contentType: (_options_metadata5 = options.metadata) === null || _options_metadata5 === void 0 ? void 0 : _options_metadata5.contentType,
-            metadata: !util.objectHasNoKeys(customMetadata) ? customMetadata : undefined
+            metadata: util.objectHasNoKeys(customMetadata) ? undefined : customMetadata
         });
     }
     function makeUploadOptions(options) {
@@ -11335,8 +11362,8 @@ function _ts_generator$2(thisArg, body) {
             return _async_to_generator$2(function() {
                 var _ref, _ref1, expires, config;
                 return _ts_generator$2(this, function(_state) {
-                    expires = (_ref = input === null || input === void 0 ? void 0 : input.expiresAt) !== null && _ref !== void 0 ? _ref : (input === null || input === void 0 ? void 0 : input.expiresIn) != null ? dateFns.addMilliseconds(new Date(), input.expiresIn) // use expiresIn if provided
-                     : dateFns.addHours(new Date(), 1); // default expiration in 1 hour
+                    expires = (_ref = input === null || input === void 0 ? void 0 : input.expiresAt) !== null && _ref !== void 0 ? _ref : (input === null || input === void 0 ? void 0 : input.expiresIn) == null ? dateFns.addHours(new Date(), 1) // use expiresIn if provided
+                     : dateFns.addMilliseconds(new Date(), input.expiresIn); // default expiration in 1 hour
                     config = _object_spread_props$3(_object_spread$3({}, input), {
                         action: (_ref1 = input === null || input === void 0 ? void 0 : input.action) !== null && _ref1 !== void 0 ? _ref1 : 'read',
                         expires: expires,
@@ -11502,9 +11529,9 @@ function _ts_generator$2(thisArg, body) {
             });
         },
         makePublic: function makePublic(setPublic) {
-            return (setPublic !== false ? file.acl.add(PUBLIC_ACL) : file.acl.delete({
+            return (setPublic === false ? file.acl.delete({
                 entity: PUBLIC_ACL.entity
-            })).then(function() {
+            }) : file.acl.add(PUBLIC_ACL)).then(function() {
                 return undefined;
             });
         },

package/index.esm.js

@@ -15,8 +15,8 @@ import { https, scheduler } from 'firebase-functions/v2';
 import { toTransformAndValidateFunctionResultFactory, transformAndValidateObjectFactory } from '@dereekb/model';
 import admin from 'firebase-admin';
 import { ApiError } from '@google-cloud/storage';
-import { addMilliseconds, addHours } from 'date-fns';
-import { isUint8Array, isArrayBuffer } from 'util/types';
+import { addHours, addMilliseconds } from 'date-fns';
+import { isUint8Array, isArrayBuffer } from 'node:util/types';
 import { fetchAssetLoader, delegatedAssetLoader, AssetLoader } from '@dereekb/rxjs';
 import { ExpressAdapter } from '@nestjs/platform-express';
 import express from 'express';
@@ -1333,7 +1333,7 @@ function _ts_generator$g(thisArg, body) {
                                 ];
                             case 1:
                                 claims = _state.sent();
-                                result = claims.resetPassword != null ? claims : undefined;
+                                result = claims.resetPassword == null ? undefined : claims;
                                 return [
                                     2,
                                     result
@@ -1744,15 +1744,21 @@ function _ts_generator$g(thisArg, body) {
                             case 1:
                                 userRecord = _state.sent();
                                 createdUser = false;
-                                if (!!userRecord) return [
+                                if (!userRecord) return [
                                     3,
-                                    5
+                                    2
+                                ];
+                                userRecordId = userRecord.uid;
+                                return [
+                                    3,
+                                    6
                                 ];
+                            case 2:
                                 return [
                                     4,
                                     this.createNewUser(input)
                                 ];
-                            case 2:
+                            case 3:
                                 createResult = _state.sent();
                                 // add the setup password to the user's credentials
                                 userContext = this.authService.userContext(createResult.user.uid);
@@ -1760,7 +1766,7 @@ function _ts_generator$g(thisArg, body) {
                                     4,
                                     this.addNewUserSetupClaims(userContext, createResult.password)
                                 ];
-                            case 3:
+                            case 4:
                                 _state.sent();
                                 createdUser = true;
                                 userRecordId = userContext.uid;
@@ -1768,14 +1774,8 @@ function _ts_generator$g(thisArg, body) {
                                     4,
                                     userContext.loadRecord()
                                 ];
-                            case 4:
-                                userRecord = _state.sent();
-                                return [
-                                    3,
-                                    6
-                                ];
                             case 5:
-                                userRecordId = userRecord.uid;
+                                userRecord = _state.sent();
                                 _state.label = 6;
                             case 6:
                                 if (!(createdUser && sendSetupContent === true || sendSetupContentIfUserExists)) return [
@@ -3609,10 +3609,10 @@ function _define_property$v(obj, key, value) {
         {
             key: "update",
             value: function update(data, params) {
-                if ((params === null || params === void 0 ? void 0 : params.precondition) != null) {
-                    this.batch.update(this.documentRef, data, params.precondition);
-                } else {
+                if ((params === null || params === void 0 ? void 0 : params.precondition) == null) {
                     this.batch.update(this.documentRef, data);
+                } else {
+                    this.batch.update(this.documentRef, data, params.precondition);
                 }
                 return Promise.resolve();
             }
@@ -7575,6 +7575,11 @@ function _ts_generator$9(thisArg, body) {
  * permission-denied / not-found errors surface a real message + code instead of the generic
  * `"Unknown error"` fallback the inline mapping used previously.
  *
+ * When no real message survives, the fallback is derived from the resolved error `code` so the two
+ * distinct outcomes stay distinguishable — a not-found read no longer reads as "permission denied"
+ * (and vice-versa). Only when neither a message nor a recognizable code is present does it fall back
+ * to a generic message.
+ *
  * @param entry - A failed-key entry from the underlying multi-read.
  * @returns A `{ key, message, code? }` triple safe to return to API/MCP callers.
  */ function modelAccessReadErrorFromUseMultipleModelsFailure(entry) {
@@ -7587,10 +7592,28 @@ function _ts_generator$9(thisArg, body) {
     var code = (_info_serverErrorCode = info.serverErrorCode) !== null && _info_serverErrorCode !== void 0 ? _info_serverErrorCode : info.firebaseErrorCode;
     return {
         key: entry.key,
-        message: (_ref = (_ref1 = serverMessage !== null && serverMessage !== void 0 ? serverMessage : httpsMessage) !== null && _ref1 !== void 0 ? _ref1 : plainMessage) !== null && _ref !== void 0 ? _ref : 'permission denied or not found',
+        message: (_ref = (_ref1 = serverMessage !== null && serverMessage !== void 0 ? serverMessage : httpsMessage) !== null && _ref1 !== void 0 ? _ref1 : plainMessage) !== null && _ref !== void 0 ? _ref : modelAccessReadErrorMessageFromCode(code),
         code: code
     };
 }
+/**
+ * Derives a fallback read-error message from a resolved error code, distinguishing not-found from
+ * permission-denied. Accepts both the server-error form (`NOT_FOUND` / `PERMISSION_DENIED` /
+ * `FORBIDDEN`) and the Firebase HttpsError form (`not-found` / `permission-denied`).
+ *
+ * @param code - The resolved error code (`serverErrorCode ?? firebaseErrorCode`), if any.
+ * @returns `'not found'`, `'permission denied'`, or a generic `'unknown error'` fallback.
+ */ function modelAccessReadErrorMessageFromCode(code) {
+    var message;
+    if (code === NOT_FOUND_ERROR_CODE || code === 'not-found') {
+        message = 'not found';
+    } else if (code === PERMISSION_DENIED_ERROR_CODE || code === FORBIDDEN_ERROR_CODE || code === 'permission-denied') {
+        message = 'permission denied';
+    } else {
+        message = 'unknown error';
+    }
+    return message;
+}
 // MARK: Service
 /**
  * Service for direct document reads using the `useModel()` permission-checking pattern.
@@ -9575,7 +9598,7 @@ function _object_spread_props$7(target, source) {
  *
  * @__NO_SIDE_EFFECTS__
  */ function makeBlockingFunctionWithHandler(blockingFunctionBuilder, handler, opts) {
-    var blockingFn = opts != null ? blockingFunctionBuilder(opts, handler) : blockingFunctionBuilder(handler);
+    var blockingFn = opts == null ? blockingFunctionBuilder(handler) : blockingFunctionBuilder(opts, handler);
     blockingFn.__handler = handler;
     return blockingFn;
 }
@@ -10242,7 +10265,7 @@ function _ts_generator$5(thisArg, body) {
  * @__NO_SIDE_EFFECTS__
  */ function firebaseServerActionsTransformFactory(options) {
     var logError = (options !== null && options !== void 0 ? options : {}).logError;
-    var logErrorFunction = logError !== false ? typeof logError === 'function' ? logError : defaultFirebaseServerActionsTransformFactoryLogErrorFunction : mapIdentityFunction;
+    var logErrorFunction = logError === false ? mapIdentityFunction : typeof logError === 'function' ? logError : defaultFirebaseServerActionsTransformFactoryLogErrorFunction;
     return transformAndValidateObjectFactory({
         handleValidationError: function handleValidationError(validationErrors) {
             return _async_to_generator$5(function() {
@@ -10554,15 +10577,11 @@ FirebaseAppCheckMiddleware = __decorate([
             switch(_state.label){
                 case 0:
                     appCheckToken = req.header('X-Firebase-AppCheck');
-                    if (!!appCheckToken) return [
-                        3,
-                        1
-                    ];
-                    error = new ForbiddenException();
-                    return [
+                    if (!appCheckToken) return [
                         3,
-                        4
+                        5
                     ];
+                    _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
@@ -10588,6 +10607,14 @@ FirebaseAppCheckMiddleware = __decorate([
                         4
                     ];
                 case 4:
+                    return [
+                        3,
+                        6
+                    ];
+                case 5:
+                    error = new ForbiddenException();
+                    _state.label = 6;
+                case 6:
                     return [
                         2,
                         error
@@ -11237,7 +11264,7 @@ function _ts_generator$2(thisArg, body) {
             contentEncoding: (_options_metadata3 = options.metadata) === null || _options_metadata3 === void 0 ? void 0 : _options_metadata3.contentEncoding,
             contentLanguage: (_options_metadata4 = options.metadata) === null || _options_metadata4 === void 0 ? void 0 : _options_metadata4.contentLanguage,
             contentType: (_options_metadata5 = options.metadata) === null || _options_metadata5 === void 0 ? void 0 : _options_metadata5.contentType,
-            metadata: !objectHasNoKeys(customMetadata) ? customMetadata : undefined
+            metadata: objectHasNoKeys(customMetadata) ? undefined : customMetadata
         });
     }
     function makeUploadOptions(options) {
@@ -11333,8 +11360,8 @@ function _ts_generator$2(thisArg, body) {
             return _async_to_generator$2(function() {
                 var _ref, _ref1, expires, config;
                 return _ts_generator$2(this, function(_state) {
-                    expires = (_ref = input === null || input === void 0 ? void 0 : input.expiresAt) !== null && _ref !== void 0 ? _ref : (input === null || input === void 0 ? void 0 : input.expiresIn) != null ? addMilliseconds(new Date(), input.expiresIn) // use expiresIn if provided
-                     : addHours(new Date(), 1); // default expiration in 1 hour
+                    expires = (_ref = input === null || input === void 0 ? void 0 : input.expiresAt) !== null && _ref !== void 0 ? _ref : (input === null || input === void 0 ? void 0 : input.expiresIn) == null ? addHours(new Date(), 1) // use expiresIn if provided
+                     : addMilliseconds(new Date(), input.expiresIn); // default expiration in 1 hour
                     config = _object_spread_props$3(_object_spread$3({}, input), {
                         action: (_ref1 = input === null || input === void 0 ? void 0 : input.action) !== null && _ref1 !== void 0 ? _ref1 : 'read',
                         expires: expires,
@@ -11500,9 +11527,9 @@ function _ts_generator$2(thisArg, body) {
             });
         },
         makePublic: function makePublic(setPublic) {
-            return (setPublic !== false ? file.acl.add(PUBLIC_ACL) : file.acl.delete({
+            return (setPublic === false ? file.acl.delete({
                 entity: PUBLIC_ACL.entity
-            })).then(function() {
+            }) : file.acl.add(PUBLIC_ACL)).then(function() {
                 return undefined;
             });
         },

package/mailgun/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@dereekb/firebase-server/mailgun",
-  "version": "13.15.0",
+  "version": "13.17.0",
   "peerDependencies": {
-    "@dereekb/analytics": "13.15.0",
-    "@dereekb/firebase": "13.15.0",
-    "@dereekb/firebase-server": "13.15.0",
-    "@dereekb/date": "13.15.0",
-    "@dereekb/nestjs": "13.15.0",
-    "@dereekb/model": "13.15.0",
-    "@dereekb/rxjs": "13.15.0",
-    "@dereekb/util": "13.15.0"
+    "@dereekb/analytics": "13.17.0",
+    "@dereekb/firebase": "13.17.0",
+    "@dereekb/firebase-server": "13.17.0",
+    "@dereekb/date": "13.17.0",
+    "@dereekb/nestjs": "13.17.0",
+    "@dereekb/model": "13.17.0",
+    "@dereekb/rxjs": "13.17.0",
+    "@dereekb/util": "13.17.0"
   },
   "exports": {
     "./package.json": "./package.json",