rez_core 2.2.159 → 2.2.162

package/package.json

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

package/src/module/communication/service/communication.service.ts

@@ -148,16 +148,18 @@ export class CommunicationService {
       .createQueryBuilder('hub')
       .leftJoin('communication_config', 'config', 'config.id = hub.config_id')
       .select([
-        'hub.id',
-        'hub.status',
-        'hub.config_id',
-        'hub.communication_config_type',
-        'hub.service',
-        'hub.provider',
-        'hub.priority',
-        'hub.is_default',
-        'hub.created_at',
-        'hub.updated_at',
+        'hub.id as hub_id',
+        'hub.level_id as hub_level_id',
+        'hub.level_type as hub_level_type',
+        'hub.status as hub_status',
+        'hub.config_id as hub_config_id',
+        'hub.communication_config_type as hub_communication_config_type',
+        'hub.service as hub_service',
+        'hub.provider as hub_provider',
+        'hub.priority as hub_priority',
+        'hub.is_default as hub_is_default',
+        'hub.created_at as hub_created_at',
+        'hub.updated_at as hub_updated_at',
         'config.id as config_id',
         'config.config_json as config_json',
         'config.created_at as config_created_at',
@@ -217,7 +219,32 @@ export class CommunicationService {
       hub.provider,
     );
 
-    return strategy.sendMessage(to, message, hub.config.config_json);
+    const result = await strategy.sendMessage(to, message, hub.config.config_json);
+
+    // If token was refreshed, update it in the database
+    if (result.refreshedToken && result.success) {
+      try {
+        const currentConfig = hub.config.config_json as any;
+        const updatedConfig = {
+          ...currentConfig,
+          accessToken: result.refreshedToken,
+        };
+        
+        await this.configRepository.update(hub.config.id, {
+          config_json: updatedConfig,
+        } as any);
+        
+        this.logger.log(
+          `Updated access token for ${hub.provider}/${hub.service} configuration`,
+        );
+      } catch (error) {
+        this.logger.warn(
+          `Failed to update refreshed token in database: ${error.message}`,
+        );
+      }
+    }
+
+    return result;
   }
 
   async createCommunicationConfig(
@@ -338,8 +365,11 @@ export class CommunicationService {
       );
 
       if (!hubs.length) {
+        this.logger.warn(
+          `No communication hubs found for ${levelType} ${levelId}. Please configure communication providers using the createCommunicationConfig method.`
+        );
         throw new Error(
-          `No active ${communicationType} configuration found for ${levelType} ${levelId}`,
+          `No active ${communicationType} configuration found for ${levelType} ${levelId}. Please configure a communication provider first.`,
         );
       }
 

package/src/module/communication/strategies/communication.strategy.ts

@@ -14,6 +14,7 @@ export interface CommunicationResult {
   service: string;
   error?: string;
   timestamp: Date;
+  refreshedToken?: string;
 }
 
 export interface MessageTemplate {

package/src/module/communication/strategies/gmail.strategy.ts

@@ -16,12 +16,31 @@ export class GmailStrategy implements CommunicationStrategy {
       const { clientId, clientSecret, refreshToken, accessToken, email } =
         config;
 
-      const oauth2Client = new google.auth.OAuth2(clientId, clientSecret);
+      // For backward compatibility, only validate essential fields for sending
+      if (!refreshToken || !email) {
+        throw new Error('Missing required Gmail credentials: refreshToken and email are required');
+      }
+
+      // Create a minimal OAuth2 client just for token management
+      const oauth2Client = new google.auth.OAuth2();
+      
       oauth2Client.setCredentials({
         refresh_token: refreshToken,
         access_token: accessToken,
       });
 
+      // Try to get a valid access token (will auto-refresh if needed)
+      try {
+        const { token } = await oauth2Client.getAccessToken();
+        // If we got a new token, update the config
+        if (token && token !== accessToken) {
+          config.accessToken = token;
+        }
+      } catch (tokenError) {
+        console.log('Token refresh error:', tokenError.message);
+        // If refresh fails, continue with existing token and let Gmail API handle it
+      }
+
       const gmail = google.gmail({ version: 'v1', auth: oauth2Client });
 
       const subject = config.subject || 'Notification';
@@ -53,8 +72,16 @@ export class GmailStrategy implements CommunicationStrategy {
         service: 'API',
         messageId: result.data.id || undefined,
         timestamp: new Date(),
+        refreshedToken: config.accessToken !== accessToken ? config.accessToken : undefined,
       };
     } catch (error) {
+      console.log('Gmail strategy error:', error.message);
+      console.log('Config validation:', JSON.stringify({ 
+        hasRefreshToken: !!config.refreshToken,
+        hasAccessToken: !!config.accessToken,
+        hasEmail: !!config.email
+      }));
+      
       return {
         success: false,
         provider: 'gmail',

package/src/module/workflow/controller/workflow-meta.controller.ts

@@ -64,6 +64,8 @@ export class WorkflowMetaController {
   async moveToNextStage(
     @Body('entityType') mapped_entity_type: string,
     @Body('entityId') mapped_entity_id: number,
+    @Body('reason_code') reason_code: string,
+    @Body('remark') remark: string,
     @Req() req: Request & { user: any },
   ): Promise<string> {
     const loggedInUser = req.user.userData;
@@ -71,6 +73,8 @@ export class WorkflowMetaController {
       mapped_entity_type,
       Number(mapped_entity_id),
       loggedInUser,
+      reason_code,
+      remark,
     );
   }
 }

package/src/module/workflow/entity/action.entity.ts

@@ -35,4 +35,7 @@ export class ActionEntity extends BaseEntity {
 
   @Column({ type: 'varchar', nullable: true })
   assignment_type: string;
+
+  @Column({ type: 'boolean', nullable: true })
+  is_template: boolean;
 }

package/src/module/workflow/repository/comm-template.repository.ts

@@ -19,7 +19,7 @@ export class CommTemplateRepository {
   async getAllCommTemplate(entity_type: string, loggedInUser) {
     const { organization_id } = loggedInUser;
     return this.commTemplateRepository.find({
-      select: ['name', 'code'],
+      select: ['name', 'code', 'mode'],
       where: {
         mapped_entity_type: entity_type,
         organization_id: organization_id,

package/src/module/workflow/service/comm-template.service.ts

@@ -88,6 +88,7 @@ export class CommTemplateService extends EntityServiceImpl {
     const response = commTemplateData.map((item) => ({
       value: item.code,
       label: item.name,
+      mode: item.mode,
     }));
 
     return response;

package/src/module/workflow/service/task.service.ts

@@ -435,6 +435,7 @@ export class TaskService extends EntityServiceImpl {
       stage_group_id: entity.stage_group_id,
     } as any;
 
+    console.log(notePayload);
     return await super.createEntity(notePayload, loggedInUser);
   }
 }

package/src/module/workflow/service/workflow-meta.service.ts

@@ -114,6 +114,8 @@ export class WorkflowMetaService extends EntityServiceImpl {
     mapped_entity_type: string,
     mapped_entity_id: number,
     loggedInUser: UserData,
+    reason_code?: string,
+    remark?: string,
   ): Promise<string> {
     const now = new Date();
     let currentStage = await this.getCurrentStage(
@@ -153,19 +155,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
         mapped_entity_id,
         mapped_entity_type,
       );
-
-      await this.taskService.createSystemNote(
-        {
-          reason_code: firstStage.reason_code,
-          remark: firstStage.remark,
-          mapped_entity_id,
-          stage_id: firstStage.id,
-          action_id: firstStage.id,
-          stage_group_id: stageGroup.id,
-        },
-        loggedInUser,
-      );
-
       return `Initialized workflow with first stage (Stage ID: ${firstStage.id}).`;
     }
 
@@ -255,6 +244,18 @@ export class WorkflowMetaService extends EntityServiceImpl {
     currentStage.is_current = 'N';
     await this.stageMovementRepo.save(currentStage);
 
+    await this.taskService.createSystemNote(
+      {
+        reason_code: reason_code || '',
+        remark: remark || '',
+        mapped_entity_id,
+        stage_id: currentStage.stage_id,
+        action_id: currentStage.action_id,
+        stage_group_id: currentStage.stage_group_id,
+      },
+      loggedInUser,
+    );
+
     return 'Workflow completed. No next stage available.';
   }