@naturalcycles/backend-lib 9.60.0 → 9.61.0

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

@@ -1,4 +1,4 @@
-import type FirebaseAdmin from 'firebase-admin';
+import type { Auth } from 'firebase-admin/auth';
 import type { BackendRequest, BackendRequestHandler } from '../server/server.model.js';
 export interface AdminServiceCfg {
     /**
@@ -21,7 +21,7 @@ export interface AdminInfo {
  */
 export declare class BaseAdminService {
     private loadFirebaseAuth;
-    constructor(loadFirebaseAuth: () => Promise<FirebaseAdmin.auth.Auth>, cfg: AdminServiceCfg);
+    constructor(loadFirebaseAuth: () => Promise<Auth>, cfg: AdminServiceCfg);
     cfg: Required<AdminServiceCfg>;
     adminInfoDisabled(): AdminInfo;
     /**

package/dist/admin/firebase.shared.service.d.ts

@@ -1,5 +1,5 @@
-import type { AppOptions, ServiceAccount } from 'firebase-admin';
-import type FirebaseAdmin from 'firebase-admin';
+import type { App, AppOptions, ServiceAccount } from 'firebase-admin/app';
+import type { Auth } from 'firebase-admin/auth';
 export interface FirebaseSharedServiceCfg {
     /**
      * If undefined - will try to use credential.applicationDefault()
@@ -32,6 +32,6 @@ export declare class FirebaseSharedService {
     cfg: FirebaseSharedServiceCfg;
     constructor(cfg: FirebaseSharedServiceCfg);
     init(): Promise<void>;
-    admin(): Promise<FirebaseAdmin.app.App>;
-    auth(): Promise<FirebaseAdmin.auth.Auth>;
+    admin(): Promise<App>;
+    auth(): Promise<Auth>;
 }

package/dist/admin/firebase.shared.service.js

@@ -11,18 +11,17 @@ export class FirebaseSharedService {
     async admin() {
         const { serviceAccount } = this.cfg;
         // lazy loading
-        const { default: admin } = await import('firebase-admin');
-        const credential = serviceAccount
-            ? admin.credential.cert(serviceAccount)
-            : admin.credential.applicationDefault();
-        return admin.initializeApp({
+        const { initializeApp, cert, applicationDefault } = await import('firebase-admin/app');
+        const credential = serviceAccount ? cert(serviceAccount) : applicationDefault();
+        return initializeApp({
             credential,
             ...this.cfg.opt,
         }, this.cfg.appName);
     }
     async auth() {
-        const admin = await this.admin();
-        return admin.auth();
+        const app = await this.admin();
+        const { getAuth } = await import('firebase-admin/auth');
+        return getAuth(app);
     }
 }
 __decorate([

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.60.0",
+  "version": "9.61.0",
   "dependencies": {
     "@naturalcycles/db-lib": "^10",
     "@naturalcycles/js-lib": "^15",
@@ -27,7 +27,7 @@
   },
   "peerDependencies": {
     "@sentry/node-core": "^10",
-    "firebase-admin": "^13",
+    "firebase-admin": "^14",
     "simple-git": "^3"
   },
   "peerDependenciesMeta": {
@@ -45,7 +45,7 @@
     "@sentry/node-core": "^10",
     "@typescript/native-preview": "beta",
     "fastify": "^5",
-    "@naturalcycles/dev-lib": "20.48.0"
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
     ".": "./dist/index.js",

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

@@ -1,7 +1,7 @@
 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'
+import type { Auth } from 'firebase-admin/auth'
 import type { BackendRequest, BackendRequestHandler } from '../server/server.model.js'
 
 export interface AdminServiceCfg {
@@ -33,7 +33,7 @@ const adminInfoDisabled = (): AdminInfo => ({
  */
 export class BaseAdminService {
   constructor(
-    private loadFirebaseAuth: () => Promise<FirebaseAdmin.auth.Auth>,
+    private loadFirebaseAuth: () => Promise<Auth>,
     cfg: AdminServiceCfg,
   ) {
     this.cfg = {
@@ -112,7 +112,7 @@ export class BaseAdminService {
   }
 
   @_Memo()
-  private async getFirebaseAuth(): Promise<FirebaseAdmin.auth.Auth> {
+  private async getFirebaseAuth(): Promise<Auth> {
     return await this.loadFirebaseAuth()
   }
 

package/src/admin/firebase.shared.service.ts

@@ -1,6 +1,6 @@
 import { _Memo } from '@naturalcycles/js-lib/decorators/memo.decorator.js'
-import type { AppOptions, ServiceAccount } from 'firebase-admin'
-import type FirebaseAdmin from 'firebase-admin'
+import type { App, AppOptions, ServiceAccount } from 'firebase-admin/app'
+import type { Auth } from 'firebase-admin/auth'
 
 export interface FirebaseSharedServiceCfg {
   /**
@@ -44,17 +44,15 @@ export class FirebaseSharedService {
   }
 
   @_Memo()
-  async admin(): Promise<FirebaseAdmin.app.App> {
+  async admin(): Promise<App> {
     const { serviceAccount } = this.cfg
 
     // lazy loading
-    const { default: admin } = await import('firebase-admin')
+    const { initializeApp, cert, applicationDefault } = await import('firebase-admin/app')
 
-    const credential = serviceAccount
-      ? admin.credential.cert(serviceAccount)
-      : admin.credential.applicationDefault()
+    const credential = serviceAccount ? cert(serviceAccount) : applicationDefault()
 
-    return admin.initializeApp(
+    return initializeApp(
       {
         credential,
         ...this.cfg.opt,
@@ -63,8 +61,9 @@ export class FirebaseSharedService {
     )
   }
 
-  async auth(): Promise<FirebaseAdmin.auth.Auth> {
-    const admin = await this.admin()
-    return admin.auth()
+  async auth(): Promise<Auth> {
+    const app = await this.admin()
+    const { getAuth } = await import('firebase-admin/auth')
+    return getAuth(app)
   }
 }