add utm_amp parameter

Author: ArtemHoruzhenko

redisinsight/api/src/modules/ai/query/providers/auth/local.ai-query-auth.provider.ts

@@ -14,7 +14,6 @@ export class LocalAiQueryAuthProvider extends AiQueryAuthProvider {
     super();
   }
 
-  // TODO: do not forget pass utm parameters here
   async getAuthData(sessionMetadata: SessionMetadata): Promise<AiQueryAuthData> {
     const session = await this.cloudUserApiService.getUserSession(sessionMetadata);
 

redisinsight/api/src/modules/cloud/common/models/cloud-request-utm.ts

@@ -29,4 +29,12 @@ export class CloudRequestUtm {
   @IsString()
   @IsNotEmpty()
   campaign?: string;
+
+  @ApiPropertyOptional({
+    type: String,
+  })
+  @IsOptional()
+  @IsString()
+  @IsNotEmpty()
+  amp?: string;
 }

redisinsight/api/src/modules/cloud/common/providers/cloud.api.provider.ts

@@ -40,6 +40,7 @@ export class CloudApiProvider {
       utm_source: utm?.source,
       utm_medium: utm?.medium,
       utm_campaign: utm?.campaign,
+      utm_amp: utm?.amp,
     };
   }
 

redisinsight/api/src/modules/cloud/user/cloud-user.api.service.spec.ts

@@ -11,7 +11,7 @@ import {
   mockCloudSession,
   mockCloudCapiAccount,
   mockCloudApiUser,
-  mockCloudApiCsrfToken,
+  mockCloudApiCsrfToken, mockServerService,
 } from 'src/__mocks__';
 import { when, resetAllWhenMocks } from 'jest-when';
 import { CloudApiInternalServerErrorException, CloudApiUnauthorizedException } from 'src/modules/cloud/common/exceptions';
@@ -22,6 +22,7 @@ import { CloudSessionService } from 'src/modules/cloud/session/cloud-session.ser
 import { CloudAuthService } from 'src/modules/cloud/auth/cloud-auth.service';
 import { mockCloudAuthService } from 'src/__mocks__/cloud-auth';
 import axios from 'axios';
+import { ServerService } from 'src/modules/server/server.service';
 
 const mockedAxios = axios as jest.Mocked<typeof axios>;
 jest.mock('axios');
@@ -52,6 +53,10 @@ describe('CloudUserApiService', () => {
           provide: CloudAuthService,
           useFactory: mockCloudAuthService,
         },
+        {
+          provide: ServerService,
+          useFactory: mockServerService,
+        },
       ],
     }).compile();
 

redisinsight/api/src/modules/cloud/user/cloud-user.api.service.ts

@@ -12,6 +12,7 @@ import { CloudRequestUtm } from 'src/modules/cloud/common/models';
 import { CloudAuthService } from 'src/modules/cloud/auth/cloud-auth.service';
 import config from 'src/utils/config';
 import { CloudSession } from 'src/modules/cloud/session/models/cloud-session';
+import { ServerService } from 'src/modules/server/server.service';
 
 const cloudConfig = config.get('cloud');
 
@@ -24,6 +25,7 @@ export class CloudUserApiService {
     private readonly repository: CloudUserRepository,
     private readonly sessionService: CloudSessionService,
     private readonly api: CloudUserApiProvider,
+    private readonly serverService: ServerService,
   ) {}
 
   /**
@@ -99,7 +101,20 @@ export class CloudUserApiService {
 
       if (!session?.apiSessionId) {
         this.logger.log('Trying to login user');
-        const apiSessionId = await this.api.getApiSessionId(session, utm);
+
+        const preparedUtm = utm;
+
+        if (preparedUtm && !preparedUtm.amp) {
+          await this.serverService.getInfo()
+            .then(({ id }) => {
+              preparedUtm.amp = id;
+            })
+            .catch(() => {
+              this.logger.warn('Unable to get server id for utm parameters');
+            });
+        }
+
+        const apiSessionId = await this.api.getApiSessionId(session, preparedUtm);
 
         if (!apiSessionId) {
           throw new CloudApiUnauthorizedException();