rez_core 2.2.229 → 2.2.231

package/package.json

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

package/src/module/communication/controller/webhook.controller.ts

@@ -11,13 +11,4 @@ export class WebhookController {
     console.log(req);
     res.status(200).send('Webhook received');
   }
-
-  @Post('ozonetel')
-  handleOzonetelWebhook(@Req() req: any, @Res() res: Response) {
-    const apiKey = req.headers['x-api-key'];
-    console.log('API Key:', apiKey);
-    console.log('handleOzonetelWebhook: START');
-    console.log(req);
-    res.status(200).send('Webhook received');
-  }
 }

package/src/module/communication/strategies/email/gmail-api.strategy.ts

@@ -90,7 +90,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
       });
 
       console.log('---- Gmail SDK API Success ----');
-        console.log('Message ID:', result.data.id);
+      console.log('Message ID:', result.data.id);
 
       // Get fresh access token for database update
       const credentials = oauth2Client.credentials;
@@ -140,6 +140,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
       // Get system OAuth credentials
       const clientId = this.configService.get<string>('CLIENT_ID');
       const clientSecret = this.configService.get<string>('CLIENT_SECRET');
+      const callbackurl = this.configService.get<string>('CALLBACK_URL');
 
       if (!clientId || !clientSecret) {
         throw new Error('Gmail OAuth system credentials not configured');
@@ -151,7 +152,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
       const oauth2Client = new google.auth.OAuth2(
         clientId,
         clientSecret,
-        'urn:ietf:wg:oauth:2.0:oob', // For server-to-server
+        callbackurl, // For server-to-server
       );
 
       // Set the refresh token
@@ -165,13 +166,8 @@ export class GmailApiStrategy implements CommunicationStrategy {
       console.log('---- OAuth2 client setup completed ----');
       return oauth2Client;
     } catch (error) {
-      console.error(
-        'Failed to setup OAuth2 client:',
-        error.message,
-      );
-      throw new Error(
-        `Failed to setup Gmail OAuth2 client: ${error.message}`,
-      );
+      console.error('Failed to setup OAuth2 client:', error.message);
+      throw new Error(`Failed to setup Gmail OAuth2 client: ${error.message}`);
     }
   }
 
@@ -179,7 +175,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
     try {
       const oauth2Client = await this.setupOAuth2Client(config);
       const { token } = await oauth2Client.getAccessToken();
-      
+
       if (!token) {
         throw new Error('No access token received from OAuth2 client');
       }
@@ -191,9 +187,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
         'Failed to refresh access token via Google SDK:',
         error.message,
       );
-      throw new Error(
-        `Failed to refresh Gmail access token: ${error.message}`,
-      );
+      throw new Error(`Failed to refresh Gmail access token: ${error.message}`);
     }
   }
 
@@ -214,10 +208,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
 
       return !!(profile.data && profile.data.emailAddress);
     } catch (error) {
-      console.error(
-        'Gmail connection validation failed:',
-        error.message,
-      );
+      console.error('Gmail connection validation failed:', error.message);
       return false;
     }
   }

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

@@ -27,6 +27,9 @@ export class ViewMaster extends BaseEntity {
   @Column({ type: 'json', nullable: true })
   published_form_fields: string;
 
+  @Column({ type: 'json', nullable: true })
+  published_rules_json: string;
+
   @Column({ type: 'json', nullable: true })
   meta_json: string;