[PoC] JWT-based project identification

src/internal/api/authApi.ts

@@ -516,9 +516,9 @@ export class AuthApi {
     });
   }
   /**
-   * This endpoint is used to test if authentication is working correctly.
-   * @summary Test endpoint for validating middleware authentication
-   * @param authorization Bearer token (API Key or JWT)
+   * This endpoint validates a user JWT token and returns the associated user information if valid
+   * @summary Validates user JWT and returns user data
+   * @param authorization Bearer token (User JWT)
    */
   public async authControllerTestAuth(
     authorization: string,
@@ -557,6 +557,11 @@ export class AuthApi {
     };
 
     let authenticationPromise = Promise.resolve();
+    if (this.authentications.API_Key.accessToken) {
+      authenticationPromise = authenticationPromise.then(() =>
+        this.authentications.API_Key.applyToRequest(localVarRequestOptions)
+      );
+    }
     authenticationPromise = authenticationPromise.then(() =>
       this.authentications.default.applyToRequest(localVarRequestOptions)
     );

src/lib/analytics.ts

@@ -19,7 +19,7 @@ import {
   LogVisitEventRequest,
   VisitEventResponse,
 } from '../internal/api';
-
+import { ApiCredentials } from './apiCredentials';
 import { validateString } from './validators';
 
 export class AnalyticsAPI {
@@ -217,15 +217,28 @@ export class AnalyticsAPI {
   }
 
   async getCustomEventTypesByProject(
-    projectName: string
+    projectName: string,
+    credentials?: ApiCredentials
   ): Promise<GetAllCustomEventTypeResponse> {
     validateString(
       projectName,
       'The projectName must be provided as an input and has to be nonempty.'
     );
 
+    const headers: any = {};
+    if (credentials?.userJwt) {
+      headers['X-User-JWT'] = credentials.userJwt;
+    }
+    if (
+      credentials?.projectId !== undefined &&
+      credentials.projectId !== null
+    ) {
+      headers['X-Project-Id'] = String(credentials.projectId);
+    }
+
     const res = await this.internalApi.analyticsControllerGetCustomEventTypes(
-      projectName
+      projectName,
+      { headers }
     );
 
     return res.body;
@@ -255,73 +268,121 @@ export class AnalyticsAPI {
     return res.body;
   }
 
-  async getAllClickEvents(event: {
-    projectName: string;
-    afterTime?: string;
-    limit?: number;
-  }): Promise<GetAllClickEventsResponse> {
+  async getAllClickEvents(
+    event: {
+      projectName: string;
+      afterTime?: string;
+      limit?: number;
+    },
+    credentials?: ApiCredentials
+  ): Promise<GetAllClickEventsResponse> {
     const { projectName, afterTime, limit } = event;
 
     validateString(
       projectName,
       'The projectName must be provided as an input and has to be nonempty.'
     );
 
+    const headers: any = {};
+    if (credentials?.userJwt) {
+      headers['X-User-JWT'] = credentials.userJwt;
+    }
+    if (
+      credentials?.projectId !== undefined &&
+      credentials.projectId !== null
+    ) {
+      headers['X-Project-Id'] = String(credentials.projectId);
+    }
+
     const res = await this.internalApi.analyticsControllerGetAllClickEvents(
       projectName,
       afterTime,
-      limit
+      limit,
+      { headers }
     );
     return res.body;
   }
 
-  async getAllVisitEvents(event: {
-    projectName: string;
-    afterTime?: string;
-    limit?: number;
-  }): Promise<GetAllVisitEventsResponse> {
+  async getAllVisitEvents(
+    event: {
+      projectName: string;
+      afterTime?: string;
+      limit?: number;
+    },
+    credentials?: ApiCredentials
+  ): Promise<GetAllVisitEventsResponse> {
     const { projectName, afterTime, limit } = event;
 
     validateString(
       projectName,
       'The projectName must be provided as an input and has to be nonempty.'
     );
 
+    const headers: any = {};
+    if (credentials?.userJwt) {
+      headers['X-User-JWT'] = credentials.userJwt;
+    }
+    if (
+      credentials?.projectId !== undefined &&
+      credentials.projectId !== null
+    ) {
+      headers['X-Project-Id'] = String(credentials.projectId);
+    }
+
     const res = await this.internalApi.analyticsControllerGetAllVisitEvents(
       projectName,
       afterTime,
-      limit
+      limit,
+      { headers }
     );
     return res.body;
   }
 
-  async getAllInputEvents(event: {
-    projectName: string;
-    afterTime?: string;
-    limit?: number;
-  }): Promise<GetAllInputEventsResponse> {
+  async getAllInputEvents(
+    event: {
+      projectName: string;
+      afterTime?: string;
+      limit?: number;
+    },
+    credentials?: ApiCredentials
+  ): Promise<GetAllInputEventsResponse> {
     const { projectName, afterTime, limit } = event;
 
     validateString(
       projectName,
       'The projectName must be provided as an input and has to be nonempty.'
     );
 
+    const headers: any = {};
+    if (credentials?.userJwt) {
+      headers['X-User-JWT'] = credentials.userJwt;
+    }
+    if (
+      credentials?.projectId !== undefined &&
+      credentials.projectId !== null
+    ) {
+      headers['X-Project-Id'] = String(credentials.projectId);
+    }
+
     const res = await this.internalApi.analyticsControllerGetAllInputEvents(
       projectName,
       afterTime,
-      limit
+      limit,
+      { headers }
     );
     return res.body;
   }
 
-  async getAllCustomEvents(event: {
-    projectName: string;
-    category: string;
-    subcategory: string;
-    afterTime?: string;
-    limit?: number;
-  }): Promise<GetAllCustomEventsResponse> {
+  async getAllCustomEvents(
+    event: {
+      projectName: string;
+      category: string;
+      subcategory: string;
+      afterTime?: string;
+      limit?: number;
+    },
+    credentials?: ApiCredentials
+  ): Promise<GetAllCustomEventsResponse> {
     const { projectName, category, subcategory, afterTime, limit } = event;
 
     validateString(
@@ -339,12 +400,24 @@ export class AnalyticsAPI {
       'The subcategory must be provided as an input and has to be nonempty.'
     );
 
+    const headers: any = {};
+    if (credentials?.userJwt) {
+      headers['X-User-JWT'] = credentials.userJwt;
+    }
+    if (
+      credentials?.projectId !== undefined &&
+      credentials.projectId !== null
+    ) {
+      headers['X-Project-Id'] = String(credentials.projectId);
+    }
+
     const res = await this.internalApi.analyticsControllerGetAllCustomEvents(
       projectName,
       category,
       subcategory,
       afterTime,
-      limit
+      limit,
+      { headers }
     );
     return res.body;
   }

src/lib/analyticsConfig.ts

@@ -4,6 +4,7 @@ import {
   CreateAnalyticsConfigModel,
   UpdateAnalyticsConfigModel,
 } from '../internal/api';
+import { ApiCredentials } from './apiCredentials';
 import { validateString } from './validators';
 
 export class AnalyticsConfigAPI {
@@ -14,7 +15,8 @@ export class AnalyticsConfigAPI {
   }
 
   async createAnalyticsConfig(
-    config: CreateAnalyticsConfigModel
+    config: CreateAnalyticsConfigModel,
+    credentials?: ApiCredentials
   ): Promise<AnalyticsConfigResponse> {
     validateString(
       config.clientAnalyticsKey,
@@ -26,24 +28,46 @@ export class AnalyticsConfigAPI {
       'The serverAnalyticsKey must be provided as an input and has to be nonempty.'
     );
 
+    const headers: any = {};
+    if (credentials?.userJwt) {
+      headers['X-User-JWT'] = credentials.userJwt;
+    }
+    if (
+      credentials?.projectId !== undefined &&
+      credentials.projectId !== null
+    ) {
+      headers['X-Project-Id'] = String(credentials.projectId);
+    }
+
     const res =
       await this.internalApi.analyticsConfigControllerCreateAnalyticsConfig(
-        config
+        config,
+        { headers }
       );
     return res.body;
   }
 
   async getAnalyticsConfig(
-    projectId: string
+    projectId: string,
+    credentials?: ApiCredentials
   ): Promise<AnalyticsConfigResponse> {
     validateString(
       projectId,
       'The projectId must be provided as an input and has to be nonempty.'
     );
 
+    const headers: any = {};
+    if (credentials?.userJwt) {
+      headers['X-User-JWT'] = credentials.userJwt;
+    }
+    if (credentials?.projectId !== undefined) {
+      headers['X-Project-Id'] = String(credentials.projectId);
+    }
+
     const res =
       await this.internalApi.analyticsConfigControllerGetAnalyticsConfig(
-        projectId
+        projectId,
+        { headers }
       );
     return res.body;
   }

src/lib/apiCredentials.ts

@@ -0,0 +1,4 @@
+export interface ApiCredentials {
+  userJwt?: string;
+  projectId?: number | string;
+}