docs: update .all-contributorsrc [skip ci]

docker-compose.prod.yml

@@ -82,9 +82,6 @@ services:
       - SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
       - SIGNUP_ALLOWED_EMAILS=${SIGNUP_ALLOWED_EMAILS}
 
-      # Sign-up email confirmation
-      - SIGNUP_EMAIL_CONFIRMATION=${SIGNUP_EMAIL_CONFIRMATION}
-
       # Gotenberg (Pdf generator)
       - GOTENBERG_URL=${GOTENBERG_URL}
       - GOTENBERG_DOCS_URL=${GOTENBERG_DOCS_URL}
@@ -111,8 +108,7 @@ services:
       - NEW_RELIC_AI_MONITORING_ENABLED=${NEW_RELIC_AI_MONITORING_ENABLED}
       - NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED}
       - NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED}
-      - NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY}
+
-      - NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME}
 
   database_migration:
     container_name: bigcapital-database-migration

packages/server/src/api/controllers/Accounts.ts

@@ -207,6 +207,7 @@ export default class AccountsController extends BaseController {
         tenantId,
         accountDTO
       );
+
       return res.status(200).send({
         id: account.id,
         message: 'The account has been created successfully.',

packages/server/src/api/controllers/Export/ExportController.ts

@@ -14,7 +14,7 @@ export class ExportController extends BaseController {
   /**
    * Router constructor method.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -53,7 +53,6 @@ export class ExportController extends BaseController {
         query.resource,
         acceptType === ACCEPT_TYPE.APPLICATION_XLSX ? 'xlsx' : 'csv'
       );
-      // Retrieves the csv format.
       if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
         res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
         res.setHeader('Content-Type', 'text/csv');

packages/server/src/api/controllers/Import/ImportController.ts

@@ -16,7 +16,7 @@ export class ImportController extends BaseController {
   /**
    * Router constructor method.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.post(
@@ -240,7 +240,11 @@ export class ImportController extends BaseController {
           errors: [{ type: 'IMPORTED_FILE_EXTENSION_INVALID' }],
         });
       }
+      return res.status(400).send({
+        errors: [{ type: error.errorType }],
+      });
     }
+
     next(error);
   }
 }

packages/server/src/api/controllers/ManualJournals.ts

@@ -77,14 +77,14 @@ export default class ManualJournalsController extends BaseController {
   /**
    * Specific manual journal id param validation schema.
    */
-  private get manualJournalParamSchema() {
+  get manualJournalParamSchema() {
     return [param('id').exists().isNumeric().toInt()];
   }
 
   /**
    * Manual journal DTO schema.
    */
-  private get manualJournalValidationSchema() {
+  get manualJournalValidationSchema() {
     return [
       check('date').exists().isISO8601(),
       check('currency_code').optional(),
@@ -154,7 +154,7 @@ export default class ManualJournalsController extends BaseController {
   /**
    * Manual journals list validation schema.
    */
-  private get manualJournalsListSchema() {
+  get manualJournalsListSchema() {
     return [
       query('page').optional().isNumeric().toInt(),
       query('page_size').optional().isNumeric().toInt(),
@@ -320,7 +320,7 @@ export default class ManualJournalsController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private getManualJournalsList = async (
+  getManualJournalsList = async (
     req: Request,
     res: Response,
     next: NextFunction

packages/server/src/api/controllers/OrganizationDashboard.ts

@@ -33,17 +33,17 @@ export default class OrganizationDashboardController extends BaseController {
   }
 
   /**
-   * Detarmines whether the current authed organization to able to change its currency/.
+   *
-   * @param {Request} req
+   * @param req
-   * @param {Response} res
+   * @param res
-   * @param {NextFunction} next
+   * @param next
-   * @returns {Response|void}
+   * @returns
    */
   private async baseCurrencyMutateAbility(
     req: Request,
     res: Response,
     next: Function
-  ): Promise<Response|void> {
+  ) {
     const { tenantId } = req;
 
     try {

packages/server/src/api/controllers/Projects/Projects.ts

@@ -29,7 +29,8 @@ export class ProjectsController extends BaseController {
         check('cost_estimate').exists().isDecimal(),
       ],
       this.validationResult,
-      asyncMiddleware(this.createProject.bind(this))
+      asyncMiddleware(this.createProject.bind(this)),
+      this.catchServiceErrors
     );
     router.post(
       '/:id',
@@ -42,7 +43,8 @@ export class ProjectsController extends BaseController {
         check('cost_estimate').exists().isDecimal(),
       ],
       this.validationResult,
-      asyncMiddleware(this.editProject.bind(this))
+      asyncMiddleware(this.editProject.bind(this)),
+      this.catchServiceErrors
     );
     router.patch(
       '/:projectId/status',
@@ -54,14 +56,16 @@ export class ProjectsController extends BaseController {
           .isIn([IProjectStatus.InProgress, IProjectStatus.Closed]),
       ],
       this.validationResult,
-      asyncMiddleware(this.editProject.bind(this))
+      asyncMiddleware(this.editProject.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/:id',
       CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
       [param('id').exists().isInt().toInt()],
       this.validationResult,
-      asyncMiddleware(this.getProject.bind(this))
+      asyncMiddleware(this.getProject.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/:projectId/billable/entries',
@@ -72,21 +76,24 @@ export class ProjectsController extends BaseController {
         query('to_date').optional().isISO8601(),
       ],
       this.validationResult,
-      asyncMiddleware(this.projectBillableEntries.bind(this))
+      asyncMiddleware(this.projectBillableEntries.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/',
       CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
       [],
       this.validationResult,
-      asyncMiddleware(this.getProjects.bind(this))
+      asyncMiddleware(this.getProjects.bind(this)),
+      this.catchServiceErrors
     );
     router.delete(
       '/:id',
       CheckPolicies(ProjectAction.DELETE, AbilitySubject.Project),
       [param('id').exists().isInt().toInt()],
       this.validationResult,
-      asyncMiddleware(this.deleteProject.bind(this))
+      asyncMiddleware(this.deleteProject.bind(this)),
+      this.catchServiceErrors
     );
     return router;
   }
@@ -245,4 +252,22 @@ export class ProjectsController extends BaseController {
       next(error);
     }
   };
+
+  /**
+   * Transforms service errors to response.
+   * @param {Error}
+   * @param {Request} req
+   * @param {Response} res
+   * @param {ServiceError} error
+   */
+  private catchServiceErrors(
+    error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    if (error instanceof ServiceError) {
+    }
+    next(error);
+  }
 }

packages/server/src/api/controllers/Users.ts

@@ -155,7 +155,6 @@ export default class UsersController extends BaseController {
 
     try {
       const user = await this.usersService.getUser(tenantId, userId);
-
       return res.status(200).send({ user });
     } catch (error) {
       next(error);
@@ -230,7 +229,7 @@ export default class UsersController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private catchServiceErrors(
+  catchServiceErrors(
     error: Error,
     req: Request,
     res: Response,

packages/server/src/api/controllers/Warehouses/index.ts

@@ -17,7 +17,7 @@ export class WarehousesController extends BaseController {
    *
    * @returns
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.post(

packages/server/src/api/controllers/Webhooks/Webhooks.ts

@@ -34,21 +34,14 @@ export class Webhooks extends BaseController {
    * @param {Response} res
    * @returns {Response}
    */
-  public async lemonWebhooks(req: Request, res: Response, next: any) {
+  public async lemonWebhooks(req: Request, res: Response) {
     const data = req.body;
     const signature = req.headers['x-signature'] ?? '';
     const rawBody = req.rawBody;
 
-    try {
+    await this.lemonWebhooksService.handlePostWebhook(rawBody, data, signature);
-      await this.lemonWebhooksService.handlePostWebhook(
+
-        rawBody,
-        data,
-        signature
-      );
     return res.status(200).send();
-    } catch (error) {
-      next(error);
-    }
   }
 
   /**

packages/server/src/api/exceptions/GlobalErrorException.ts

@@ -1,20 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-
-/**
- * Global error handler.
- * @param {Error} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function GlobalErrorException(
-  err: Error,
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  console.error(err.stack);
-
-  res.status(500);
-  res.boom.badImplementation('', { stack: err.stack });
-}

packages/server/src/api/exceptions/ServiceErrorException.ts

@@ -1,25 +0,0 @@
-import { NextFunction, Request, Response } from 'express';
-import { ServiceError } from '@/exceptions';
-
-/**
- * Handles service error exception.
- * @param {Error | ServiceError} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function ServiceErrorException(
-  err: Error | ServiceError,
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  if (err instanceof ServiceError) {
-    res.boom.badRequest('', {
-      errors: [{ type: err.errorType, message: err.message }],
-      type: 'ServiceError',
-    });
-  } else {
-    next(err);
-  }
-}

packages/server/src/api/middleware/ObjectionErrorHandlerMiddleware.ts

@@ -10,14 +10,8 @@ import {
   DataError,
 } from 'objection';
 
-/**
+// In this example `res` is an express response object.
- * Handles the Objection error exception.
+export default function ObjectionErrorHandlerMiddleware(
- * @param {Error} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function ObjectionErrorException(
   err: Error,
   req: Request,
   res: Response,
@@ -114,7 +108,6 @@ export function ObjectionErrorException(
       type: 'UnknownDatabaseError',
       data: {},
     });
-  } else {
-    next(err);
   }
+  next(err);
 }

packages/server/src/loaders/express.ts

@@ -17,9 +17,7 @@ import {
 } from '@/api/middleware/JSONResponseTransformer';
 import config from '@/config';
 import path from 'path';
-import { ObjectionErrorException } from '@/api/exceptions/ObjectionErrorException';
+import ObjectionErrorHandlerMiddleware from '@/api/middleware/ObjectionErrorHandlerMiddleware';
-import { ServiceErrorException } from '@/api/exceptions/ServiceErrorException';
-import { GlobalErrorException } from '@/api/exceptions/GlobalErrorException';
 
 export default ({ app }) => {
   // Express configuration.
@@ -32,6 +30,9 @@ export default ({ app }) => {
   // Helmet helps you secure your Express apps by setting various HTTP headers.
   app.use(helmet());
 
+  // Allow to full error stack traces and internal details
+  app.use(errorHandler());
+
   // Boom response objects.
   app.use(boom());
 
@@ -64,10 +65,8 @@ export default ({ app }) => {
   // Agendash application load.
   app.use('/agendash', AgendashController.router());
 
-  // Handles errors.
+  // Handles objectionjs errors.
-  app.use(ObjectionErrorException);
+  app.use(ObjectionErrorHandlerMiddleware);
-  app.use(ServiceErrorException);
-  app.use(GlobalErrorException);
 
   // catch 404 and forward to error handler
   app.use((req: Request, res: Response, next: NextFunction) => {

packages/server/src/services/ManualJournals/CommandManualJournalValidators.ts

@@ -1,4 +1,4 @@
-import { difference, isEmpty } from 'lodash';
+import { difference } from 'lodash';
 import { Service, Inject } from 'typedi';
 import { ServiceError } from '@/exceptions';
 import {
@@ -244,12 +244,16 @@ export class CommandManualJournalValidators {
   /**
    * Validates the manual journal number require.
    * @param {string} journalNumber
-   * @throws {ServiceError(ERRORS.MANUAL_JOURNAL_NO_REQUIRED)}
    */
   public validateJournalNoRequireWhenAutoNotEnabled = (
+    tenantId: number,
     journalNumber: string
   ) => {
-    if (isEmpty(journalNumber)) {
+    // Retrieve the next manual journal number.
+    const autoIncrmenetEnabled =
+      this.autoIncrement.autoIncrementEnabled(tenantId);
+
+    if (!journalNumber || !autoIncrmenetEnabled) {
       throw new ServiceError(ERRORS.MANUAL_JOURNAL_NO_REQUIRED);
     }
   };

packages/server/src/services/ManualJournals/CreateManualJournal.ts

@@ -99,6 +99,7 @@ export class CreateManualJournalService {
 
     // Validate manual journal number require when auto-increment not enabled.
     this.validator.validateJournalNoRequireWhenAutoNotEnabled(
+      tenantId,
       manualJournalDTO.journalNumber
     );
     // Validate manual journal uniquiness on the storage.

packages/server/src/services/Sales/AutoIncrementOrdersService.ts

@@ -15,8 +15,10 @@ export default class AutoIncrementOrdersService {
     const group = settingsGroup;
 
     // Settings service transaction number and prefix.
-    return settings.get({ group, key: 'auto_increment' }, false);
+    const autoIncrement = settings.get({ group, key: 'auto_increment' }, false);
-  };
+
+    return parseBoolean(autoIncrement, false);
+  }
 
   /**
    * Retrieve the next service transaction number.
@@ -25,16 +27,17 @@ export default class AutoIncrementOrdersService {
    * @param {Function} getMaxTransactionNo
    * @return {Promise<string>}
    */
-  getNextTransactionNumber(tenantId: number, group: string): string {
+  getNextTransactionNumber(tenantId: number, settingsGroup: string): string {
     const settings = this.tenancy.settings(tenantId);
+    const group = settingsGroup;
 
     // Settings service transaction number and prefix.
-    const autoIncrement = this.autoIncrementEnabled(tenantId, group);
+    const autoIncrement = settings.get({ group, key: 'auto_increment' }, false);
 
     const settingNo = settings.get({ group, key: 'next_number' }, '');
     const settingPrefix = settings.get({ group, key: 'number_prefix' }, '');
 
-    return autoIncrement ? `${settingPrefix}${settingNo}` : '';
+    return parseBoolean(autoIncrement, false) ? `${settingPrefix}${settingNo}` : '';
   }
 
   /**
@@ -50,9 +53,7 @@ export default class AutoIncrementOrdersService {
     const autoIncrement = settings.get({ group, key: 'auto_increment' });
 
     // Can't continue if the auto-increment of the service was disabled.
-    if (!autoIncrement) {
+    if (!autoIncrement) { return; }
-      return;
-    }
 
     settings.set(
       { group, key: 'next_number' },

packages/server/src/services/Subscription/LemonSqueezyWebhooks.ts

@@ -10,7 +10,6 @@ import {
 } from './utils';
 import { Plan } from '@/system/models';
 import { Subscription } from './Subscription';
-import { isEmpty } from 'lodash';
 
 @Service()
 export class LemonSqueezyWebhooks {
@@ -33,9 +32,6 @@ export class LemonSqueezyWebhooks {
     if (!config.lemonSqueezy.webhookSecret) {
       throw new Error('Lemon Squeezy Webhook Secret not set in .env');
     }
-    if (!signature) {
-      throw new Error('Request signature is required.');
-    }
     const secret = config.lemonSqueezy.webhookSecret;
     const hmacSignature = createHmacSignature(secret, rawData);
 
@@ -100,7 +96,7 @@ export class LemonSqueezyWebhooks {
           if (webhookEvent === 'subscription_created') {
             await this.subscriptionService.newSubscribtion(
               tenantId,
-              'early-adaptor'
+              'early-adaptor',
             );
           }
         }

packages/server/src/utils/index.ts

@@ -337,9 +337,6 @@ const booleanValues: string[] = [
 ].map((value) => normalizeValue(value));
 
 export const parseBoolean = <T>(value: any, defaultValue: T): T | boolean => {
-  if (typeof value === 'boolean') {
-    return value; // Retrun early we have nothing to parse.
-  }
   const normalizedValue = normalizeValue(value);
   if (isEmpty(value) || booleanValues.indexOf(normalizedValue) === -1) {
     return defaultValue;

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

@@ -9,11 +9,7 @@ import AuthInsider from '@/containers/Authentication/AuthInsider';
 import { useAuthLogin, useAuthRegister } from '@/hooks/query/authentication';
 
 import RegisterForm from './RegisterForm';
-import {
+import { RegisterSchema, transformRegisterErrorsToForm, transformRegisterToastMessages } from './utils';
-  RegisterSchema,
-  transformRegisterErrorsToForm,
-  transformRegisterToastMessages,
-} from './utils';
 import {
   AuthFooterLinks,
   AuthFooterLink,
@@ -36,7 +32,7 @@ export default function RegisterUserForm() {
 
   const handleSubmit = (values, { setSubmitting, setErrors }) => {
     authRegisterMutate(values)
-      .then(() => {
+      .then((response) => {
         authLoginMutate({
           crediential: values.email,
           password: values.password,
@@ -91,10 +87,7 @@ function RegisterFooterLinks() {
   return (
     <AuthFooterLinks>
       <AuthFooterLink>
-        <T id={'return_to'} />{' '}
+        <T id={'return_to'} /> <Link to={'/auth/login'}><T id={'sign_in'} /></Link>
-        <Link to={'/auth/login'}>
-          <T id={'sign_in'} />
-        </Link>
       </AuthFooterLink>
 
       <AuthFooterLink>

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

@@ -4,7 +4,7 @@ import AuthInsider from './AuthInsider';
 import { AuthInsiderCard } from './_components';
 import styles from './RegisterVerify.module.scss';
 import { AppToaster, Stack } from '@/components';
-import { useAuthActions, useAuthUserVerifyEmail } from '@/hooks/state';
+import { useAuthActions } from '@/hooks/state';
 import { useAuthSignUpVerifyResendMail } from '@/hooks/query';
 import { AuthContainer } from './AuthContainer';
 
@@ -13,8 +13,6 @@ export default function RegisterVerify() {
   const { mutateAsync: resendSignUpVerifyMail, isLoading } =
     useAuthSignUpVerifyResendMail();
 
-  const emailAddress = useAuthUserVerifyEmail();
-
   const handleResendMailBtnClick = () => {
     resendSignUpVerifyMail()
       .then(() => {
@@ -40,8 +38,8 @@ export default function RegisterVerify() {
         <AuthInsiderCard className={styles.root}>
           <h2 className={styles.title}>Please verify your email</h2>
           <p className={styles.description}>
-            We sent an email to <strong>{emailAddress}</strong> Click the link
+            We sent an email to <strong>asdahmed@gmail.com</strong> Click the
-            inside to get started.
+            link inside to get started.
           </p>
 
           <Stack spacing={4}>

packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlansSection.tsx

@@ -1,8 +1,10 @@
 // @ts-nocheck
-import { Callout } from '@blueprintjs/core';
+import { T } from '@/components';
+
 import { SubscriptionPlans } from './SubscriptionPlan';
 import withPlans from '../../Subscriptions/withPlans';
 import { compose } from '@/utils';
+import { Callout, Intent } from '@blueprintjs/core';
 
 /**
  * Billing plans.
@@ -13,11 +15,10 @@ function SubscriptionPlansSectionRoot({ plans }) {
       <Callout
         style={{ marginBottom: '1.5rem' }}
         icon={null}
-        title={'Early Adopter Plan'}
+        title={'Early Adaptors Plan'}
       >
-        We're looking for 200 early adopters, when you subscribe you'll get the
+        We're looking for 200 early adaptors, when you subscribe you'll get
-        full features and unlimited users for a year regardless of the
+        the full features and unlimited users for a year regardless of the subscribed plan.
-        subscribed plan.
       </Callout>
       <SubscriptionPlans plans={plans} />
     </section>

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

@@ -1,17 +1,9 @@
 // @ts-nocheck
 import { useMutation } from 'react-query';
-import { batch } from 'react-redux';
 import useApiRequest from '../useRequest';
 import { setCookie } from '../../utils';
 import { useRequestQuery } from '../useQueryRequest';
 import t from './types';
-import {
-  useSetAuthToken,
-  useSetAuthUserId,
-  useSetLocale,
-  useSetOrganizationId,
-  useSetTenantId,
-} from '../state';
 
 /**
  * Saves the response data to cookies.
@@ -32,30 +24,14 @@ function setAuthLoginCookies(data) {
 export const useAuthLogin = (props) => {
   const apiRequest = useApiRequest();
 
-  const setAuthToken = useSetAuthToken();
-  const setOrganizationId = useSetOrganizationId();
-  const setUserId = useSetAuthUserId();
-  const setTenantId = useSetTenantId();
-  const setLocale = useSetLocale();
-
   return useMutation((values) => apiRequest.post('auth/login', values), {
     select: (res) => res.data,
-    onSuccess: (res) => {
+    onSuccess: (data) => {
       // Set authentication cookies.
-      setAuthLoginCookies(res.data);
+      setAuthLoginCookies(data.data);
 
-      batch(() => {
+      // Reboot the application.
-        // Sets the auth metadata to global state.
+      window.location.reload();
-        setAuthToken(res.data.token);
-        setOrganizationId(res.data.tenant.organization_id);
-        setUserId(res.data.user.id);
-        setTenantId(res.data.tenant.id);
-
-        if (res.data?.tenant?.metadata?.language) {
-          setLocale(res.data?.tenant?.metadata?.language);
-        }
-      });
-      props?.onSuccess && props?.onSuccess(...args);
     },
     ...props,
   });

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

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { useEffect } from 'react';
 import { useMutation, useQueryClient } from 'react-query';
-import { useRequestQuery } from '../useQueryRequest';
+import { useQueryTenant, useRequestQuery } from '../useQueryRequest';
 import useApiRequest from '../useRequest';
 import { useSetFeatureDashboardMeta } from '../state/feature';
 import t from './types';
@@ -143,7 +143,7 @@ export function useAuthenticatedAccount(props) {
       select: (response) => response.data.data,
       defaultData: {},
       onSuccess: (data) => {
-        setEmailConfirmed(data.is_verified, data.email);
+        setEmailConfirmed(data.is_verified);
       },
       ...props,
     },

packages/webapp/src/hooks/state/authentication.tsx

@@ -3,13 +3,8 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useCallback } from 'react';
 import { isAuthenticated } from '@/store/authentication/authentication.reducer';
 import {
-  setAuthTenantId,
-  setAuthToken,
-  setAuthUserId,
   setEmailConfirmed,
   setLogin,
-  setOrganizationId,
-  setLocale,
 } from '@/store/authentication/authentication.actions';
 import { useQueryClient } from 'react-query';
 import { removeCookie } from '@/utils';
@@ -80,14 +75,6 @@ export const useAuthUserVerified = () => {
   return useSelector((state) => state.authentication.verified);
 };
 
-/**
- * Retrieves the user's email address.
- * @returns {string}
- */
-export const useAuthUserVerifyEmail = () => {
-  return useSelector((state) => state.authentication.verifyEmail);
-};
-
 /**
  * Sets the user's email verification status.
  */
@@ -95,53 +82,7 @@ export const useSetAuthEmailConfirmed = () => {
   const dispatch = useDispatch();
 
   return useCallback(
-    (verified?: boolean = true, email: string) =>
+    (verified?: boolean = true) => dispatch(setEmailConfirmed(verified)),
-      dispatch(setEmailConfirmed(verified, email)),
-    [dispatch],
-  );
-};
-
-export const useSetOrganizationId = () => {
-  const dispatch = useDispatch();
-
-  return useCallback(
-    (organizationId: string) => dispatch(setOrganizationId(organizationId)),
-    [dispatch],
-  );
-};
-
-export const useSetAuthToken = () => {
-  const dispatch = useDispatch();
-
-  return useCallback(
-    (authToken: string) => dispatch(setAuthToken(authToken)),
-    [dispatch],
-  );
-};
-
-export const useSetTenantId = () => {
-  const dispatch = useDispatch();
-
-  return useCallback(
-    (tenantId: string) => dispatch(setAuthTenantId(tenantId)),
-    [dispatch],
-  );
-};
-
-export const useSetAuthUserId = () => {
-  const dispatch = useDispatch();
-
-  return useCallback(
-    (userId: string) => dispatch(setAuthUserId(userId)),
-    [dispatch],
-  );
-};
-
-export const useSetLocale = () => {
-  const dispatch = useDispatch();
-
-  return useCallback(
-    (locale: string) => dispatch(setLocale(locale)),
     [dispatch],
   );
 };

packages/webapp/src/store/authentication/authentication.actions.tsx

@@ -4,27 +4,7 @@ import t from '@/store/types';
 export const setLogin = () => ({ type: t.LOGIN_SUCCESS });
 export const setLogout = () => ({ type: t.LOGOUT });
 export const setStoreReset = () => ({ type: t.RESET });
-export const setEmailConfirmed = (verified?: boolean, email?: string) => ({
+export const setEmailConfirmed = (verified?: boolean) => ({
   type: t.SET_EMAIL_VERIFIED,
-  action: { verified, email },
+  action: { verified },
-});
-export const setOrganizationId = (organizationId: string) => ({
-  type: t.SET_ORGANIZATIOIN_ID,
-  action: { organizationId },
-});
-export const setAuthToken = (token: string) => ({
-  type: t.SET_AUTH_TOKEN,
-  action: { token },
-});
-export const setAuthTenantId = (tenantId: string) => ({
-  type: t.SET_TENANT_ID,
-  action: { tenantId },
-});
-export const setAuthUserId = (userId: string) => ({
-  type: t.SET_USER_ID,
-  action: { userId },
-});
-export const setLocale = (locale: string) => ({
-  type: t.SET_LOCALE,
-  action: { locale },
 });

packages/webapp/src/store/authentication/authentication.reducer.tsx

@@ -9,13 +9,12 @@ import t from '@/store/types';
 
 // Read stored data in cookies and merge it with the initial state.
 const initialState = {
-  token: getCookie('token') || null,
+  token: getCookie('token'),
-  organizationId: getCookie('organization_id') || null,
+  organizationId: getCookie('organization_id'),
-  tenantId: getCookie('tenant_id') || null,
+  tenantId: getCookie('tenant_id'),
-  userId: getCookie('authenticated_user_id') || null,
+  userId: getCookie('authenticated_user_id'),
-  locale: getCookie('locale') || 'en',
+  locale: getCookie('locale'),
   verified: true, // Let's be optimistic and assume the user's email is confirmed.
-  verifyEmail: null,
   errors: [],
 };
 
@@ -37,35 +36,11 @@ const reducerInstance = createReducer(initialState, {
 
   [t.SET_EMAIL_VERIFIED]: (
     state,
-    payload: PayloadAction<{ verified?: boolean; email?: string }>,
+    payload: PayloadAction<{ verified?: boolean }>,
   ) => {
     state.verified = !isUndefined(payload.action.verified)
       ? payload.action.verified
       : true;
-    state.verifyEmail = payload.action.email || null;
-
-    if (state.verified) {
-      state.verifyEmail = null;
-    }
-  },
-
-  [t.SET_AUTH_TOKEN]: (state, payload: PayloadAction<{ token: string }>) => {
-    state.token = payload.action.token;
-  },
-
-  [t.SET_ORGANIZATIOIN_ID]: (
-    state,
-    payload: PayloadAction<{ organizationId: string }>,
-  ) => {
-    state.organizationId = payload.action.organizationId;
-  },
-
-  [t.SET_TENANT_ID]: (state, payload: PayloadAction<{ tenantId: string }>) => {
-    state.tenantId = payload.action.tenantId;
-  },
-
-  [t.SET_USER_ID]: (state, payload: PayloadAction<{ userId: string }>) => {
-    state.userId = payload.action.userId;
   },
 
   [t.RESET]: (state) => {

packages/webapp/src/store/authentication/authentication.types.tsx

@@ -7,10 +7,5 @@ export default {
   LOGOUT: 'LOGOUT',
   LOGIN_CLEAR_ERRORS: 'LOGIN_CLEAR_ERRORS',
   RESET: 'RESET',
-  SET_EMAIL_VERIFIED: 'SET_EMAIL_VERIFIED',
+  SET_EMAIL_VERIFIED: 'SET_EMAIL_VERIFIED'
-  SET_AUTH_TOKEN: 'SET_AUTH_TOKEN',
-  SET_ORGANIZATIOIN_ID: 'SET_ORGANIZATIOIN_ID',
-  SET_TENANT_ID: 'SET_TENANT_ID',
-  SET_USER_ID: 'SET_USER_ID',
-  SET_LOCALE: 'SET_LOCALE',
 };