🚨 Fix lint in packages/shared

apps/magic-link/src/hooks/useOAuth.ts

@@ -9,7 +9,10 @@ type UseOAuthProps = {
   returnUrl: string;              // Return URL after OAuth flow
   projectId: string;              // Project ID
   linkedUserId: string;           // Linked User ID
-  redirectIngressUri: string | null;        // URL of the User's Server
+  redirectIngressUri: {
+    status: boolean;
+    value: string | null;
+  }     // URL of the User's Server
   onSuccess: () => void;
 };
 

apps/magic-link/src/lib/ProviderModal.tsx

@@ -63,7 +63,13 @@ const ProviderModal = () => {
   const [openSuccessDialog,setOpenSuccessDialog] = useState<boolean>(false);
   const [currentProviderLogoURL,setCurrentProviderLogoURL] = useState<string>('')
   const [currentProvider,setCurrentProvider] = useState<string>('')
-  const [redirectIngressUri, setRedirectIngressUri] = useState<string | null>(null);
+  const [redirectIngressUri, setRedirectIngressUri] = useState<{
+    status: boolean;
+    value: string | null;
+  }>({
+    status: false,
+    value: null
+  });
   const {mutate : createApiKeyConnection} = useCreateApiKeyConnection();
   const {data: magicLink} = useUniqueMagicLink(uniqueMagicLinkId); 
   const {data: connectorsForProject} = useProjectConnectors(isProjectIdReady ? projectId : null);
@@ -88,9 +94,12 @@ const ProviderModal = () => {
 
   useEffect(() => { 
     const queryParams = new URLSearchParams(window.location.search);
-    const redirectIngressUri = queryParams.get('redirectIngressUri');
-    if (redirectIngressUri) {
-      setRedirectIngressUri(redirectIngressUri);
+    const param = queryParams.get('redirectIngressUri');
+    if (param !== null && param !== undefined) {
+      setRedirectIngressUri({
+        status: true,
+        value: param
+      });
     }
   }, []);
 

apps/webapp/src/hooks/create/useCreateBatchLinkedUser.tsx

@@ -9,7 +9,7 @@ interface ILinkedUserDto {
 }
 const useCreateBatchLinkedUser = () => {    
     const add = async (linkedUserData: ILinkedUserDto) => {
-        const response = await fetch(`${config.API_URL}/linked-users/batch`, {
+        const response = await fetch(`${config.API_URL}/linked-users/internal/batch`, {
             method: 'POST',
             body: JSON.stringify(linkedUserData),
             headers: {

apps/webapp/src/hooks/create/useCreateLinkedUser.tsx

@@ -9,7 +9,7 @@ interface ILinkedUserDto {
 }
 const useCreateLinkedUser = () => {    
     const add = async (linkedUserData: ILinkedUserDto) => {
-        const response = await fetch(`${config.API_URL}/linked-users`, {
+        const response = await fetch(`${config.API_URL}/linked-users/internal`, {
             method: 'POST',
             body: JSON.stringify(linkedUserData),
             headers: {

apps/webapp/src/hooks/get/useLinkedUsers.tsx

@@ -7,7 +7,7 @@ const useLinkedUsers = () => {
   return useQuery({
     queryKey: ['linked-users'], 
     queryFn: async (): Promise<LinkedUser[]> => {
-      const response = await fetch(`${config.API_URL}/linked-users`,
+      const response = await fetch(`${config.API_URL}/linked-users/internal`,
       {
         method: 'GET',
         headers: {

packages/api/src/@core/linked-users/dto/create-linked-user.dto.ts

@@ -5,15 +5,11 @@ export class CreateLinkedUserDto {
   linked_user_origin_id: string;
   @ApiProperty()
   alias: string;
-  @ApiProperty()
-  id_project: string;
 }
 
 export class CreateBatchLinkedUserDto {
   @ApiProperty()
   linked_user_origin_ids: string[];
   @ApiProperty()
   alias: string;
-  @ApiProperty()
-  id_project: string;
 }

packages/api/src/@core/linked-users/linked-users.controller.ts

@@ -15,12 +15,14 @@ import {
 } from './dto/create-linked-user.dto';
 import {
   ApiBody,
+  ApiExcludeEndpoint,
   ApiOperation,
   ApiQuery,
   ApiResponse,
   ApiTags,
 } from '@nestjs/swagger';
 import { JwtAuthGuard } from '@@core/auth/guards/jwt-auth.guard';
+import { ApiKeyAuthGuard } from '@@core/auth/guards/api-key.guard';
 
 @ApiTags('linkedUsers')
 @Controller('linked-users')
@@ -35,10 +37,17 @@ export class LinkedUsersController {
   @ApiOperation({ operationId: 'createLinkedUser', summary: 'Add Linked User' })
   @ApiBody({ type: CreateLinkedUserDto })
   @ApiResponse({ status: 201 })
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(ApiKeyAuthGuard)
   @Post()
-  addLinkedUser(@Body() linkedUserCreateDto: CreateLinkedUserDto) {
-    return this.linkedUsersService.addLinkedUser(linkedUserCreateDto);
+  addLinkedUser(
+    @Request() req: any,
+    @Body() linkedUserCreateDto: CreateLinkedUserDto,
+  ) {
+    const projectId = req.user.id_project;
+    return this.linkedUsersService.addLinkedUser(
+      linkedUserCreateDto,
+      projectId,
+    );
   }
 
   @ApiOperation({
@@ -47,18 +56,22 @@ export class LinkedUsersController {
   })
   @ApiBody({ type: CreateBatchLinkedUserDto })
   @ApiResponse({ status: 201 })
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(ApiKeyAuthGuard)
   @Post('batch')
-  addBatchLinkedUsers(@Body() data: CreateBatchLinkedUserDto) {
-    return this.linkedUsersService.addBatchLinkedUsers(data);
+  addBatchLinkedUsers(
+    @Request() req: any,
+    @Body() data: CreateBatchLinkedUserDto,
+  ) {
+    const projectId = req.user.id_project;
+    return this.linkedUsersService.addBatchLinkedUsers(data, projectId);
   }
 
   @ApiOperation({
     operationId: 'listLinkedUsers',
     summary: 'Retrieve Linked Users',
   })
   @ApiResponse({ status: 200 })
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(ApiKeyAuthGuard)
   @Get()
   fetchLinkedUsers(@Request() req: any) {
     const { id_project } = req.user;
@@ -71,7 +84,7 @@ export class LinkedUsersController {
   })
   @ApiQuery({ name: 'id', required: true, type: String })
   @ApiResponse({ status: 200 })
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(ApiKeyAuthGuard)
   @Get('single')
   getLinkedUser(@Query('id') id: string) {
     // validate project_id against user
@@ -84,10 +97,85 @@ export class LinkedUsersController {
   })
   @ApiQuery({ name: 'remoteId', required: true, type: String })
   @ApiResponse({ status: 200 })
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(ApiKeyAuthGuard)
   @Get('fromRemoteId')
   linkedUserFromRemoteId(@Query('remoteId') id: string) {
     // validate project_id against user
     return this.linkedUsersService.getLinkedUserV2(id);
   }
+
+  @ApiOperation({ operationId: 'createLinkedUser', summary: 'Add Linked User' })
+  @ApiBody({ type: CreateLinkedUserDto })
+  @ApiResponse({ status: 201 })
+  @ApiExcludeEndpoint()
+  @UseGuards(JwtAuthGuard)
+  @Post('internal')
+  addLinkedUserInternal(
+    @Request() req: any,
+    @Body() linkedUserCreateDto: CreateLinkedUserDto,
+  ) {
+    const { id_project } = req.user;
+    return this.linkedUsersService.addLinkedUser(
+      linkedUserCreateDto,
+      id_project,
+    );
+  }
+
+  @ApiOperation({
+    operationId: 'importBatch',
+    summary: 'Add Batch Linked Users',
+  })
+  @ApiBody({ type: CreateBatchLinkedUserDto })
+  @ApiResponse({ status: 201 })
+  @ApiExcludeEndpoint()
+  @UseGuards(JwtAuthGuard)
+  @Post('internal/batch')
+  addBatchLinkedUsersInternal(
+    @Request() req: any,
+    @Body() data: CreateBatchLinkedUserDto,
+  ) {
+    const { id_project } = req.user;
+    return this.linkedUsersService.addBatchLinkedUsers(data, id_project);
+  }
+
+  @ApiOperation({
+    operationId: 'listLinkedUsers',
+    summary: 'Retrieve Linked Users',
+  })
+  @ApiResponse({ status: 200 })
+  @UseGuards(JwtAuthGuard)
+  @ApiExcludeEndpoint()
+  @Get('internal')
+  fetchLinkedUsersInternal(@Request() req: any) {
+    const { id_project } = req.user;
+    return this.linkedUsersService.getLinkedUsers(id_project);
+  }
+
+  @ApiOperation({
+    operationId: 'retrieveLinkedUser',
+    summary: 'Retrieve a Linked User',
+  })
+  @ApiQuery({ name: 'id', required: true, type: String })
+  @ApiResponse({ status: 200 })
+  @UseGuards(JwtAuthGuard)
+  @ApiExcludeEndpoint()
+  @Get('internal/single')
+  getLinkedUserInternal(@Query('id') id: string) {
+    // validate project_id against user
+    return this.linkedUsersService.getLinkedUser(id);
+  }
+
+  @ApiOperation({
+    operationId: 'remoteId',
+    summary: 'Retrieve a Linked User From A Remote Id',
+  })
+  @ApiQuery({ name: 'remoteId', required: true, type: String })
+  @ApiResponse({ status: 200 })
+  @ApiExcludeEndpoint()
+  @UseGuards(JwtAuthGuard)
+  @Get('internal/fromRemoteId')
+  linkedUserFromRemoteIdInternal(@Query('remoteId') id: string) {
+    // validate project_id against user
+    return this.linkedUsersService.getLinkedUserV2(id);
+  }
 }

packages/api/src/@core/linked-users/linked-users.service.ts

@@ -45,12 +45,11 @@ export class LinkedUsersService {
       throw error;
     }
   }
-  async addLinkedUser(data: CreateLinkedUserDto) {
+  async addLinkedUser(data: CreateLinkedUserDto, id_project: string) {
     try {
-      const { id_project, ...rest } = data;
       const res = await this.prisma.linked_users.create({
         data: {
-          ...rest,
+          ...data,
           id_linked_user: uuidv4(),
           id_project: id_project,
         },
@@ -60,9 +59,12 @@ export class LinkedUsersService {
       throw error;
     }
   }
-  async addBatchLinkedUsers(data: CreateBatchLinkedUserDto) {
+  async addBatchLinkedUsers(
+    data: CreateBatchLinkedUserDto,
+    id_project: string,
+  ) {
     try {
-      const { linked_user_origin_ids, alias, id_project } = data;
+      const { linked_user_origin_ids, alias } = data;
 
       const linkedUsersData = linked_user_origin_ids.map((id) => ({
         id_linked_user: uuidv4(), // Ensure each user gets a unique ID

packages/shared/src/authUrl.ts

@@ -10,13 +10,16 @@ interface AuthParams {
   returnUrl: string;
   apiUrl: string;
   vertical: string;
-  rediectUriIngress?: string | null;
+  rediectUriIngress?: {
+    status: boolean;
+    value: string | null;
+  };
 }
 
 // make sure to check wether its api_key or oauth2 to build the right auth
 // make sure to check if client has own credentials to connect or panora managed ones
 export const constructAuthUrl = async ({ projectId, linkedUserId, providerName, returnUrl, apiUrl, vertical, rediectUriIngress }: AuthParams) => {
-  const encodedRedirectUrl = encodeURIComponent(`${rediectUriIngress !== null && rediectUriIngress ? rediectUriIngress : apiUrl}/connections/oauth/callback`); 
+  const encodedRedirectUrl = encodeURIComponent(`${rediectUriIngress && rediectUriIngress.status == true ? rediectUriIngress.value : apiUrl}/connections/oauth/callback`); 
   const state = encodeURIComponent(JSON.stringify({ projectId, linkedUserId, providerName, vertical, returnUrl }));
   // console.log('State : ', JSON.stringify({ projectId, linkedUserId, providerName, vertical, returnUrl }));
   // console.log('encodedRedirect URL : ', encodedRedirectUrl); 

packages/shared/src/types.ts

@@ -48,4 +48,4 @@ export type VerticalConfig = {
 
 export type ProvidersConfig = {
     [vertical: string]: VerticalConfig;
-}
+}