rez_core 2.2.166 → 2.2.169

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.166",
+  "version": "2.2.169",
   "description": "",
   "author": "",
   "private": false,
@@ -31,6 +31,7 @@
     "@nestjs/jwt": "^11.0.0",
     "@nestjs/passport": "^11.0.5",
     "@nestjs/platform-express": "^11.0.20",
+    "@nestjs/schedule": "^6.0.0",
     "@nestjs/swagger": "^11.0.3",
     "@nestjs/typeorm": "^11.0.0",
     "250218_nodejs_core": "file:",
@@ -43,6 +44,7 @@
     "crypto-js": "^4.2.0",
     "dotenv": "^16.4.7",
     "exceljs": "^4.4.0",
+    "firebase-admin": "^13.5.0",
     "googleapis": "^159.0.0",
     "handlebars": "^4.7.8",
     "ics": "^3.8.1",
@@ -71,6 +73,7 @@
     "@nestjs/testing": "^11.0.1",
     "@swc/cli": "^0.6.0",
     "@swc/core": "^1.10.7",
+    "@types/cron": "^2.0.1",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.14",
     "@types/multer": "^1.4.12",

package/src/app.module.ts

@@ -17,6 +17,7 @@ import { WorkflowModule } from './module/workflow/workflow.module';
 import { IcsMeetingModule } from './module/ics/ics.module';
 import { DashboardModule } from './module/dashboard/dashboard.module';
 import { CommunicationModule } from './module/communication/communication.module';
+import { ScheduleModule } from '@nestjs/schedule';
 
 @Module({
   imports: [
@@ -38,6 +39,7 @@ import { CommunicationModule } from './module/communication/communication.module
     IcsMeetingModule,
     DashboardModule,
     CommunicationModule,
+    ScheduleModule.forRoot(),
   ],
 })
 export class AppModule {}

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

@@ -8,6 +8,7 @@ import {
   ParseIntPipe,
   HttpStatus,
   HttpCode,
+  Query,
 } from '@nestjs/common';
 import { CommunicationService } from '../service/communication.service';
 import {
@@ -84,8 +85,15 @@ export class CommunicationController {
   async getLevelConfigs(
     @Param('id', ParseIntPipe) levelId: number,
     @Param('type') levelType: string,
+    @Query('communication_config_type') configType?: 'WA' | 'SMS' | 'EMAIL' | 'TELEPHONE',
+    @Query('service') service?: 'API' | 'THIRD_PARTY' | 'SMTP',
+    @Query('provider') provider?: string,
   ) {
-    return this.communicationService.getLevelConfigs(levelId, levelType);
+    return this.communicationService.getLevelConfigs(levelId, levelType, {
+      communication_config_type: configType,
+      service,
+      provider,
+    });
   }
 
   @Put('config/:id/status')
@@ -100,6 +108,16 @@ export class CommunicationController {
     return { message: 'Status updated successfully' };
   }
 
+  @Post('config/:id/update')
+  @HttpCode(HttpStatus.OK)
+  async activateConfig(
+    @Param('id', ParseIntPipe) hubId: number,
+    @Param('status', ParseIntPipe) status: number,
+  ) {
+    await this.communicationService.updateConfigStatus(hubId, status);
+    return { message: 'Configuration activated successfully' };
+  }
+
   @Post('gmail/oauth/init')
   async initGmailOAuth(@Body() initDto: GmailOAuthInitDto) {
     return this.communicationService.initGmailOAuth(

package/src/module/communication/entity/communication-config.entity.ts

@@ -7,7 +7,7 @@ import {
 } from 'typeorm';
 import { IsNotEmpty, IsObject } from 'class-validator';
 
-@Entity({ name: 'communication_config' })
+@Entity({ name: 'cr_communication_config' })
 export class CommunicationConfig {
   @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
   id: number;

package/src/module/communication/entity/communication-hub.entity.ts

@@ -15,7 +15,7 @@ export enum CommunicationConfigType {
   TELEPHONE = 'TELEPHONE',
 }
 
-@Entity({ name: 'communication_hub' })
+@Entity({ name: 'cr_communication_hub' })
 @Index('idx_level_status', ['level_id', 'level_type', 'status'])
 @Index('idx_config_type', ['communication_config_type'])
 @Index('idx_service_provider', ['service', 'provider'])

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

@@ -146,7 +146,7 @@ export class CommunicationService {
   ): Promise<CommunicationHubWithConfig[]> {
     let query = this.hubRepository
       .createQueryBuilder('hub')
-      .leftJoin('communication_config', 'config', 'config.id = hub.config_id')
+      .leftJoin('cr_communication_config', 'config', 'config.id = hub.config_id')
       .select([
         'hub.id as hub_id',
         'hub.level_id as hub_level_id',
@@ -322,9 +322,28 @@ export class CommunicationService {
   async getLevelConfigs(
     levelId: number,
     levelType: string,
+    filters?: {
+      communication_config_type?: 'WA' | 'SMS' | 'EMAIL' | 'TELEPHONE';
+      service?: 'API' | 'THIRD_PARTY' | 'SMTP';
+      provider?: string;
+    },
   ): Promise<CommunicationHub[]> {
+    const where: any = { level_id: levelId, level_type: levelType };
+
+    if (filters?.communication_config_type) {
+      where.communication_config_type = filters.communication_config_type;
+    }
+
+    if (filters?.service) {
+      where.service = filters.service;
+    }
+
+    if (filters?.provider) {
+      where.provider = filters.provider;
+    }
+
     return this.hubRepository.find({
-      where: { level_id: levelId, level_type: levelType },
+      where,
       order: { created_at: 'DESC' },
     });
   }

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

@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import axios from 'axios';
 import {
   CommunicationStrategy,
@@ -7,20 +8,26 @@ import {
 
 @Injectable()
 export class GmailApiStrategy implements CommunicationStrategy {
+  constructor(private readonly configService: ConfigService) {}
   async sendMessage(
     to: string | string[],
     message: string,
     config: any,
   ): Promise<CommunicationResult> {
     try {
-      if (!this.validateConfig(config)) {
-        throw new Error('Invalid Gmail API configuration');
+      if (!config || !config.refreshToken) {
+        throw new Error('Invalid Gmail API configuration - missing refresh token');
       }
 
-      const { accessToken, subject, html, cc, bcc } = config;
+      const { subject, html, cc, bcc } = config;
 
       console.log('---- Using HTTP Gmail API ----');
-      console.log('accessToken:', accessToken ? 'Present' : 'Missing');
+      console.log('Always refreshing token before send...');
+
+      // ALWAYS refresh token first - no expiration checking
+      const freshAccessToken = await this.refreshAccessToken(config);
+
+      console.log('---- Fresh token obtained, preparing email ----');
 
       const toRecipients = Array.isArray(to) ? to.join(', ') : to;
       const ccRecipients = cc
@@ -63,7 +70,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
         .replace(/\//g, '_')
         .replace(/=+$/, '');
 
-      // Direct HTTP call to Gmail API
+      // Send with fresh token
       const response = await axios.post(
         'https://gmail.googleapis.com/gmail/v1/users/me/messages/send',
         {
@@ -71,7 +78,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
         },
         {
           headers: {
-            Authorization: `Bearer ${accessToken}`,
+            Authorization: `Bearer ${freshAccessToken}`,
             'Content-Type': 'application/json',
           },
           timeout: 30000, // 30 second timeout
@@ -88,6 +95,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
         provider: 'gmail',
         service: 'API',
         timestamp: new Date(),
+        refreshedToken: freshAccessToken, // Always return the fresh token for database update
       };
     } catch (error) {
       console.error('---- Gmail HTTP API Error ----');
@@ -111,18 +119,29 @@ export class GmailApiStrategy implements CommunicationStrategy {
   validateConfig(config: any): boolean {
     if (!config) return false;
 
-    // For HTTP API, we just need accessToken
-    return config.accessToken && typeof config.accessToken === 'string';
+    // For always-refresh strategy, we only need a refresh token
+    return config.refreshToken && typeof config.refreshToken === 'string';
   }
 
   async refreshAccessToken(config: any): Promise<string> {
     try {
-      const { clientId, clientSecret, refreshToken } = config;
+      const { refreshToken } = config;
 
-      if (!clientId || !clientSecret || !refreshToken) {
-        throw new Error('Missing OAuth credentials for token refresh');
+      if (!refreshToken) {
+        throw new Error('Missing refresh token for token refresh');
       }
 
+      // Get system OAuth credentials
+      const clientId = this.configService.get<string>('CLIENT_ID');
+      const clientSecret = this.configService.get<string>('CLIENT_SECRET');
+
+      if (!clientId || !clientSecret) {
+        throw new Error('Gmail OAuth system credentials not configured');
+      }
+
+      console.log('---- Refreshing token with system credentials ----');
+
+      // Use Google's OAuth endpoint to refresh token with system credentials
       const response = await axios.post(
         'https://oauth2.googleapis.com/token',
         {
@@ -133,12 +152,17 @@ export class GmailApiStrategy implements CommunicationStrategy {
         },
         {
           headers: {
-            'Content-Type': 'application/json',
+            'Content-Type': 'application/x-www-form-urlencoded',
           },
         },
       );
 
-      return response.data.access_token || '';
+      if (!response.data.access_token) {
+        throw new Error('No access token received from refresh');
+      }
+
+      console.log('---- Token refreshed successfully ----');
+      return response.data.access_token;
     } catch (error) {
       console.error(
         'Failed to refresh access token:',

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

@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import { google } from 'googleapis';
 import {
   CommunicationStrategy,
@@ -7,6 +8,7 @@ import {
 
 @Injectable()
 export class GmailStrategy implements CommunicationStrategy {
+  constructor(private readonly configService: ConfigService) {}
   async sendMessage(
     to: string,
     message: string,
@@ -21,8 +23,16 @@ export class GmailStrategy implements CommunicationStrategy {
         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();
+      // Get system OAuth credentials
+      const systemClientId = this.configService.get<string>('CLIENT_ID');
+      const systemClientSecret = this.configService.get<string>('CLIENT_SECRET');
+
+      if (!systemClientId || !systemClientSecret) {
+        throw new Error('Gmail OAuth system credentials not configured');
+      }
+
+      // Create OAuth2 client with system credentials
+      const oauth2Client = new google.auth.OAuth2(systemClientId, systemClientSecret);
       
       oauth2Client.setCredentials({
         refresh_token: refreshToken,
@@ -75,7 +85,7 @@ export class GmailStrategy implements CommunicationStrategy {
         refreshedToken: config.accessToken !== accessToken ? config.accessToken : undefined,
       };
     } catch (error) {
-      console.log('Gmail strategy error:', error.message);
+      console.log('Gmail strategy error:', error);
       console.log('Config validation:', JSON.stringify({ 
         hasRefreshToken: !!config.refreshToken,
         hasAccessToken: !!config.accessToken,
@@ -93,11 +103,7 @@ export class GmailStrategy implements CommunicationStrategy {
   }
 
   validateConfig(config: any): boolean {
-    return !!(
-      config.clientId &&
-      config.clientSecret &&
-      config.refreshToken &&
-      config.email
-    );
+    // Since we use system credentials, we only need refreshToken and email from config
+    return !!(config.refreshToken && config.email);
   }
 }

package/src/module/listmaster/service/list-master.service.ts

@@ -325,18 +325,6 @@ export class ListMasterService {
       );
     }
 
-    // Check for duplicate code
-    const codeExists = await this.listMasterRepo.findOneByCondition({
-      code,
-      organization_id: loggedInUser.organization_id,
-    });
-
-    if (codeExists) {
-      throw new BadRequestException(
-        'A List Master with the same code already exists',
-      );
-    }
-
     const createdListMaster = await this.entityServiceImpl.createEntity(
       entityData,
       loggedInUser,

package/src/module/meta/service/entity-service-impl.service.ts

@@ -318,7 +318,6 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
       if (!entityData.enterprise_id)
         entityData.enterprise_id = loggedInUser.enterprise_id;
     }
-    console.log(entityData, 'WWWWWWWWW');
     await repoService.update(entityData.id, entityData);
     return await repoService.findOne({ where: { id: entityData.id } });
   }

package/src/module/notification/controller/notification.controller.ts

@@ -0,0 +1,25 @@
+import { Body, Controller, Post } from '@nestjs/common';
+import { NotificationsService } from '../service/firebase.service';
+
+@Controller('notifications')
+export class NotificationsController {
+  constructor(private readonly notificationsService: NotificationsService) {}
+
+  // Store token from frontend
+  @Post('register-token')
+  async registerToken(@Body() body: { userId?: string; token: string }) {
+    // Optional: associate token with userId if provided
+    return this.notificationsService.saveToken(body.userId, body.token);
+  }
+
+  @Post('send')
+  async sendNotification(
+    @Body() body: { token: string; title: string; message: string },
+  ) {
+    return this.notificationsService.sendToDevice(
+      body.token,
+      body.title,
+      body.message,
+    );
+  }
+}

package/src/module/notification/controller/otp.controller.ts

@@ -45,14 +45,15 @@ export class OtpController {
   @HttpCode(HttpStatus.OK)
   async verifyOtp(
     @Body()
-    body: {
+    data: {
       otp: string;
       otp_id: string;
       identifier: string;
       subdomain: string;
+      fcm_token: string;
     },
   ) {
-    return await this.otpService.verifyOtp(body);
+    return await this.otpService.verifyOtp(data);
   }
 
   @Post('send-mail')

package/src/module/notification/entity/notification.entity.ts

@@ -0,0 +1,20 @@
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'cr_notification' })
+export class NotificationData extends BaseEntity {
+  @Column({ name: 'user_id', type: 'int', nullable: true })
+  user_id: number | null;
+
+  @Column({ name: 'event_type', type: 'varchar', length: 255, nullable: true })
+  event_type: string | null;
+
+  @Column({ name: 'message', type: 'text', nullable: true })
+  message: string | null;
+
+  @Column({ nullable: true })
+  mapped_entity_id: number;
+
+  @Column({ nullable: true })
+  mapped_entity_type: string;
+}

package/src/module/notification/firebase-admin.config.ts

@@ -0,0 +1,8 @@
+import * as admin from 'firebase-admin';
+import * as serviceAccount from './firebase-admin.json';
+
+admin.initializeApp({
+  credential: admin.credential.cert(serviceAccount as admin.ServiceAccount),
+});
+
+export const firebaseAdmin = admin;

package/src/module/notification/firebase-admin.json

@@ -0,0 +1,13 @@
+{
+  "type": "service_account",
+  "project_id": "sample-d7855",
+  "private_key_id": "753237e3e7d64a87155b916deda9f3d1cb9cdd52",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQChrgvD+0M3u8EU\ntm3xV27RGuYRSjIpZIRi6I3tH0BTwpOde4DnwZWUQnTEbg/wgBGvFtGS7T4UXaef\ngkhTSRqPhIqEaIVRXf34NOhYTAOxBcvDaG9skQbOzhH9gz8cEG1HyDRCWqmxgpCy\nt0jUig5Ta72t0zSaQKc/H6AhwWF8Yiz+KnwGR837FvKDM+ZN28B21sRNcOciDXHf\nEeh4H4GjBQguM+5aMGFRACclIFztwxwTBXCJ2r/AMxSjCntzOCHimgG6dOtlW/KS\neZqunZjxvbmHZpj3N1sGRJQFHFjRLQSgCdMzwOclJ82AImcOYLJ3w1kKTmts6JlW\nVYvj6jzpAgMBAAECggEAA9xhIYv1ffY41SLKG1JILiwjRFRuQDjLRIVjJj9xzM4/\nsioJ2P7xcHnpyesK7GZShcjYtlZ9/gSChTeaPIrpXHYAzMqmLFw/PVceGUWvbOHD\njOYIiyIndHbNTS1+K1BlG6q3PMJnfPquM+ZWkeS+FNXk0KrTfb9/fu1laIjyqAKy\na8w7IwNkk4iBkKxRc74204TxQsgUpooROuoP9JfoVVL90R1EDFJWnrciTcqB77SS\nAFsPbOY9kZ5WOmUp6ZzkQD434fRRCUis7WdicV4OU0VEQmLX57UxzxNTOZzw8Adn\nnn7nmFXfcF5+ODX1htkTSn84p+qP4CR+a99/4rLqgQKBgQDbbsySP4I0KBhXT+xQ\n8iHpTo8lV71R1t4gboBIQXIHkmlrI9Qy/oOe3yViATp54oH727W/vWm4OEomzpl4\nNrs27HrI65XZcYyRCU6mLEaDx2ZjYYKHLMwx0DdQ9MPn+n1JusadiRN671ZZ3smb\nbtMLqeslmoN43SPDiG2CSNOycQKBgQC8n3RViNpHZJDUQoLxHZ7rpfIa/0v3qpjd\nI3nDxDH8udu2ipsVjqXmGJTBY+NQcWhuvuhYTzH5plnSuD3tBrPnA3VoN7FFDd29\nx+5K60acjgbu0sa9yO4aSAYD7sjkfkxVAKhzIgNWlAzl2zluakq5r3+uGQ+FVvJh\nmo5FxSj9+QKBgBkaBqrgOvvObmJmkSj9WeW/h96Et/KJuuVI3sHlQq8dD5QjCB5B\nQTtGWZdpfo/82lO+YX8qotJhFhJ0Zdf7otT4nl8nm//A3oyk3OtjezmN8OeDexQN\nitpT8FABf/ukivqJNDlHOgRBJsanFrcCKYBXEsA9eba0zWeLzsMto5HxAoGBAIaH\nW5udzcDZkwownd+GdtAvPSvQJchwnjIqmS/tAJH1pSTeWpnXca9YnNAJhBjdqdRC\nyMgjQ8uAv9OwoEorW6hKKTS5c++CYkJ3FBfPEj+adItlPWYipt+Luu6XIiUFhz+h\nBoOHIMZhNYnC/4UmvkENUI1FRnKdfqXqa8qLQh9RAoGBAMxOm2fMUKzLPY8xqp0j\nWmo3ZYMkRRi/BFqVn1F+aFGx0ahW8GVT70qy30rhiNJAkl2QnPnllQ6rD/CBc3UT\n3kJLwTc5BWXP1nKxEOuu33xB5wk4mIzyItFf/eYhYFzsWMpJo2gaKE3iNNUKUP0W\nG2coAWXT2iRSS6OHh9B1bRnQ\n-----END PRIVATE KEY-----\n",
+  "client_email": "firebase-adminsdk-fbsvc@sample-d7855.iam.gserviceaccount.com",
+  "client_id": "115995668082397151669",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-fbsvc%40sample-d7855.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}

package/src/module/notification/notification.module.ts

@@ -12,10 +12,13 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { AuthModule } from '../auth/auth.module';
 import { UserModule } from '../user/user.module';
 import { IcsMeetingModule } from '../ics/ics.module';
+import { NotificationData } from './entity/notification.entity';
+import { NotificationsController } from './controller/notification.controller';
+import { NotificationsService } from './service/firebase.service';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([Otp]),
+    TypeOrmModule.forFeature([Otp, NotificationData]),
     MailerModule.forRootAsync({
       imports: [ConfigModule],
       inject: [ConfigService],
@@ -45,8 +48,8 @@ import { IcsMeetingModule } from '../ics/ics.module';
     UserModule,
     IcsMeetingModule,
   ],
-  providers: [OtpService, OtpRepository, EmailService],
-  exports: [OtpService, EmailService],
-  controllers: [OtpController],
+  providers: [OtpService, OtpRepository, EmailService, NotificationsService],
+  exports: [OtpService, EmailService, NotificationsService],
+  controllers: [OtpController, NotificationsController],
 })
 export class NotificationModule {}

package/src/module/notification/service/firebase.service.ts

@@ -0,0 +1,31 @@
+import { Injectable } from '@nestjs/common';
+import { firebaseAdmin } from '../firebase-admin.config';
+
+@Injectable()
+export class NotificationsService {
+  private tokens: Map<string, string> = new Map(); // store in memory for now
+
+  async saveToken(userId: string | undefined, token: string) {
+    if (userId) {
+      this.tokens.set(userId, token);
+    }
+    return { success: true, token };
+  }
+
+  async sendToDevice(token: string, title: string, body: string) {
+    const message = {
+      token,
+      notification: { title, body },
+    };
+
+    return firebaseAdmin.messaging().send(message);
+  }
+
+  // Helper: send to a registered user by userId
+  async sendToUser(userId: string, title: string, body: string) {
+    const token = this.tokens.get(userId);
+    if (!token) return { error: 'No token found for user' };
+
+    return this.sendToDevice(token, title, body);
+  }
+}

package/src/module/notification/service/otp.service.ts

@@ -53,13 +53,14 @@ export class OtpService {
     return await this.otpRepository.save(otp);
   }
 
-  async verifyOtp(body: {
+  async verifyOtp(data: {
     otp: string;
     otp_id: string;
     identifier: string;
     subdomain: string;
+    fcm_token: string;
   }) {
-    const { otp, otp_id, identifier, subdomain } = body;
+    const { otp, otp_id, identifier, subdomain, fcm_token } = data;
     const verifyOTPResponse = { isValid: false };
 
     // Find OTP entity by ID
@@ -98,7 +99,12 @@ export class OtpService {
     }
 
     // Proceed to login
-    return this.loginService.login(identifier, undefined, true, subdomain);
+    return this.loginService.login({
+      email: data.identifier,
+      is_otp: true,
+      subdomain: data.subdomain,
+      fcm_token: data.fcm_token,
+    });
   }
 
   async findByOtpId(otpId: string) {

package/src/module/user/controller/login.controller.ts

@@ -28,13 +28,23 @@ export class LoginController {
 
   @Post('login')
   async login(@Body() body, @Res() res: Response) {
-    const { email_id, password, appcode, organization_id, subdomain } = body;
-    const result = await this.loginService.login(
+    const {
       email_id,
       password,
-      false,
+      appcode,
+      organization_id,
       subdomain,
-    );
+      fcm_token,
+    } = body;
+
+    const result = await this.loginService.login({
+      email: email_id,
+      password,
+      subdomain,
+      fcm_token,
+      is_otp: false, // default since you had it before
+    });
+
     return res.status(HttpStatus.OK).json(result);
   }
   @Post('form-login')
@@ -67,9 +77,12 @@ export class LoginController {
   async googleAuthRedirect(@Req() req: any, @Res() res: Response) {
     const {
       email,
+      password,
       name,
       accessToken: googleAccessToken,
       refreshToken: googleRefreshToken,
+      subdomain,
+      fcm_token,
     } = req.user;
     const { state } = req.query;
 
@@ -92,18 +105,20 @@ export class LoginController {
             actualState,
           );
 
-        return res.redirect(
-          `${this.configService.get('BASE_URL')}`,
-        );
+        return res.redirect(`${this.configService.get('BASE_URL')}`);
       } catch (error) {
-        return res.redirect(
-          `${this.configService.get('BASE_URL')}`,
-        );
+        return res.redirect(`${this.configService.get('BASE_URL')}`);
       }
     }
 
     // Original login flow
-    const data = await this.loginService.loginWithGoogle(email, name);
+    const data = await this.loginService.loginWithGoogle({
+      email,
+      password,
+      name,
+      subdomain,
+      fcm_token,
+    });
 
     if (!('accessToken' in data) || !data.accessToken)
       return res.redirect(

package/src/module/user/controller/user.controller.ts

@@ -29,7 +29,12 @@ export class UserController {
 
   @Post('check-email')
   @HttpCode(HttpStatus.OK)
-  async checkEmail(@Body('email_id') email: string) {
-    return await this.userService.checkEmailExists(email);
+  async checkEmail(@Body() body, @Res() res: Response) {
+    const { email, subdomain } = body;
+    const result = await this.userService.checkEmailExists({
+      email,
+      subdomain,
+    });
+    return res.status(HttpStatus.OK).json(result);
   }
 }

package/src/module/user/entity/user.entity.ts

@@ -53,4 +53,7 @@ export class UserData extends BaseEntity {
 
   @Column({ nullable: true })
   date: Date;
+
+  @Column({ type: 'varchar', nullable: true })
+  fcm_token: string;
 }