rez_core 3.1.54 → 3.1.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "3.1.54",
+  "version": "3.1.56",
   "description": "",
   "author": "",
   "private": false,

package/src/module/integration/integration.module.ts

@@ -99,6 +99,7 @@ import { IntegrationEntityMapperService } from './service/integration-entity-map
     IntegrationFactory,
     IntegrationQueueService,
     WrapperService,
+    IntegrationEntityMapperService,
   ],
 })
 export class IntegrationModule {}

package/src/module/integration/strategies/whatsapp/tubelight-whatsapp.strategy.ts

@@ -118,39 +118,47 @@ export class TubelightWhatsAppStrategy implements IntegrationStrategy {
     config: TubelightWhatsAppConfig,
   ): Promise<string | null> {
     try {
-      const baseUrl = config.baseUrl || this.defaultBaseUrl;
-      const authUrl = baseUrl.replace('/whatsapp/api/v1', '/auth/api/v1');
+      const authUrl = 'https://portal.tubelightcommunications.com/api/authentication/login';
 
       const response = await axios.post(
-        `${authUrl}/login`,
+        authUrl,
         {
-          user_name: config.userName,
+          username: config.userName,
           password: config.password,
+          validityTime: 3600,
         },
         {
           headers: {
             'Content-Type': 'application/json',
-            'X-TENANT-ID': config.tenantId,
           },
         },
       );
 
       const data = response.data as {
         bearer_token?: string;
-        access_token?: string;
+        accessToken?: string;
         token?: string;
+        authToken?: string;
         success?: boolean;
       };
 
-      if (data.success !== false) {
-        return data?.bearer_token || data?.access_token || data?.token || null;
+      // Return token in various possible formats
+      const token = data?.bearer_token || data?.accessToken || data?.token || data?.authToken || null;
+
+      if (token) {
+        this.logger.log('Successfully authenticated with Tubelight');
+        return token;
       }
 
+      this.logger.warn('No token found in Tubelight auth response');
       return null;
     } catch (error) {
+      const errorMessage = error.response?.data
+        ? JSON.stringify(error.response.data)
+        : error.message;
       this.logger.error(
         'Failed to authenticate with Tubelight:',
-        error.response?.data || error.message,
+        errorMessage,
       );
       return null;
     }

package/src/module/meta/controller/view-master.controller.ts

@@ -24,6 +24,7 @@ export class ViewMasterController {
   async getEntityJsonByType(
     @Query('entity_type') entityType: string,
     @Query('type') type: string,
+    @Query('code') code: string,
     @Res() res: Response,
     @Req() req: Request & { user: any },
   ) {
@@ -37,7 +38,12 @@ export class ViewMasterController {
         });
       }
 
-      const result = await this.viewMaster.getEntityJson(entityType, type);
+      const result = await this.viewMaster.getEntityJson(
+        entityType,
+        type,
+        loggedInUser,
+        code,
+      );
 
       return res.status(HttpStatus.OK).json({
         success: true,

package/src/module/meta/repository/view-master.repository.ts

@@ -13,10 +13,14 @@ export class ViewMaterRespository {
   async getEntityJson(
     entityType: string,
     type: string,
+    loggedInUser: any,
+    code?: string,
   ): Promise<ViewMaster | null> {
     const viewMaster = await this.viewMasterRepository.findOneBy({
       mapped_entity_type: entityType,
       type: type,
+      organization_id: loggedInUser.organization_id,
+      code: code,
     });
 
     return viewMaster;

package/src/module/meta/service/view-master.service.ts

@@ -48,10 +48,17 @@ export class ViewMasterService extends EntityServiceImpl {
     return res;
   }
 
-  async getEntityJson(entityType: string, type: string) {
+  async getEntityJson(
+    entityType: string,
+    type: string,
+    loggedInUser: UserData,
+    code?: string,
+  ) {
     const res = await this.viewMasterRepoService.getEntityJson(
       entityType,
       type,
+      loggedInUser,
+      code,
     );
 
     if (type == 'form') {
@@ -74,6 +81,7 @@ export class ViewMasterService extends EntityServiceImpl {
     return await super.getEntityData(entityType, id, loggedInUserData);
   }
 
+  // DROPDOWN
   async getViewMasterByEntityType(entityType: string, loggedInUser: UserData) {
     return await this.viewMasterRepoService.findByEntityType(
       entityType,