fix(zapier-oauth): improve zapier oauth authorization implementation

Author: RolandM99

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;
+    }
+}

packages/plugins/integration-zapier/src/lib/zapier-authorization.controller.ts

@@ -70,7 +70,7 @@ export class ZapierAuthorizationController {
 
 			// Store these parameters in the session or state
 			// Redirect to the login page with these parameters preserved
-			const loginPageUrl = `${process.env['API_BASE_URL']}/auth/login?zapier_redirect_uri=${encodeURIComponent(redirectUri)}&zapier_state=${encodeURIComponent(state)}`;
+			const loginPageUrl = `${process.env['CLIENT_BASE_URL']}/#/auth/login?zapier_redirect_uri=${encodeURIComponent(redirectUri)}&zapier_state=${encodeURIComponent(state)}`;
             this.logger.debug(`Redirecting to: ${loginPageUrl}`);
 
 			res.redirect(loginPageUrl);

packages/plugins/integration-zapier/src/lib/zapier-webhook.service.ts

@@ -2,13 +2,16 @@ import { Injectable, Logger, ForbiddenException, NotFoundException, InternalServ
 import { ID } from '@gauzy/contracts';
 import { ZapierWebhookSubscription } from './zapier-webhook-subscription.entity';
 import { TypeOrmZapierWebhookSubscriptionRepository } from './repository/type-orm-zapier.repository';
+import { HttpService } from '@nestjs/axios';
+import { catchError, firstValueFrom, of } from 'rxjs';
 
 @Injectable()
 export class ZapierWebhookService {
     private readonly logger = new Logger(ZapierWebhookService.name);
 
     constructor(
         private readonly subscriptionRepository: TypeOrmZapierWebhookSubscriptionRepository,
+        private readonly _httpService: HttpService,
     ) { }
 
     async createSubscription(input: {
@@ -96,23 +99,17 @@ export class ZapierWebhookService {
 
             // Notify each subscriber
             for (const subscription of subscriptions) {
-                try {
-                    await this._httpService.post(subscription.targetUrl, {
+                await firstValueFrom(
+                    this._httpService.post(subscription.targetUrl, {
                         event: 'timer.status.changed',
                         data: timerData
                     }).pipe(
                         catchError(error => {
-                            this.logger.error(
-                                `Failed to notify webhook ${subscription.id} at ${subscription.targetUrl}`,
-                                error
-                            );
+                            this.logger.error(`Failed to notify webhook ${subscription.id} at ${subscription.targetUrl}`, error);
                             return of(null);
                         })
-                    ).toPromise();
-                } catch (error) {
-                    this.logger.error(`Error notifying webhook ${subscription.id}`, error);
-                    // Continue with other webhooks even if this one fails
-                }
+                    )
+                );
             }
         } catch (error) {
             this.logger.error('Failed to process timer status change webhooks', error);

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

@@ -13,8 +13,6 @@ import {
     UserModule,
     RolePermissionModule,
     TimerModule,
-    CommandHandlers,
-    QueryHandlers
 } from '@gauzy/core';
 import { ZapierService } from './zapier.service';
 import { ZapierController } from './zapier.controller';
@@ -24,10 +22,6 @@ import { ZapierWebhookController } from './zapier-webhook.controller';
 import { ZapierWebhookSubscription } from './zapier-webhook-subscription.entity';
 import { MikroOrmZapierWebhookSubscriptionRepository } from './repository/mikro-orm-zapier.repository';
 import { TypeOrmZapierWebhookSubscriptionRepository } from './repository/type-orm-zapier.repository';
-import { ZapierWebhookSubscriptionRepository } from './repository/zapier-repository.entity';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { MikroOrmModule } from '@mikro-orm/nestjs';
-import { TimerModule } from '@gauzy/core';
 import { EventHandlers } from './handlers';
 import { ZapierAuthCodeService } from './zapier-auth-code.service';