@rocketlink/crm-model 1.0.275 → 1.0.277

package/dist/model/user.model.d.ts

@@ -1,5 +1,4 @@
 import { USER_STATE } from "@/model/constants/user.constants";
-import { Merchant } from "@/model/merchant.model";
 export interface User {
     id?: number;
     name?: string;
@@ -7,9 +6,10 @@ export interface User {
     plainPassword?: string;
     email?: string;
     status?: USER_STATE;
-    tenantId?: number;
     roleId?: number;
-    merchants?: Merchant[];
+    tenantId?: number;
+    tenants?: number[];
+    merchants?: number[];
     createdAt?: Date;
     updatedAt?: Date;
 }

package/dist/model/user.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.model.d.ts","sourceRoot":"","sources":["../../src/model/user.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAEhD,MAAM,WAAW,IAAI;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;CACpB"}
+{"version":3,"file":"user.model.d.ts","sourceRoot":"","sources":["../../src/model/user.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kCAAkC,CAAC;AAE5D,MAAM,WAAW,IAAI;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;CACpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocketlink/crm-model",
-  "version": "1.0.275",
+  "version": "1.0.277",
   "description": "Shared DTOs and Models for CRM Rocketlink",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dtos/fastify.d.ts

@@ -1,11 +1,11 @@
-import { FastifyInstance, FastifyReply, FastifyRequest, RouteGenericInterface } from "fastify";
+import { FastifyReply, FastifyRequest, RouteGenericInterface } from "fastify";
 import "@fastify/jwt";
 import "@fastify/mysql";
 
 declare module '@fastify/jwt' {
   interface FastifyJWT {
-    payload: { id: number; email: string };
-    user: { id: number; email: string };
+    payload: AuthenticatedUser;
+    user: AuthenticatedUser;
   }
 }
 

package/src/model/fastify.d.ts

@@ -4,8 +4,8 @@ import "@fastify/mysql";
 
 declare module '@fastify/jwt' {
   interface FastifyJWT {
-    payload: { id: number; email: string };
-    user: { id: number; email: string };
+    payload: { userId: number; email: string; tenantId?: number; roleId?: number; merchants?: number[] };
+    user: { userId: number; email: string; tenantId?: number; roleId?: number; merchants?: number[] };
   }
 }
 

package/src/model/user.model.ts

@@ -1,5 +1,4 @@
 import {USER_STATE} from "@/model/constants/user.constants";
-import {Merchant} from "@/model/merchant.model";
 
 export interface User {
     id?: number;
@@ -8,9 +7,10 @@ export interface User {
     plainPassword?: string;
     email?: string;
     status?: USER_STATE;
-    tenantId?: number;
     roleId?: number;
-    merchants?: Merchant[];
+    tenantId?: number;
+    tenants?: number[];
+    merchants?: number[];
     createdAt?: Date;
     updatedAt?: Date;
 }