@naturalcycles/backend-lib 9.46.1 → 9.47.0

package/dist/admin/base.admin.service.d.ts

@@ -20,8 +20,8 @@ export interface AdminInfo {
  * Base implementation based on Firebase Auth tokens passed as 'admin_token' cookie.
  */
 export declare class BaseAdminService {
-    private firebaseAuth;
-    constructor(firebaseAuth: FirebaseAdmin.auth.Auth, cfg: AdminServiceCfg);
+    private loadFirebaseAuth;
+    constructor(loadFirebaseAuth: () => Promise<FirebaseAdmin.auth.Auth>, cfg: AdminServiceCfg);
     cfg: Required<AdminServiceCfg>;
     adminInfoDisabled(): AdminInfo;
     /**
@@ -37,6 +37,7 @@ export declare class BaseAdminService {
      */
     protected onPermissionCheck(req: BackendRequest, email: string, reqPermissions: string[], required: boolean, granted: boolean, meta?: Record<string, any>): Promise<void>;
     getEmailByToken(req: BackendRequest, adminToken?: string): Promise<string | undefined>;
+    private getFirebaseAuth;
     /**
      * Current implementation is based on req=Request (from Express).
      * Override if needed.

package/dist/admin/base.admin.service.js

@@ -1,3 +1,5 @@
+import { __decorate } from "tslib";
+import { _Memo } from '@naturalcycles/js-lib/decorators';
 import { _assert, AppError } from '@naturalcycles/js-lib/error';
 import { dimGrey, green, red } from '@naturalcycles/nodejs-lib/colors';
 const adminInfoDisabled = () => ({
@@ -8,9 +10,9 @@ const adminInfoDisabled = () => ({
  * Base implementation based on Firebase Auth tokens passed as 'admin_token' cookie.
  */
 export class BaseAdminService {
-    firebaseAuth;
-    constructor(firebaseAuth, cfg) {
-        this.firebaseAuth = firebaseAuth;
+    loadFirebaseAuth;
+    constructor(loadFirebaseAuth, cfg) {
+        this.loadFirebaseAuth = loadFirebaseAuth;
         this.cfg = {
             adminTokenKey: 'admin_token',
             authEnabled: true,
@@ -47,7 +49,8 @@ export class BaseAdminService {
         if (!adminToken)
             return;
         try {
-            const decodedToken = await this.firebaseAuth.verifyIdToken(adminToken);
+            const auth = await this.getFirebaseAuth();
+            const decodedToken = await auth.verifyIdToken(adminToken);
             const email = decodedToken?.email;
             req.log(`admin email: ${dimGrey(email)}`);
             return email;
@@ -63,6 +66,9 @@ export class BaseAdminService {
             req.error(`getEmailByToken error:`, err);
         }
     }
+    async getFirebaseAuth() {
+        return await this.loadFirebaseAuth();
+    }
     /**
      * Current implementation is based on req=Request (from Express).
      * Override if needed.
@@ -193,3 +199,6 @@ export class BaseAdminService {
         };
     }
 }
+__decorate([
+    _Memo()
+], BaseAdminService.prototype, "getFirebaseAuth", null);

package/dist/db/httpDBRequestHandler.js

@@ -1,22 +1,22 @@
 import { DBQuery } from '@naturalcycles/db-lib';
 import { InMemoryDB } from '@naturalcycles/db-lib/inmemory';
 import { commonDBOptionsSchema, commonDBSaveOptionsSchema, dbQuerySchema, } from '@naturalcycles/db-lib/validation';
-import { anyObjectSchema, arraySchema, objectSchema, stringSchema, } from '@naturalcycles/nodejs-lib/joi';
+import { j } from '@naturalcycles/nodejs-lib/ajv';
 import { getDefaultRouter } from '../express/getDefaultRouter.js';
-import { validateRequest } from '../validation/joi/joiValidateRequest.js';
-const getByIdsInputSchema = objectSchema({
-    table: stringSchema,
-    ids: arraySchema(stringSchema),
-    opt: commonDBOptionsSchema.optional(),
+import { ajvValidateRequest } from '../validation/ajv/ajvValidateRequest.js';
+const getByIdsInputSchema = j.object({
+    table: j.string(),
+    ids: j.array(j.string()),
+    opt: commonDBOptionsSchema().optional(),
 });
-const runQueryInputSchema = objectSchema({
-    query: dbQuerySchema,
-    opt: commonDBOptionsSchema.optional(),
+const runQueryInputSchema = j.object({
+    query: dbQuerySchema(),
+    opt: commonDBOptionsSchema().optional(),
 });
-const saveBatchInputSchema = objectSchema({
-    table: stringSchema,
-    rows: arraySchema(anyObjectSchema()),
-    opt: commonDBSaveOptionsSchema.optional(),
+const saveBatchInputSchema = j.object({
+    table: j.string(),
+    rows: j.array(j.object({ id: j.string() }).allowAdditionalProperties()),
+    opt: commonDBSaveOptionsSchema().optional(),
 });
 /**
  * Exposes CommonDB interface from provided CommonDB as HTTP endpoint (Express RequestHandler).
@@ -49,24 +49,24 @@ export function httpDBRequestHandler(db) {
     // })
     // getByIds
     router.put('/getByIds', async (req, res) => {
-        const { table, ids, opt } = validateRequest.body(req, getByIdsInputSchema);
+        const { table, ids, opt } = ajvValidateRequest.body(req, getByIdsInputSchema);
         res.json(await db.getByIds(table, ids, opt));
     });
     // runQuery
     router.put('/runQuery', async (req, res) => {
-        const { query, opt } = validateRequest.body(req, runQueryInputSchema);
+        const { query, opt } = ajvValidateRequest.body(req, runQueryInputSchema);
         const q = DBQuery.fromPlainObject(query);
         res.json(await db.runQuery(q, opt));
     });
     // runQueryCount
     router.put('/runQueryCount', async (req, res) => {
-        const { query, opt } = validateRequest.body(req, runQueryInputSchema);
+        const { query, opt } = ajvValidateRequest.body(req, runQueryInputSchema);
         const q = DBQuery.fromPlainObject(query);
         res.json(await db.runQueryCount(q, opt));
     });
     // saveBatch
     router.put('/saveBatch', async (req, res) => {
-        const { table, rows, opt } = validateRequest.body(req, saveBatchInputSchema);
+        const { table, rows, opt } = ajvValidateRequest.body(req, saveBatchInputSchema);
         await db.saveBatch(table, rows, opt);
         res.end();
     });
@@ -77,7 +77,7 @@ export function httpDBRequestHandler(db) {
     // })
     // deleteByQuery
     router.put('/deleteByQuery', async (req, res) => {
-        const { query, opt } = validateRequest.body(req, runQueryInputSchema);
+        const { query, opt } = ajvValidateRequest.body(req, runQueryInputSchema);
         const q = DBQuery.fromPlainObject(query);
         res.json(await db.deleteByQuery(q, opt));
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.46.1",
+  "version": "9.47.0",
   "peerDependencies": {
     "@sentry/node": "^10"
   },

package/src/admin/base.admin.service.ts

@@ -1,3 +1,4 @@
+import { _Memo } from '@naturalcycles/js-lib/decorators'
 import { _assert, AppError } from '@naturalcycles/js-lib/error'
 import { dimGrey, green, red } from '@naturalcycles/nodejs-lib/colors'
 import type FirebaseAdmin from 'firebase-admin'
@@ -32,7 +33,7 @@ const adminInfoDisabled = (): AdminInfo => ({
  */
 export class BaseAdminService {
   constructor(
-    private firebaseAuth: FirebaseAdmin.auth.Auth,
+    private loadFirebaseAuth: () => Promise<FirebaseAdmin.auth.Auth>,
     cfg: AdminServiceCfg,
   ) {
     this.cfg = {
@@ -91,7 +92,8 @@ export class BaseAdminService {
     if (!adminToken) return
 
     try {
-      const decodedToken = await this.firebaseAuth.verifyIdToken(adminToken)
+      const auth = await this.getFirebaseAuth()
+      const decodedToken = await auth.verifyIdToken(adminToken)
       const email = decodedToken?.email
       req.log(`admin email: ${dimGrey(email)}`)
       return email
@@ -109,6 +111,11 @@ export class BaseAdminService {
     }
   }
 
+  @_Memo()
+  private async getFirebaseAuth(): Promise<FirebaseAdmin.auth.Auth> {
+    return await this.loadFirebaseAuth()
+  }
+
   /**
    * Current implementation is based on req=Request (from Express).
    * Override if needed.

package/src/db/httpDBRequestHandler.ts

@@ -7,15 +7,10 @@ import {
   dbQuerySchema,
 } from '@naturalcycles/db-lib/validation'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
-import {
-  anyObjectSchema,
-  arraySchema,
-  objectSchema,
-  stringSchema,
-} from '@naturalcycles/nodejs-lib/joi'
+import { j } from '@naturalcycles/nodejs-lib/ajv'
 import { getDefaultRouter } from '../express/getDefaultRouter.js'
 import type { BackendRouter } from '../server/server.model.js'
-import { validateRequest } from '../validation/joi/joiValidateRequest.js'
+import { ajvValidateRequest } from '../validation/ajv/ajvValidateRequest.js'
 
 export interface GetByIdsInput {
   table: string
@@ -23,10 +18,10 @@ export interface GetByIdsInput {
   opt?: CommonDBOptions
 }
 
-const getByIdsInputSchema = objectSchema<GetByIdsInput>({
-  table: stringSchema,
-  ids: arraySchema(stringSchema),
-  opt: commonDBOptionsSchema.optional(),
+const getByIdsInputSchema = j.object<GetByIdsInput>({
+  table: j.string(),
+  ids: j.array(j.string()),
+  opt: commonDBOptionsSchema().optional(),
 })
 
 export interface RunQueryInput {
@@ -34,9 +29,9 @@ export interface RunQueryInput {
   opt?: CommonDBOptions
 }
 
-const runQueryInputSchema = objectSchema<RunQueryInput>({
-  query: dbQuerySchema,
-  opt: commonDBOptionsSchema.optional(),
+const runQueryInputSchema = j.object<RunQueryInput>({
+  query: dbQuerySchema(),
+  opt: commonDBOptionsSchema().optional(),
 })
 
 export interface SaveBatchInput {
@@ -45,10 +40,10 @@ export interface SaveBatchInput {
   opt?: CommonDBSaveOptions<any>
 }
 
-const saveBatchInputSchema = objectSchema<SaveBatchInput>({
-  table: stringSchema,
-  rows: arraySchema(anyObjectSchema()),
-  opt: commonDBSaveOptionsSchema.optional(),
+const saveBatchInputSchema = j.object<SaveBatchInput>({
+  table: j.string(),
+  rows: j.array(j.object<ObjectWithId>({ id: j.string() }).allowAdditionalProperties()),
+  opt: commonDBSaveOptionsSchema().optional(),
 })
 
 /**
@@ -88,27 +83,27 @@ export function httpDBRequestHandler(db: CommonDB): BackendRouter {
 
   // getByIds
   router.put('/getByIds', async (req, res) => {
-    const { table, ids, opt } = validateRequest.body(req, getByIdsInputSchema)
+    const { table, ids, opt } = ajvValidateRequest.body(req, getByIdsInputSchema)
     res.json(await db.getByIds(table, ids, opt))
   })
 
   // runQuery
   router.put('/runQuery', async (req, res) => {
-    const { query, opt } = validateRequest.body(req, runQueryInputSchema)
+    const { query, opt } = ajvValidateRequest.body(req, runQueryInputSchema)
     const q = DBQuery.fromPlainObject(query)
     res.json(await db.runQuery(q, opt))
   })
 
   // runQueryCount
   router.put('/runQueryCount', async (req, res) => {
-    const { query, opt } = validateRequest.body(req, runQueryInputSchema)
+    const { query, opt } = ajvValidateRequest.body(req, runQueryInputSchema)
     const q = DBQuery.fromPlainObject(query)
     res.json(await db.runQueryCount(q, opt))
   })
 
   // saveBatch
   router.put('/saveBatch', async (req, res) => {
-    const { table, rows, opt } = validateRequest.body(req, saveBatchInputSchema)
+    const { table, rows, opt } = ajvValidateRequest.body(req, saveBatchInputSchema)
     await db.saveBatch(table, rows, opt)
     res.end()
   })
@@ -121,7 +116,7 @@ export function httpDBRequestHandler(db: CommonDB): BackendRouter {
 
   // deleteByQuery
   router.put('/deleteByQuery', async (req, res) => {
-    const { query, opt } = validateRequest.body(req, runQueryInputSchema)
+    const { query, opt } = ajvValidateRequest.body(req, runQueryInputSchema)
     const q = DBQuery.fromPlainObject(query)
     res.json(await db.deleteByQuery(q, opt))
   })