Merge pull request #972 from bigcapitalhq/fix/ahmedbouhuolia/invite-user-service

fix: invite user service issues

packages/server/src/modules/Auth/AuthMailMessages.esrvice.ts

@@ -20,7 +20,7 @@ export class AuthenticationMailMesssages {
    * @returns {Mail}
    */
   resetPasswordMessage(user: ModelObject<SystemUser>, token: string) {
-    const baseURL = this.configService.get('baseURL');
+    const baseURL = this.configService.get('app.baseUrl');
 
     return new Mail()
       .setSubject('Bigcapital - Password Reset')
@@ -54,7 +54,7 @@ export class AuthenticationMailMesssages {
    * @returns {Mail}
    */
   signupVerificationMail(email: string, fullName: string, token: string) {
-    const baseURL = this.configService.get('baseURL');
+    const baseURL = this.configService.get('app.baseUrl');
     const verifyUrl = `${baseURL}/auth/email_confirmation?token=${token}&email=${email}`;
 
     return new Mail()

packages/server/src/modules/BankingTransactions/constants.ts

@@ -27,7 +27,7 @@ export enum CASHFLOW_DIRECTION {
 }
 
 export enum CASHFLOW_TRANSACTION_TYPE {
-  ONWERS_DRAWING = 'OwnerDrawing',
+  OWNERS_DRAWING = 'OwnerDrawing',
   OWNER_CONTRIBUTION = 'OwnerContribution',
   OTHER_INCOME = 'OtherIncome',
   TRANSFER_FROM_ACCOUNT = 'TransferFromAccount',
@@ -36,7 +36,7 @@ export enum CASHFLOW_TRANSACTION_TYPE {
 }
 
 export const CASHFLOW_TRANSACTION_TYPE_META = {
-  [`${CASHFLOW_TRANSACTION_TYPE.ONWERS_DRAWING}`]: {
+  [`${CASHFLOW_TRANSACTION_TYPE.OWNERS_DRAWING}`]: {
     type: 'OwnerDrawing',
     direction: CASHFLOW_DIRECTION.OUT,
     creditType: [ACCOUNT_TYPE.EQUITY],

packages/server/src/modules/SaleEstimates/types/SaleEstimates.types.ts

@@ -9,7 +9,7 @@ import { CommonMailOptionsDTO } from '@/modules/MailNotification/MailNotificatio
 import { CommonMailOptions } from '@/modules/MailNotification/MailNotification.types';
 import { EditSaleEstimateDto } from '../dtos/SaleEstimate.dto';
 
-export const SendSaleEstimateMailQueue = 'SendSaleEstimateMailProcessor';
+export const SendSaleEstimateMailQueue = 'SendSaleEstimateMailQueue';
 export const SendSaleEstimateMailJob = 'SendSaleEstimateMailProcess';
 
 export interface ISaleEstimateDTO {

packages/server/src/modules/SaleInvoices/constants.ts

@@ -1,9 +1,6 @@
-// import config from '@/config';
-
 export const SendSaleInvoiceQueue = 'SendSaleInvoiceQueue';
 export const SendSaleInvoiceMailJob = 'SendSaleInvoiceMailJob';
 
-
 export const DEFAULT_INVOICE_MAIL_SUBJECT =
 'Invoice {Invoice Number} from {Company Name} for {Customer Name}';
 export const DEFAULT_INVOICE_MAIL_CONTENT = `Hi {Customer Name},

packages/server/src/modules/UsersModule/Users.module.ts

@@ -20,6 +20,7 @@ import { GetUsersService } from './queries/GetUsers.service';
 import { AcceptInviteUserService } from './commands/AcceptInviteUser.service';
 import { InviteTenantUserService } from './commands/InviteUser.service';
 import { UsersInviteController } from './UsersInvite.controller';
+import { UsersInvitePublicController } from './UsersInvitePublic.controller';
 import { InjectSystemModel } from '../System/SystemModels/SystemModels.module';
 import { SendInviteUserMailQueue } from './Users.constants';
 import InviteSendMainNotificationSubscribe from './subscribers/InviteSendMailNotification.subscriber';
@@ -60,6 +61,6 @@ const models = [InjectSystemModel(UserInvite)];
     SendInviteUsersMailMessage,
     UsersApplication
   ],
-  controllers: [UsersController, UsersInviteController],
+  controllers: [UsersController, UsersInviteController, UsersInvitePublicController],
 })
 export class UsersModule {}

packages/server/src/modules/UsersModule/UsersInvite.controller.ts

@@ -1,40 +1,13 @@
-import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common';
+import { Body, Controller, Param, Patch, Post } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { UsersApplication } from './Users.application';
-import { InviteUserDto, SendInviteUserDto } from './dtos/InviteUser.dto';
+import { SendInviteUserDto } from './dtos/InviteUser.dto';
 
 @Controller('invite')
 @ApiTags('Users')
 export class UsersInviteController {
   constructor(private readonly usersApplication: UsersApplication) {}
 
-  /**
-   * Accept a user invitation.
-   */
-  @Post('accept/:token')
-  @ApiOperation({ summary: 'Accept a user invitation.' })
-  async acceptInvite(
-    @Param('token') token: string,
-    @Body() inviteUserDTO: InviteUserDto,
-  ) {
-    await this.usersApplication.acceptInvite(token, inviteUserDTO);
-
-    return {
-      message: 'The invitation has been accepted successfully.',
-    };
-  }
-
-  /**
-   * Check if an invitation token is valid.
-   */
-  @Get('check/:token')
-  @ApiOperation({ summary: 'Check if an invitation token is valid.' })
-  async checkInvite(@Param('token') token: string) {
-    const inviteDetails = await this.usersApplication.checkInvite(token);
-
-    return inviteDetails;
-  }
-
   /**
    * Send an invitation to a new user.
    */

packages/server/src/modules/UsersModule/UsersInvitePublic.controller.ts

@@ -0,0 +1,39 @@
+import { Body, Controller, Get, Param, Post } from '@nestjs/common';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
+import { PublicRoute } from '@/modules/Auth/guards/jwt.guard';
+import { UsersApplication } from './Users.application';
+import { InviteUserDto } from './dtos/InviteUser.dto';
+
+@Controller('invite')
+@ApiTags('Users')
+@PublicRoute()
+export class UsersInvitePublicController {
+  constructor(private readonly usersApplication: UsersApplication) {}
+
+  /**
+   * Accept a user invitation.
+   */
+  @Post('accept/:token')
+  @ApiOperation({ summary: 'Accept a user invitation.' })
+  async acceptInvite(
+    @Param('token') token: string,
+    @Body() inviteUserDTO: InviteUserDto,
+  ) {
+    await this.usersApplication.acceptInvite(token, inviteUserDTO);
+
+    return {
+      message: 'The invitation has been accepted successfully.',
+    };
+  }
+
+  /**
+   * Check if an invitation token is valid.
+   */
+  @Get('check/:token')
+  @ApiOperation({ summary: 'Check if an invitation token is valid.' })
+  async checkInvite(@Param('token') token: string) {
+    const inviteDetails = await this.usersApplication.checkInvite(token);
+
+    return inviteDetails;
+  }
+}

packages/server/src/modules/UsersModule/commands/AcceptInviteUser.service.ts

@@ -1,6 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import * as moment from 'moment';
 import { EventEmitter2 } from '@nestjs/event-emitter';
+import { ClsService } from 'nestjs-cls';
 import {
   IAcceptInviteEventPayload,
   ICheckInviteEventPayload,
@@ -15,6 +16,11 @@ import { UserInvite } from '../models/InviteUser.model';
 import { ModelObject } from 'objection';
 import { InviteUserDto } from '../dtos/InviteUser.dto';
 
+interface InviteAcceptResponseDto {
+  inviteToken: { email: string, token: string, createdAt: Date };
+  orgName: string 
+}
+
 @Injectable()
 export class AcceptInviteUserService {
   constructor(
@@ -27,6 +33,7 @@ export class AcceptInviteUserService {
     @Inject(UserInvite.name)
     private readonly userInviteModel: typeof UserInvite,
     private readonly eventEmitter: EventEmitter2,
+    private readonly cls: ClsService,
   ) {}
 
   /**
@@ -62,6 +69,16 @@ export class AcceptInviteUserService {
     // Clear invite token by the given user id.
     await this.clearInviteTokensByUserId(inviteToken.userId);
 
+    // Retrieve the tenant to get the organizationId for CLS.
+    const tenant = await this.tenantModel
+      .query()
+      .findById(inviteToken.tenantId);
+
+    // Set CLS values for tenant context before triggering sync events.
+    this.cls.set('tenantId', inviteToken.tenantId);
+    this.cls.set('userId', systemUser.id);
+    this.cls.set('organizationId', tenant.organizationId);
+
     // Triggers `onUserAcceptInvite` event.
     await this.eventEmitter.emitAsync(events.inviteUser.acceptInvite, {
       inviteToken,
@@ -77,7 +94,7 @@ export class AcceptInviteUserService {
    */
   public async checkInvite(
     token: string,
-  ): Promise<{ inviteToken: ModelObject<UserInvite>; orgName: string }> {
+  ): Promise<InviteAcceptResponseDto> {
     const inviteToken = await this.getInviteTokenOrThrowError(token);
 
     // Find the tenant that associated to the given token.
@@ -92,7 +109,16 @@ export class AcceptInviteUserService {
       tenant,
     } as ICheckInviteEventPayload);
 
-    return { inviteToken, orgName: tenant.metadata.name };
+    // Explicitly convert to plain object to ensure all fields are serialized
+    const result = {
+      inviteToken: {
+        email: inviteToken.email,
+        token: inviteToken.token,
+        createdAt: inviteToken.createdAt,
+      },
+      orgName: tenant.metadata.name,
+    };
+    return result;
   }
 
   /**

packages/server/src/modules/UsersModule/commands/SendInviteUsersMailMessage.service.ts

@@ -28,7 +28,7 @@ export class SendInviteUsersMailMessage {
   ) {
     const tenant = await this.tenancyContext.getTenant(true);
     const root = path.join(global.__images_dirname, '/bigcapital.png');
-    const baseURL = this.configService.get('baseURL');
+    const baseURL = this.configService.get('app.baseUrl');
 
     const mail = new Mail()
       .setSubject(`${fromUser.firstName} has invited you to join a Bigcapital`)

packages/server/src/modules/UsersModule/models/InviteUser.model.ts

@@ -6,6 +6,7 @@ export class UserInvite extends BaseModel {
   userId!: number;
   tenantId!: number;
   email!: string;
+  createdAt!: Date;
 
   /**
    * Table name.
@@ -32,4 +33,11 @@ export class UserInvite extends BaseModel {
       },
     };
   }
+
+  /**
+   * Called before inserting a new record.
+   */
+  $beforeInsert() {
+    this.createdAt = new Date();
+  }
 }

packages/server/src/modules/UsersModule/subscribers/InviteSendMailNotification.subscriber.ts

@@ -37,7 +37,7 @@ export default class InviteSendMainNotificationSubscribe {
     const organizationId = tenant.organizationId;
     const userId = authedUser.id;
 
-    this.sendInviteMailQueue.add(SendInviteUserMailJob, {
+    await this.sendInviteMailQueue.add(SendInviteUserMailJob, {
       fromUser: invitingUser,
       invite,
       userId,

packages/server/src/modules/UsersModule/subscribers/SyncTenantAcceptInvite.subscriber.ts

@@ -1,4 +1,4 @@
-import { omit } from 'lodash';
+import { pick } from 'lodash';
 import * as moment from 'moment';
 import { Inject, Injectable } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
@@ -22,13 +22,12 @@ export class SyncTenantAcceptInviteSubscriber {
   async syncTenantAcceptInvite({
     inviteToken,
     user,
-    inviteUserDTO,
   }: IAcceptInviteEventPayload) {
     await this.tenantUserModel()
       .query()
       .where('systemUserId', inviteToken.userId)
       .update({
-        ...omit(inviteUserDTO, ['password']),
+        ...pick(user, ['firstName', 'lastName', 'email', 'active']),
         inviteAcceptedAt: moment().format('YYYY-MM-DD'),
       });
   }

packages/webapp/src/constants/cashflowOptions.tsx

@@ -19,7 +19,7 @@ export const getAddMoneyInOptions = () => [
 export const getAddMoneyOutOptions = () => [
   {
     name: intl.get('banking.owner_drawings'),
-    value: 'OwnerDrawing',
+    value: 'owner_drawing',
   },
   {
     name: intl.get('banking.expenses'),
@@ -31,11 +31,11 @@ export const getAddMoneyOutOptions = () => [
   },
 ];
 
-export const TRANSACRIONS_TYPE = [
+export const TRANSACTIONS_TYPE = [
   'OwnerContribution',
   'OtherIncome',
   'TransferFromAccount',
-  'OnwersDrawing',
+  'OwnerDrawing',
   'OtherExpense',
   'TransferToAccount',
 ];

packages/webapp/src/containers/Authentication/InviteAcceptForm.tsx

@@ -58,7 +58,7 @@ export default function InviteAcceptForm() {
             data: { errors },
           },
         }) => {
-          if (errors.find((e) => e.type === 'INVITE.TOKEN.NOT.FOUND')) {
+          if (errors.find((e) => e.type === 'INVITE_TOKEN_INVALID')) {
             AppToaster.show({
               message: intl.get('an_unexpected_error_occurred'),
               intent: Intent.DANGER,
@@ -71,14 +71,6 @@ export default function InviteAcceptForm() {
               phone_number: 'This phone number is used in another account.',
             });
           }
-          if (errors.find((e) => e.type === 'INVITE.TOKEN.NOT.FOUND')) {
-            AppToaster.show({
-              message: intl.get('an_unexpected_error_occurred'),
-              intent: Intent.DANGER,
-              position: Position.BOTTOM,
-            });
-            history.push('/auth/login');
-          }
           setSubmitting(false);
         },
       );

packages/webapp/src/containers/Authentication/InviteAcceptProvider.tsx

@@ -29,14 +29,22 @@ function InviteAcceptProvider({ token, ...props }) {
     if (inviteMetaError) { history.push('/auth/login'); }
   }, [history, inviteMetaError]);
 
+  // Transform the backend response to match frontend expectations.
+  const transformedInviteMeta = inviteMeta
+    ? {
+        email: inviteMeta.inviteToken?.email,
+        organizationName: inviteMeta.orgName,
+      }
+    : null;
+
   // Provider payload.
   const provider = {
     token,
-    inviteMeta,
+    inviteMeta: transformedInviteMeta,
     inviteMetaError,
     isInviteMetaError,
     isInviteMetaLoading,
-    inviteAcceptMutate
+    inviteAcceptMutate,
   };
 
   if (inviteMetaError) {
@@ -45,7 +53,6 @@ function InviteAcceptProvider({ token, ...props }) {
 
   return (
     <InviteAcceptLoading isLoading={isInviteMetaLoading}>
-      { isInviteMetaError }
       <InviteAcceptContext.Provider value={provider} {...props} />
     </InviteAcceptLoading>
   );

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionFormContent.tsx

@@ -92,7 +92,7 @@ function CategorizeTransactionFormSubContent() {
   } else if (values.transactionType === 'transfer_to_account') {
     return <CategorizeTransactionToAccount />;
     // Owner drawings.
-  } else if (values.transactionType === 'OwnerDrawing') {
+  } else if (values.transactionType === 'owner_drawing') {
     return <CategorizeTransactionOwnerDrawings />;
   }
   return null;

packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx

@@ -23,6 +23,8 @@ import {
   FFormGroup,
   FTextArea,
   FMoneyInputGroup,
+  Icon,
+  FDateInput,
 } from '@/components';
 import { CLASSES, ACCOUNT_TYPE, Features } from '@/constants';
 

packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx

@@ -17,6 +17,7 @@ import {
   FTextArea,
   FInputGroup,
   FDateInput,
+  Icon,
 } from '@/components';
 import { ACCOUNT_TYPE, CLASSES, Features } from '@/constants';
 import {

packages/webapp/src/containers/CashFlow/MoneyInDialog/utils.tsx

@@ -46,4 +46,8 @@ export const BranchRowDivider = styled.div`
   height: 1px;
   background: #ebf1f6;
   margin-bottom: 15px;
+
+  .bp4-dark & {
+    background: var(--color-dark-gray5);
+  }
 `;

packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutContentFields.tsx

@@ -17,7 +17,7 @@ function MoneyOutContentFields() {
 
   const transactionType = useMemo(() => {
     switch (values.transaction_type) {
-      case 'OwnerDrawing':
+      case 'owner_drawing':
         return <OwnerDrawingsFormFields />;
 
       case 'other_expense':

packages/webapp/src/containers/CashFlow/MoneyOutDialog/utils.tsx

@@ -45,4 +45,8 @@ export const BranchRowDivider = styled.div`
   height: 1px;
   background: #ebf1f6;
   margin-bottom: 15px;
+
+  .bp4-dark & {
+    background: var(--color-dark-gray5);
+  }
 `;

packages/webapp/src/hooks/query/invite.tsx

@@ -2,6 +2,7 @@
 import { useMutation } from 'react-query';
 import { useRequestQuery } from '../useQueryRequest';
 import useApiRequest from '../useRequest';
+import { transformToCamelCase } from '@/utils';
 
 /**
  * Authentication invite accept.
@@ -22,9 +23,9 @@ export const useAuthInviteAccept = (props) => {
 export const useInviteMetaByToken = (token, props) => {
   return useRequestQuery(
     ['INVITE_META', token],
-    { method: 'get', url: `invite/invited/${token}` },
+    { method: 'get', url: `invite/check/${token}` },
     {
-      select: (res) => res.data,
+      select: (res) => transformToCamelCase(res.data),
       ...props
     }
   );