fix: refactor codebase and remove sensitive details

Author: RolandM99

packages/core/src/lib/auth/auth.controller.ts

@@ -8,8 +8,10 @@ import {
 	Headers,
 	Query,
 	UseGuards,
-	BadRequestException
+	BadRequestException,
+	Res
 } from '@nestjs/common';
+import { Response } from 'express';
 import { ApiTags, ApiOperation, ApiResponse, ApiOkResponse, ApiBadRequestResponse } from '@nestjs/swagger';
 import { CommandBus } from '@nestjs/cqrs';
 import { I18nLang } from 'nestjs-i18n';
@@ -149,6 +151,39 @@ export class AuthController {
 		return await this.commandBus.execute(new AuthLoginCommand(input));
 	}
 
+	/**
+	 * Handle successful login for Zapier OAuth flow
+	 * This endpoint is called after successful authentication when the login was initiated by Zapier
+	 */
+		@ApiOperation({ summary: 'Handle successful login for Zapier OAuth' })
+		@ApiResponse({
+			status: HttpStatus.CREATED,
+			description: 'Successful authentication and redirection to the callback URL'
+		})
+		@ApiResponse({
+			status: HttpStatus.BAD_REQUEST,
+			description: 'Invalid input, the response body may contain clues as to what went wrong'
+		})
+		@Get('login/success')
+		async loginSuccess(@Query() query: any, @Res() res: Response) {
+			try {
+				// Check if this is a Zapier auth flow
+				const { zapier_redirect_uri, zapier_state } = query;
+
+				if (zapier_redirect_uri && zapier_state) {
+					// This was a Zapier OAuth flow, redirect to callback with state
+					const callbackUrl = `${process.env['API_BASE_URL']}/api/integration/zapier/oauth/callback?state=${zapier_state}`;
+
+					return res.redirect(callbackUrl);
+				}
+
+				// Regular login flow
+				return res.redirect('/dashboard');
+			} catch (error) {
+				return res.redirect('/auth/login?error=authentication_failed');
+			}
+		}
+
 	/**
 	 * Sign in workspaces by email and password.
 	 *

packages/core/src/lib/core/context/request-context.ts

@@ -216,6 +216,37 @@ export class RequestContext {
 		}
 	}
 
+		/**
+	 * Retrieves the current organization ID from the request context.
+	 * @returns {string | null} - The current organization ID if available, otherwise null.
+	 */
+		static currentOrganizationId(): ID | null {
+			try {
+				// Retrieve the current user from the request context
+				const user: IUser = RequestContext.currentUser();
+				if(!user) {
+					return null;
+				}
+				// First check if lastOrganizationId exists (most recently used organization)
+				if (user.lastOrganizationId) {
+					return user.lastOrganizationId;
+				}
+
+				// If not, check defaultOrganizationId
+				if (user.defaultOrganizationId) {
+					return user.defaultOrganizationId;
+				}
+
+				// If none of the above, try to get the first organization from the organizations array
+				if (user.organizations && user.organizations.length > 0) {
+					return user.organizations[0].organizationId;
+				}
+				return null;
+			} catch (error) {
+				// Return null if an error occurs
+				return null;
+			}
+		}
 	/**
 	 * Retrieves the current user from the request context.
 	 * @param {boolean} throwError - Flag indicating whether to throw an error if user is not found.

packages/plugins/integration-zapier/src/lib/handlers/index.ts

@@ -0,0 +1,5 @@
+import { ZapierTimerStartedHandler } from './zapier-timer-started.handler';
+import { ZapierTimerStoppedHandler } from './zapier-timer-stopped.handler';
+
+
+export const EventHandlers = [ZapierTimerStartedHandler, ZapierTimerStoppedHandler]

packages/plugins/integration-zapier/src/lib/handlers/zapier-timer-started.handler.ts

@@ -0,0 +1,23 @@
+import { EventsHandler, IEventHandler } from '@nestjs/cqrs';
+import { Injectable } from '@nestjs/common';
+import { TimerStartedEvent } from '@gauzy/core';
+import { ZapierWebhookService } from '../zapier-webhook.service';
+
+@Injectable()
+@EventsHandler(TimerStartedEvent)
+export class ZapierTimerStartedHandler implements IEventHandler<TimerStartedEvent> {
+    constructor(private readonly zapierWebhookService: ZapierWebhookService) {}
+    /**
+     * Handles the TimerStartedEvent by notifying Zapier webhooks
+     *
+     * @param event - The TimerStartedEvent that contains the time log details
+     * @returns A Promise that resolves once the webhooks are notified
+     */
+    async handle(event: TimerStartedEvent): Promise<void> {
+        await this.zapierWebhookService.notifyTimerStatusChanged({
+            event: 'timer.status.changed',
+            action: 'start',
+            data: event.timeLog,
+        });
+    }
+}

packages/plugins/integration-zapier/src/lib/handlers/zapier-timer-stopped.handler.ts

@@ -0,0 +1,24 @@
+import { EventsHandler, IEventHandler } from '@nestjs/cqrs';
+import { Injectable } from '@nestjs/common';
+import { TimerStoppedEvent } from '@gauzy/core';
+import { ZapierWebhookService } from '../zapier-webhook.service';
+
+@Injectable()
+@EventsHandler(TimerStoppedEvent)
+export class ZapierTimerStoppedHandler implements IEventHandler<TimerStoppedEvent> {
+    constructor(private readonly zapierWebhookService: ZapierWebhookService) {}
+
+    /**
+     * Handles the TimerStoppedEvent by notifying Zapier webhooks
+     *
+     * @param event - The TimerStoppedEvent that contains the time log details.
+     * @returns A Promise that resolves once the webhooks are notified
+     */
+    async handle(event: TimerStoppedEvent): Promise<void> {
+        await this.zapierWebhookService.notifyTimerStatusChanged({
+            event: 'timer.status.changed',
+            action: 'stop',
+            data: event.timeLog
+        });
+    }
+}

packages/plugins/integration-zapier/src/lib/integration-zapier.plugin.ts

@@ -80,13 +80,23 @@ interface ZapierCustomFields extends CustomEmbeddedFields {
 export class IntegrationZapierPlugin implements IOnPluginBootstrap, IOnPluginDestroy {
 	// We enable by default additional logging for each event to avoid cluttering the logs
 	private logEnabled = true;
+	private readonly logger = new Logger(IntegrationZapierPlugin.name);
 
 	/**
 	 * Called when the plugin is being initialized.
 	 */
 	onPluginBootstrap(): void | Promise<void> {
 		if (this.logEnabled) {
 			console.log(chalk.green(`${IntegrationZapierPlugin.name} is being bootstrapped...`));
+
+			// Log Zapier configuration status
+			const clientId = process.env['GAUZY_ZAPIER_CLIENT_ID'];
+			const clientSecret = process.env['GAUZY_ZAPIER_CLIENT_SECRET'];
+			if(!clientId || !clientSecret) {
+				this.logger.warn('Zapier OAuth credentials not fully configured! Please set GAUZY_ZAPIER_CLIENT_ID and GAUZY_ZAPIER_CLIENT_SECRET')
+			} else {
+				this.logger.log('Zapier OAuth credentials configured successfully');
+			}
 		}
 	}
 
@@ -95,8 +105,7 @@ export class IntegrationZapierPlugin implements IOnPluginBootstrap, IOnPluginDes
 	 */
 	onPluginDestroy(): void | Promise<void> {
 		if (this.logEnabled) {
-			const logger = new Logger(IntegrationZapierPlugin.name);
-			logger.log(`${IntegrationZapierPlugin.name} is being destroyed...`)
+			this.logger.log(`${IntegrationZapierPlugin.name} is being destroyed...`)
 		}
 	}
 }

packages/plugins/integration-zapier/src/lib/zapier-auth-code.service.ts

@@ -0,0 +1,70 @@
+import { Injectable, Logger } from '@nestjs/common';
+import * as moment from 'moment';
+import { v4 as uuidv4 } from 'uuid';
+import { ID } from '@gauzy/contracts';
+
+@Injectable()
+export class ZapierAuthCodeService {
+    private readonly logger = new Logger(ZapierAuthCodeService.name);
+
+    // Using a Map to store temporary auth codes - this is temporary storage
+    // and doesn't need to be persisted to the database
+    private authCodes: Map<string, {
+        userId: string,
+        expiresAt: Date,
+        tenantId: string,
+        organizationId?: string
+    }> = new Map();
+
+    /**
+     * Generates and stores an authentication code for a user
+     *
+     * @param userId The user's ID
+     * @param tenantId The tenant ID
+     * @param organizationId The organization ID
+     * @returns The generated authorization code
+     */
+
+    generateAuthCode(userId: ID, tenantId: ID, organizationId?: ID): String {
+        // Generation of a unique code
+        const code = uuidv4();
+        // Auth codes expire in 60 minutes
+        const expiresAt = moment().add(60, 'minutes').toDate();
+
+        // Stores the code with user infos
+        this.authCodes.set(code, {
+            userId: userId.toString(),
+            tenantId: tenantId.toString(),
+            organizationId: organizationId?.toString(),
+            expiresAt
+        });
+        this.logger.debug(`Generated auth code for user ${userId}, expires at ${expiresAt}`);
+        return code;
+    }
+
+    /**
+     * Gets the user information associated with an auth code
+     *
+     * @param code The authorization code
+     * @returns The user info or null if code is invalid or expired
+     */
+    getUserInfoFromAuthCode(code: string): {
+        userId: string,
+        tenantId: string,
+        organizationId?: string
+    } | null {
+        const authCodeData = this.authCodes.get(code);
+
+        // Check if code exists and is not expired
+        if (authCodeData && moment().isBefore(authCodeData.expiresAt)) {
+            this.authCodes.delete(code);
+
+            return {
+                userId: authCodeData.userId,
+                tenantId: authCodeData.tenantId,
+                organizationId: authCodeData.organizationId
+            };
+        }
+        return null;
+    }
+}