@dereekb/firebase-server 10.1.30 → 11.0.0

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+# [11.0.0](https://github.com/dereekb/dbx-components/compare/v10.2.0-dev...v11.0.0) (2024-11-12)
+
+
+### Code Refactoring
+
+* revisited some todos ([4902b4b](https://github.com/dereekb/dbx-components/commit/4902b4bcffde7174c37b72d84fd4473e3b975769))
+
+
+### BREAKING CHANGES
+
+* all breaking changes are documented in VERSION_MIGRATION.md
+
+
+
+# [10.2.0](https://github.com/dereekb/dbx-components/compare/v10.1.30-dev...v10.2.0) (2024-11-07)
+
+
+
 ## [10.1.30](https://github.com/dereekb/dbx-components/compare/v10.1.29-dev...v10.1.30) (2024-10-23)
 
 

package/mailgun/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase-server/mailgun",
-  "version": "10.1.30",
+  "version": "11.0.0",
   "type": "commonjs",
   "main": "./src/index.js"
 }

package/mailgun/src/lib/auth.mailgun.js

@@ -1,32 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractMailgunContentFirebaseServerNewUserService = void 0;
-const tslib_1 = require("tslib");
 const firebase_server_1 = require("@dereekb/firebase-server");
 /**
  * Abstract FirebaseServerNewUserService implementation that sends an email to a template on Mailgun.
  */
 class AbstractMailgunContentFirebaseServerNewUserService extends firebase_server_1.AbstractFirebaseServerNewUserService {
+    mailgunService;
     constructor(authService, mailgunService) {
         super(authService);
         this.mailgunService = mailgunService;
     }
-    sendSetupContentToUser(user) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const userRecord = yield user.userContext.loadRecord();
-            const { setupPassword } = user.claims;
-            const { uid, displayName, email } = userRecord;
-            if (!email) {
-                throw new Error(`Email is not present/available for the user record "${userRecord.uid}"`);
-            }
-            const baseRequest = yield this.buildNewUserMailgunContentRequest(user);
-            const baseRequestTo = baseRequest.to;
-            yield this.mailgunService.sendTemplateEmail(Object.assign(Object.assign({}, baseRequest), { to: {
-                    name: baseRequestTo === null || baseRequestTo === void 0 ? void 0 : baseRequestTo.name,
-                    email,
-                    userVariables: Object.assign(Object.assign({ setupPassword }, baseRequestTo === null || baseRequestTo === void 0 ? void 0 : baseRequestTo.userVariables), { displayName,
-                        uid })
-                }, sendTestEmails: baseRequest.sendTestEmails || user.sendDetailsInTestEnvironment || undefined }));
+    async sendSetupContentToUser(user) {
+        const userRecord = await user.userContext.loadRecord();
+        const { setupPassword } = user.claims;
+        const { uid, displayName, email } = userRecord;
+        if (!email) {
+            throw new Error(`Email is not present/available for the user record "${userRecord.uid}"`);
+        }
+        const baseRequest = await this.buildNewUserMailgunContentRequest(user);
+        const baseRequestTo = baseRequest.to;
+        await this.mailgunService.sendTemplateEmail({
+            ...baseRequest,
+            to: {
+                name: baseRequestTo?.name,
+                email,
+                userVariables: {
+                    setupPassword,
+                    ...baseRequestTo?.userVariables,
+                    displayName,
+                    uid
+                }
+            },
+            sendTestEmails: baseRequest.sendTestEmails || user.sendDetailsInTestEnvironment || undefined
         });
     }
 }

package/mailgun/src/lib/auth.mailgun.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.mailgun.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/mailgun/src/lib/auth.mailgun.ts"],"names":[],"mappings":";;;;AACA,8DAAgO;AAWhO;;GAEG;AACH,MAAsB,kDAA0N,SAAQ,sDAA6C;IACnS,YAAY,WAA4C,EAAW,cAA8B;QAC/F,KAAK,CAAC,WAAW,CAAC,CAAC;QAD8C,mBAAc,GAAd,cAAc,CAAgB;IAEjG,CAAC;IAEe,sBAAsB,CAAC,IAAiD;;YACtF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;YACvD,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YACtC,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;YAE/C,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,uDAAuD,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC;aAC3F;YAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC;YACvE,MAAM,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;YAErC,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,iCACtC,WAAW,KACd,EAAE,EAAE;oBACF,IAAI,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI;oBACzB,KAAK;oBACL,aAAa,gCACX,aAAa,IACV,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,aAAa,KAC/B,WAAW;wBACX,GAAG,GACJ;iBACF,EACD,cAAc,EAAE,WAAW,CAAC,cAAc,IAAI,IAAI,CAAC,4BAA4B,IAAI,SAAS,IAC5F,CAAC;QACL,CAAC;KAAA;CAGF;AAlCD,gHAkCC"}
+{"version":3,"file":"auth.mailgun.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/mailgun/src/lib/auth.mailgun.ts"],"names":[],"mappings":";;;AACA,8DAAgO;AAWhO;;GAEG;AACH,MAAsB,kDAA0N,SAAQ,sDAA6C;IAChO;IAAnE,YAAY,WAA4C,EAAW,cAA8B;QAC/F,KAAK,CAAC,WAAW,CAAC,CAAC;QAD8C,mBAAc,GAAd,cAAc,CAAgB;IAEjG,CAAC;IAES,KAAK,CAAC,sBAAsB,CAAC,IAAiD;QACtF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACvD,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACtC,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;QAE/C,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,uDAAuD,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC;SAC3F;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;QAErC,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC;YAC1C,GAAG,WAAW;YACd,EAAE,EAAE;gBACF,IAAI,EAAE,aAAa,EAAE,IAAI;gBACzB,KAAK;gBACL,aAAa,EAAE;oBACb,aAAa;oBACb,GAAG,aAAa,EAAE,aAAa;oBAC/B,WAAW;oBACX,GAAG;iBACJ;aACF;YACD,cAAc,EAAE,WAAW,CAAC,cAAc,IAAI,IAAI,CAAC,4BAA4B,IAAI,SAAS;SAC7F,CAAC,CAAC;IACL,CAAC;CAGF;AAlCD,gHAkCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase-server",
-  "version": "10.1.30",
+  "version": "11.0.0",
   "exports": {
     ".": {
       "types": "./src/index.d.ts",
@@ -19,6 +19,12 @@
       "main": "./mailgun/src/index.js",
       "require": "./mailgun/src/index.js",
       "default": "./mailgun/src/index.js"
+    },
+    "./zoho": {
+      "types": "./zoho/src/index.d.ts",
+      "main": "./zoho/src/index.js",
+      "require": "./zoho/src/index.js",
+      "default": "./zoho/src/index.js"
     }
   },
   "main": "./src/index.js",

package/src/lib/auth/auth.service.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractFirebaseServerAuthService = exports.FirebaseServerAuthService = exports.NoSetupContentFirebaseServerNewUserService = exports.AbstractFirebaseServerNewUserService = exports.userContextFromUid = exports.DEFAULT_SETUP_COM_THROTTLE_TIME = exports.AbstractFirebaseServerAuthContext = exports.AbstractFirebaseServerAuthUserContext = exports.DEFAULT_FIREBASE_PASSWORD_NUMBER_GENERATOR = void 0;
-const tslib_1 = require("tslib");
 const firebase_1 = require("@dereekb/firebase");
 const util_1 = require("@dereekb/util");
 const context_1 = require("../function/context");
@@ -10,15 +9,15 @@ const date_1 = require("@dereekb/date");
 const auth_util_1 = require("./auth.util");
 exports.DEFAULT_FIREBASE_PASSWORD_NUMBER_GENERATOR = (0, util_1.randomNumberFactory)({ min: 100000, max: 1000000, round: 'floor' }); // 6 digits
 class AbstractFirebaseServerAuthUserContext {
+    service;
+    uid;
+    _loadRecord = (0, util_1.cachedGetter)(() => this.service.auth.getUser(this.uid));
     constructor(service, uid) {
         this.service = service;
         this.uid = uid;
-        this._loadRecord = (0, util_1.cachedGetter)(() => this.service.auth.getUser(this.uid));
     }
-    exists() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return (0, auth_util_1.getAuthUserOrUndefined)(this._loadRecord()).then((x) => Boolean(x));
-        });
+    async exists() {
+        return (0, auth_util_1.getAuthUserOrUndefined)(this._loadRecord()).then((x) => Boolean(x));
     }
     loadRecord() {
         return this._loadRecord();
@@ -29,74 +28,60 @@ class AbstractFirebaseServerAuthUserContext {
     _generateResetPasswordKey() {
         return String((0, exports.DEFAULT_FIREBASE_PASSWORD_NUMBER_GENERATOR)());
     }
-    beginResetPassword() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const password = this._generateResetPasswordKey();
-            const passwordClaimsData = {
-                [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_RESET_PASSWORD_KEY]: password,
-                [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_RESET_LAST_COM_DATE_KEY]: (0, date_1.toISODateString)(new Date())
-            };
-            // set the claims
-            yield this.updateClaims(passwordClaimsData);
-            // update the user
-            yield this.updateUser({ password });
-            return passwordClaimsData;
-        });
-    }
-    loadResetPasswordClaims() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const claims = yield this.loadClaims();
-            if (claims.resetPassword != null) {
-                return claims;
-            }
-            else {
-                return undefined;
-            }
-        });
+    async beginResetPassword() {
+        const password = this._generateResetPasswordKey();
+        const passwordClaimsData = {
+            [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_RESET_PASSWORD_KEY]: password,
+            [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_RESET_LAST_COM_DATE_KEY]: (0, date_1.toISODateString)(new Date())
+        };
+        // set the claims
+        await this.updateClaims(passwordClaimsData);
+        // update the user
+        await this.updateUser({ password });
+        return passwordClaimsData;
+    }
+    async loadResetPasswordClaims() {
+        const claims = await this.loadClaims();
+        if (claims.resetPassword != null) {
+            return claims;
+        }
+        else {
+            return undefined;
+        }
     }
     /**
      * Sets the user's password.
      */
-    setPassword(password) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const record = yield this.updateUser({ password });
-            // clear password reset claims
-            yield this.updateClaims({
-                [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_RESET_PASSWORD_KEY]: null,
-                [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_RESET_LAST_COM_DATE_KEY]: null
-            });
-            return record;
-        });
-    }
-    updateUser(template) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.service.auth.updateUser(this.uid, template);
-        });
-    }
-    loadRoles() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const claims = yield this.loadClaims();
-            return this.service.readRoles(claims);
-        });
-    }
-    addRoles(roles) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const claims = this._claimsForRolesChange(roles);
-            return this.updateClaims(claims);
+    async setPassword(password) {
+        const record = await this.updateUser({ password });
+        // clear password reset claims
+        await this.updateClaims({
+            [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_RESET_PASSWORD_KEY]: null,
+            [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_RESET_LAST_COM_DATE_KEY]: null
         });
-    }
-    removeRoles(roles) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const baseClaims = this._claimsForRolesChange(roles);
-            const claims = {};
-            (0, util_1.forEachKeyValue)(baseClaims, {
-                forEach: ([key]) => {
-                    claims[key] = null; // set null on every key
-                },
-                filter: util_1.KeyValueTypleValueFilter.NONE // don't skip any key/value
-            });
-            return this.updateClaims(claims);
+        return record;
+    }
+    async updateUser(template) {
+        return this.service.auth.updateUser(this.uid, template);
+    }
+    async loadRoles() {
+        const claims = await this.loadClaims();
+        return this.service.readRoles(claims);
+    }
+    async addRoles(roles) {
+        const claims = this._claimsForRolesChange(roles);
+        return this.updateClaims(claims);
+    }
+    async removeRoles(roles) {
+        const baseClaims = this._claimsForRolesChange(roles);
+        const claims = {};
+        (0, util_1.forEachKeyValue)(baseClaims, {
+            forEach: ([key]) => {
+                claims[key] = null; // set null on every key
+            },
+            filter: util_1.KeyValueTypleValueFilter.NONE // don't skip any key/value
         });
+        return this.updateClaims(claims);
     }
     /**
      * Sets the claims using the input roles and roles set.
@@ -109,32 +94,34 @@ class AbstractFirebaseServerAuthUserContext {
      * @param claimsToRetain
      * @returns
      */
-    setRoles(roles, claimsToRetain) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const claims = Object.assign(Object.assign({}, claimsToRetain), this._claimsForRolesChange(Array.from(roles)));
-            return this.setClaims(claims);
-        });
+    async setRoles(roles, claimsToRetain) {
+        const claims = {
+            ...claimsToRetain,
+            ...this._claimsForRolesChange(Array.from(roles))
+        };
+        return this.setClaims(claims);
     }
     _claimsForRolesChange(roles) {
         // filter null/undefined since the claims will contain null values for claims that are not related.
         return (0, util_1.filterNullAndUndefinedValues)(this.service.claimsForRoles((0, util_1.asSet)(roles)));
     }
     loadClaims() {
-        return this.loadRecord().then((x) => { var _a; return ((_a = x.customClaims) !== null && _a !== void 0 ? _a : {}); });
-    }
-    updateClaims(claims) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const currentClaims = yield this.loadClaims();
-            let newClaims;
-            if (currentClaims) {
-                newClaims = Object.assign(Object.assign({}, currentClaims), (0, util_1.filterUndefinedValues)(claims, false));
-                newClaims = (0, util_1.filterNullAndUndefinedValues)(newClaims);
-            }
-            else {
-                newClaims = claims;
-            }
-            return this.setClaims(newClaims);
-        });
+        return this.loadRecord().then((x) => (x.customClaims ?? {}));
+    }
+    async updateClaims(claims) {
+        const currentClaims = await this.loadClaims();
+        let newClaims;
+        if (currentClaims) {
+            newClaims = {
+                ...currentClaims,
+                ...(0, util_1.filterUndefinedValues)(claims, false)
+            };
+            newClaims = (0, util_1.filterNullAndUndefinedValues)(newClaims);
+        }
+        else {
+            newClaims = claims;
+        }
+        return this.setClaims(newClaims);
     }
     clearClaims() {
         return this.setClaims(null);
@@ -147,13 +134,15 @@ class AbstractFirebaseServerAuthUserContext {
 }
 exports.AbstractFirebaseServerAuthUserContext = AbstractFirebaseServerAuthUserContext;
 class AbstractFirebaseServerAuthContext {
+    service;
+    context;
+    _authRoles = (0, util_1.cachedGetter)(() => this.service.readRoles(this.claims));
+    _isAdmin = (0, util_1.cachedGetter)(() => this.service.isAdminInRoles(this._authRoles()));
+    _hasSignedTos = (0, util_1.cachedGetter)(() => this.service.hasSignedTosInRoles(this._authRoles()));
+    _userContext = (0, util_1.cachedGetter)(() => this.service.userContext(this.context.auth.uid));
     constructor(service, context) {
         this.service = service;
         this.context = context;
-        this._authRoles = (0, util_1.cachedGetter)(() => this.service.readRoles(this.claims));
-        this._isAdmin = (0, util_1.cachedGetter)(() => this.service.isAdminInRoles(this._authRoles()));
-        this._hasSignedTos = (0, util_1.cachedGetter)(() => this.service.hasSignedTosInRoles(this._authRoles()));
-        this._userContext = (0, util_1.cachedGetter)(() => this.service.userContext(this.context.auth.uid));
     }
     get userContext() {
         return this._userContext();
@@ -189,112 +178,101 @@ function userContextFromUid(authService, userContextOrUid) {
 }
 exports.userContextFromUid = userContextFromUid;
 class AbstractFirebaseServerNewUserService {
+    authService;
+    setupThrottleTime = exports.DEFAULT_SETUP_COM_THROTTLE_TIME;
     constructor(authService) {
         this.authService = authService;
-        this.setupThrottleTime = exports.DEFAULT_SETUP_COM_THROTTLE_TIME;
-    }
-    initializeNewUser(input) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const { uid, email, phone, sendSetupContent, sendSetupContentIfUserExists, data, sendDetailsInTestEnvironment } = input;
-            let userRecordPromise;
-            if (uid) {
-                userRecordPromise = this.authService.auth.getUser(uid);
-            }
-            else if (email) {
-                userRecordPromise = this.authService.auth.getUserByEmail(email);
-            }
-            else if (phone) {
-                userRecordPromise = this.authService.auth.getUserByPhoneNumber(phone);
-            }
-            else {
-                throw new Error('email or phone is required to initialize a new user.');
-            }
-            let userRecord = yield (0, auth_util_1.getAuthUserOrUndefined)(userRecordPromise);
-            let userRecordId;
-            let createdUser = false;
-            if (!userRecord) {
-                const createResult = yield this.createNewUser(input);
-                // add the setup password to the user's credentials
-                const userContext = this.authService.userContext(createResult.user.uid);
-                yield this.addNewUserSetupClaims(userContext, createResult.password);
-                createdUser = true;
-                userRecordId = userContext.uid;
-                userRecord = yield userContext.loadRecord();
-            }
-            else {
-                userRecordId = userRecord.uid;
-            }
-            // send content if necessary
-            if ((createdUser && sendSetupContent === true) || sendSetupContentIfUserExists) {
-                const sentEmail = yield this.sendSetupContent(userRecordId, { data, sendDetailsInTestEnvironment });
-                // reload the user record
-                if (sentEmail) {
-                    const userContext = this.authService.userContext(userRecordId);
-                    userRecord = yield userContext.loadRecord();
-                }
-            }
-            return userRecord;
-        });
     }
-    addNewUserSetupClaims(userContextOrUid, setupPassword) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const password = setupPassword !== null && setupPassword !== void 0 ? setupPassword : this.generateRandomSetupPassword();
-            const userContext = userContextFromUid(this.authService, userContextOrUid);
-            yield userContext.updateClaims({
-                [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_SETUP_PASSWORD_KEY]: password
-            });
-            return userContext;
-        });
-    }
-    sendSetupContent(userContextOrUid, config) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const setupDetails = yield this.loadSetupDetails(userContextOrUid, config);
-            let sentContent = false;
-            if (setupDetails) {
-                const { setupCommunicationAt } = setupDetails.claims;
-                if (!setupCommunicationAt || (0, date_1.timeHasExpired)(new Date(setupCommunicationAt), this.setupThrottleTime)) {
-                    yield this.sendSetupContentToUser(setupDetails);
-                    yield this.updateSetupContentSentTime(setupDetails);
-                    sentContent = true;
-                }
+    async initializeNewUser(input) {
+        const { uid, email, phone, sendSetupContent, sendSetupContentIfUserExists, data, sendDetailsInTestEnvironment } = input;
+        let userRecordPromise;
+        if (uid) {
+            userRecordPromise = this.authService.auth.getUser(uid);
+        }
+        else if (email) {
+            userRecordPromise = this.authService.auth.getUserByEmail(email);
+        }
+        else if (phone) {
+            userRecordPromise = this.authService.auth.getUserByPhoneNumber(phone);
+        }
+        else {
+            throw new Error('email or phone is required to initialize a new user.');
+        }
+        let userRecord = await (0, auth_util_1.getAuthUserOrUndefined)(userRecordPromise);
+        let userRecordId;
+        let createdUser = false;
+        if (!userRecord) {
+            const createResult = await this.createNewUser(input);
+            // add the setup password to the user's credentials
+            const userContext = this.authService.userContext(createResult.user.uid);
+            await this.addNewUserSetupClaims(userContext, createResult.password);
+            createdUser = true;
+            userRecordId = userContext.uid;
+            userRecord = await userContext.loadRecord();
+        }
+        else {
+            userRecordId = userRecord.uid;
+        }
+        // send content if necessary
+        if ((createdUser && sendSetupContent === true) || sendSetupContentIfUserExists) {
+            const sentEmail = await this.sendSetupContent(userRecordId, { data, sendDetailsInTestEnvironment });
+            // reload the user record
+            if (sentEmail) {
+                const userContext = this.authService.userContext(userRecordId);
+                userRecord = await userContext.loadRecord();
             }
-            return sentContent;
-        });
+        }
+        return userRecord;
     }
-    loadSetupDetails(userContextOrUid, config) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const userContext = userContextFromUid(this.authService, userContextOrUid);
-            const userExists = yield userContext.exists();
-            let details;
-            if (userExists) {
-                details = yield this.loadSetupDetailsForUserContext(userContext, config);
-            }
-            return details;
+    async addNewUserSetupClaims(userContextOrUid, setupPassword) {
+        const password = setupPassword ?? this.generateRandomSetupPassword();
+        const userContext = userContextFromUid(this.authService, userContextOrUid);
+        await userContext.updateClaims({
+            [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_SETUP_PASSWORD_KEY]: password
         });
-    }
-    loadSetupDetailsForUserContext(userContext, config) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let details;
-            const { setupPassword, setupCommunicationAt } = yield userContext.loadClaims();
-            if (setupPassword) {
-                details = {
-                    userContext,
-                    claims: {
-                        setupPassword,
-                        setupCommunicationAt
-                    },
-                    data: config === null || config === void 0 ? void 0 : config.data,
-                    sendDetailsInTestEnvironment: config === null || config === void 0 ? void 0 : config.sendDetailsInTestEnvironment
-                };
+        return userContext;
+    }
+    async sendSetupContent(userContextOrUid, config) {
+        const setupDetails = await this.loadSetupDetails(userContextOrUid, config);
+        let sentContent = false;
+        if (setupDetails) {
+            const { setupCommunicationAt } = setupDetails.claims;
+            if (!setupCommunicationAt || (0, date_1.timeHasExpired)(new Date(setupCommunicationAt), this.setupThrottleTime)) {
+                await this.sendSetupContentToUser(setupDetails);
+                await this.updateSetupContentSentTime(setupDetails);
+                sentContent = true;
             }
-            return details;
-        });
+        }
+        return sentContent;
+    }
+    async loadSetupDetails(userContextOrUid, config) {
+        const userContext = userContextFromUid(this.authService, userContextOrUid);
+        const userExists = await userContext.exists();
+        let details;
+        if (userExists) {
+            details = await this.loadSetupDetailsForUserContext(userContext, config);
+        }
+        return details;
+    }
+    async loadSetupDetailsForUserContext(userContext, config) {
+        let details;
+        const { setupPassword, setupCommunicationAt } = await userContext.loadClaims();
+        if (setupPassword) {
+            details = {
+                userContext,
+                claims: {
+                    setupPassword,
+                    setupCommunicationAt
+                },
+                data: config?.data,
+                sendDetailsInTestEnvironment: config?.sendDetailsInTestEnvironment
+            };
+        }
+        return details;
     }
-    updateSetupContentSentTime(details) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield details.userContext.updateClaims({
-                setupCommunicationAt: (0, date_1.toISODateString)(new Date())
-            });
+    async updateSetupContentSentTime(details) {
+        await details.userContext.updateClaims({
+            setupCommunicationAt: (0, date_1.toISODateString)(new Date())
         });
     }
     /**
@@ -304,51 +282,43 @@ class AbstractFirebaseServerNewUserService {
      *
      * @param uid
      */
-    markUserSetupAsComplete(uid) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const userContext = this.authService.userContext(uid);
-            const userExists = yield userContext.exists();
-            if (userExists) {
-                yield this.updateClaimsToClearUser(userContext);
-            }
-            return userExists;
-        });
-    }
-    createNewUser(input) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const { uid, displayName, email, phone: phoneNumber, setupPassword: inputPassword } = input;
-            const password = inputPassword !== null && inputPassword !== void 0 ? inputPassword : this.generateRandomSetupPassword();
-            const user = yield this.authService.auth.createUser({
-                uid,
-                displayName,
-                email,
-                phoneNumber,
-                password
-            });
-            return {
-                user,
-                password
-            };
+    async markUserSetupAsComplete(uid) {
+        const userContext = this.authService.userContext(uid);
+        const userExists = await userContext.exists();
+        if (userExists) {
+            await this.updateClaimsToClearUser(userContext);
+        }
+        return userExists;
+    }
+    async createNewUser(input) {
+        const { uid, displayName, email, phone: phoneNumber, setupPassword: inputPassword } = input;
+        const password = inputPassword ?? this.generateRandomSetupPassword();
+        const user = await this.authService.auth.createUser({
+            uid,
+            displayName,
+            email,
+            phoneNumber,
+            password
         });
+        return {
+            user,
+            password
+        };
     }
     generateRandomSetupPassword() {
         return `${(0, exports.DEFAULT_FIREBASE_PASSWORD_NUMBER_GENERATOR)()}`;
     }
-    updateClaimsToClearUser(userContext) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield userContext.updateClaims({
-                [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_SETUP_PASSWORD_KEY]: null,
-                [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_SETUP_LAST_COM_DATE_KEY]: null
-            });
+    async updateClaimsToClearUser(userContext) {
+        await userContext.updateClaims({
+            [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_SETUP_PASSWORD_KEY]: null,
+            [firebase_1.FIREBASE_SERVER_AUTH_CLAIMS_SETUP_LAST_COM_DATE_KEY]: null
         });
     }
 }
 exports.AbstractFirebaseServerNewUserService = AbstractFirebaseServerNewUserService;
 class NoSetupContentFirebaseServerNewUserService extends AbstractFirebaseServerNewUserService {
-    sendSetupContentToUser(user) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            // send nothing.
-        });
+    async sendSetupContentToUser(user) {
+        // send nothing.
     }
 }
 exports.NoSetupContentFirebaseServerNewUserService = NoSetupContentFirebaseServerNewUserService;
@@ -362,6 +332,7 @@ exports.FirebaseServerAuthService = FirebaseServerAuthService;
  * Abstract FirebaseServerAuthService implementation.
  */
 class AbstractFirebaseServerAuthService {
+    auth;
     constructor(auth) {
         this.auth = auth;
     }