@flowerforce/flowerbase 1.7.4-beta.0 → 1.7.4-beta.3

package/dist/auth/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/auth/controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAQzC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,eAAe,iBA2KxD"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/auth/controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AASzC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,eAAe,iBAsLxD"}

package/dist/auth/controller.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.authController = authController;
 const bson_1 = require("bson");
 const constants_1 = require("../constants");
+const state_1 = require("../state");
 const crypto_1 = require("../utils/crypto");
 const utils_1 = require("./utils");
 const HANDLER_TYPE = 'preHandler';
@@ -53,20 +54,29 @@ function authController(app) {
             }
         }, function (req) {
             return __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
                 if (req.user.typ !== 'access') {
                     throw new Error('Access token required');
                 }
-                const user = yield db
+                const authUser = yield db
                     .collection(authCollection)
                     .findOne({ _id: bson_1.ObjectId.createFromHexString(req.user.id) });
+                const customData = userCollection && constants_1.AUTH_CONFIG.user_id_field
+                    ? yield db
+                        .collection(userCollection)
+                        .findOne({ [constants_1.AUTH_CONFIG.user_id_field]: req.user.id })
+                    : null;
+                const params = req.params;
+                const stateProjectId = state_1.StateManager.select('projectId');
+                const domainId = (_b = (_a = params === null || params === void 0 ? void 0 : params.appId) !== null && _a !== void 0 ? _a : stateProjectId) !== null && _b !== void 0 ? _b : '';
                 return {
-                    _id: user === null || user === void 0 ? void 0 : user._id.toString(),
-                    identities: user === null || user === void 0 ? void 0 : user.identities,
+                    user_id: req.user.id,
+                    domain_id: domainId,
+                    identities: authUser === null || authUser === void 0 ? void 0 : authUser.identities,
+                    custom_data: customData !== null && customData !== void 0 ? customData : {},
                     type: 'normal',
-                    custom_data: user === null || user === void 0 ? void 0 : user.curstom_data,
                     data: {
-                        _id: user === null || user === void 0 ? void 0 : user._id.toString(),
-                        email: user === null || user === void 0 ? void 0 : user.email
+                        email: authUser === null || authUser === void 0 ? void 0 : authUser.email
                     }
                 };
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.7.4-beta.0",
+  "version": "1.7.4-beta.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/auth/__tests__/controller.test.ts

@@ -48,4 +48,68 @@ describe('authController', () => {
       { unique: true }
     )
   })
+
+  it('returns Realm-like profile payload with linked custom_data', async () => {
+    const authUserId = '697349de5dc2c5850198cc06'
+    let profileHandler: ((req: any) => Promise<unknown>) | undefined
+    const authCollection = {
+      createIndex: jest.fn().mockResolvedValue('ok'),
+      findOne: jest.fn().mockResolvedValue({
+        _id: { toString: () => authUserId },
+        email: 'jessica.lussu@stackhouse.it',
+        identities: [{ provider_type: 'local-userpass' }]
+      })
+    }
+    const usersCollection = {
+      findOne: jest.fn().mockResolvedValue({
+        _id: '6075cb8840ceb66546e9aaeb',
+        userId: authUserId,
+        name: 'Jessica Lussu'
+      })
+    }
+    const refreshCollection = {
+      createIndex: jest.fn().mockResolvedValue('ok')
+    }
+    const db = {
+      collection: jest.fn((name: string) => {
+        if (name === 'auth_users') return authCollection
+        if (name === 'users') return usersCollection
+        if (name === 'refresh_tokens') return refreshCollection
+        return { createIndex: jest.fn().mockResolvedValue('ok') }
+      })
+    }
+    const app = {
+      mongo: { client: { db: jest.fn().mockReturnValue(db) } },
+      addHook: jest.fn(),
+      get: jest.fn((path: string, _opts: unknown, handler: (req: any) => Promise<unknown>) => {
+        if (path === '/profile') {
+          profileHandler = handler
+        }
+      }),
+      post: jest.fn(),
+      delete: jest.fn(),
+      jwtAuthentication: jest.fn()
+    }
+
+    await authController(app as unknown as never)
+    const result = await profileHandler?.({
+      user: { typ: 'access', id: authUserId },
+      params: { appId: 'flowerbase-e2e' }
+    })
+
+    expect(result).toEqual({
+      user_id: authUserId,
+      domain_id: 'flowerbase-e2e',
+      identities: [{ provider_type: 'local-userpass' }],
+      custom_data: {
+        _id: '6075cb8840ceb66546e9aaeb',
+        userId: authUserId,
+        name: 'Jessica Lussu'
+      },
+      type: 'normal',
+      data: {
+        email: 'jessica.lussu@stackhouse.it'
+      }
+    })
+  })
 })

package/src/auth/controller.ts

@@ -1,6 +1,7 @@
 import { ObjectId } from 'bson'
 import { FastifyInstance } from 'fastify'
 import { AUTH_CONFIG, DB_NAME, DEFAULT_CONFIG } from '../constants'
+import { StateManager } from '../state'
 import { hashToken } from '../utils/crypto'
 import { SessionCreatedDto } from './dtos'
 import { AUTH_ENDPOINTS, AUTH_ERRORS } from './utils'
@@ -55,17 +56,28 @@ export async function authController(app: FastifyInstance) {
     if (req.user.typ !== 'access') {
       throw new Error('Access token required')
     }
-    const user = await db
+    const authUser = await db
       .collection<Record<string, unknown>>(authCollection)
       .findOne({ _id: ObjectId.createFromHexString(req.user.id) })
+
+    const customData = userCollection && AUTH_CONFIG.user_id_field
+      ? await db
+        .collection<Record<string, unknown>>(userCollection)
+        .findOne({ [AUTH_CONFIG.user_id_field]: req.user.id })
+      : null
+
+    const params = (req as unknown as { params?: { appId?: string } }).params
+    const stateProjectId = StateManager.select('projectId')
+    const domainId = params?.appId ?? stateProjectId ?? ''
+
     return {
-      _id: user?._id.toString(),
-      identities: user?.identities,
+      user_id: req.user.id,
+      domain_id: domainId,
+      identities: authUser?.identities,
+      custom_data: customData ?? {},
       type: 'normal',
-      custom_data: user?.curstom_data,
       data: {
-        _id: user?._id.toString(),
-        email: user?.email
+        email: authUser?.email
       }
     }
   })