fix(server): initalize root dirs on CLI

Fix issues in authentication process.

.env.example

@@ -0,0 +1,34 @@
+# Mail
+MAIL_HOST=
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_PORT=
+MAIL_SECURE=
+MAIL_FROM_NAME=
+MAIL_FROM_ADDRESS=
+
+# Database
+DB_USER=
+DB_HOST=
+DB_PASSWORD=
+DB_CHARSET=
+
+# System database
+SYSTEM_DB_NAME=bigcapital_system
+
+# Tenants databases
+TENANT_DB_NAME_PERFIX=bigcapital_tenant_
+
+# MongoDB
+MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
+
+# Authentication
+JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
+
+# Application
+BASE_URL=https://bigcapital.ly
+CONTACT_US_MAIL=support@bigcapital.ly
+
+# Agendash
+AGENDASH_AUTH_USER=agendash
+AGENDASH_AUTH_PASSWORD=123123

.github/workflows/build-deploy-container.yml

@@ -0,0 +1,81 @@
+# This workflow will build a docker container, publish it to Github Registry.
+name: Build and Deploy Docker Container
+on:
+  release:
+    types: [created]
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  WEBAPP_IMAGE_NAME: bigcapital/bigcapital-webapp
+  SERVER_IMAGE_NAME: bigcapital/bigcapital-server
+
+jobs:
+  build-publish-webapp:
+    name: Build and deploy webapp container
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      # Login to Container registry.
+      - name: Log in to the Container registry
+        uses: docker/login-action@v1
+        with:
+            registry: ${{ env.REGISTRY }}
+            username: ${{ github.actor }}
+            password: ${{ secrets.GH_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+            images: ${{ env.REGISTRY }}/${{ env.WEBAPP_IMAGE_NAME }}
+
+      # Builds and push the Docker image.
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+            context: .
+            file: ./packages/webapp/Dockerfile
+            push: true
+            tags: ghcr.io/bigcapitalhq/webapp:latest
+            labels: ${{ steps.meta.outputs.labels }}
+
+      # Send notification to Slack channel.
+      - name: Slack Notification built and published webapp container successfully.
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+
+  build-publish-server:
+    name: Build and deploy server container
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # Login to Container registry.
+      - name: Log in to the Container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
+
+      # Builds and push the Docker image.
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./
+          file: ./packages/server/Dockerfile
+          push: true
+          tags: ghcr.io/bigcapitalhq/server:latest
+          labels: ${{ steps.meta.outputs.labels }}
+
+      # Send notification to Slack channel.
+      - name: Slack Notification built and published server container successfully.
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/docker-build.yml

@@ -1,64 +0,0 @@
-# This workflow will build a docker container, publish it to Google Container Registry, and deploy it to GKE when a release is created
-#
-# To configure this workflow:
-#
-# 1. Ensure that your repository contains the necessary configuration for your Google Kubernetes Engine cluster, including deployment.yml, kustomization.yml, service.yml, etc.
-#
-# 2. Set up secrets in your workspace: GKE_PROJECT with the name of the project and GKE_SA_KEY with the Base64 encoded JSON service account key (https://github.com/GoogleCloudPlatform/github-actions/tree/docs/service-account-key/setup-gcloud#inputs).
-#
-# 3. Change the values for the GKE_ZONE, GKE_CLUSTER, IMAGE, and DEPLOYMENT_NAME environment variables (below).
-#
-# For more support on how to run the workflow, please visit https://github.com/google-github-actions/setup-gcloud/tree/master/example-workflows/gke
-
-name: Build and Deploy Docker Container
-
-on:
-  release:
-    types: [created]
-  workflow_dispatch:
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: abouhuolia/bigcapital-webapp
-
-jobs:
-  setup-build-publish-deploy:
-    name: Setup, Build, Publish, and Deploy
-    runs-on: ubuntu-latest
-    environment: production
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    # Login to Container registry.
-    - name: Log in to the Container registry
-      uses: docker/login-action@v1
-      with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GH_TOKEN }}
-
-    - name: Extract metadata (tags, labels) for Docker
-      id: meta
-      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-      with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-    # Builds and push the Docker image.
-    - name: Build and push Docker image
-      uses: docker/build-push-action@v2
-      with:
-          context: .
-          file: ./packages/webapp/Dockerfile
-          push: true
-          tags: ghcr.io/bigcapitalhq/webapp:latest
-          labels: ${{ steps.meta.outputs.labels }}
-    # Send notification to Slack channel.
-    - name: Slack Notification built and published successfully.
-      uses: rtCamp/action-slack-notify@v2
-      env:
-        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-        
-        
-

.gitignore

@@ -1 +1,3 @@
-node_modules/
+node_modules/
+data
+.env

.vercelignore

@@ -1,5 +0,0 @@
-/*
-!package.json
-!package-lock.json
-!yarn.lock
-!packages/webapp

CHANGELOG.md

@@ -2,31 +2,95 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [1.7.4-rc.2] - 20-04-2022
+## [0.8.3] - 06-04-2023
+
+`@bigcaptial/monorepo`
+
+- Switch to AGPL license to protect application's networks. by @abouolia
+
+`@bigcapital/webapp`
+
+### Added
+
+- Improve the style of authentication pages. by @abouolia
+- Remove the phone number field from the authentication pages. by @abouolia
+- Remove the phone number field from the users management. by @abouolia
+- Add all countries options to the setup page. by @abouolia
+
+### Fixed
+
+- Fix intent type of reset password success toast.
+
+`@bigcapital/server`
+
+### Added
+
+- Remove the phone number field from the authentication service. by @abouolia
+- Remove the phone number field from the users service. by @abouolia
+
+## [0.8.1] - 26-03-2023
+
+`@bigcaptial/monorepo`
+
+### Added 
+* add docker compose for development env. by @abouolia
+
+`@bigcapital/webapp`
+
+### Fixes
+* fix: hide the project name entry if the feature was not enabled. by @abouolia
+* fix: labels of add money in/out don't appear. by @abouolia
+* fix: accounts chart lags when scrolling down. by @abouolia
+* fix: the inconsistent style of quick customer/vendor drawer. by @abouolia
+* fix: add an icon to duplicate item of items context menu. by @abouolia
+* fix: account form issues. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/86
+
+### Added
+* Optimize the design of setup organization page. by @abouolia 
+
+`@bigcapital/server`
+
+### Added
+* bigcapital CLI commands by @abouolia
+* deprecate the subscription module. @abouolia
+
+### Fixes
+* fix: Validate the max depth level of the parent account. by @abouolia
+
+## [0.7.6] - 23-04-2022
 
 `@bigcapital/webapp`
 
 ### Fixed
- - `BIG-374` Refactoring sidebar men with ability permissions and feature control on each item.
 
-## [1.7.3-rc.2] - 15-04-2022
+- `BIG-374` Refactoring sidebar men with ability permissions and feature control on each item.
+
+## [0.7.5] - 20-04-2022
+
+### Fixed.
+
+- `BIG-378` Reports drawers columns css conflict.
+
+## [0.7.3] - 15-04-2022
 
 `@bigcapital/webapp`
 
 ### Fixed
-  - `BIG-372` Activate branches and warehouses dialog reloading once activating.
-  - `BIG-373` Issue general ledger report select specific account.
-  - `BIG-377` Make readonly details entries as oneline with tooltip for more details.
 
-## [1.7.2-rc.2] - 04-04-2022
+- `BIG-372` Activate branches and warehouses dialog reloading once activating.
+- `BIG-373` Issue general ledger report select specific account.
+- `BIG-377` Make readonly details entries as oneline with tooltip for more details.
+
+## [0.7.2] - 04-04-2022
 
 `@bigcapital/webapp`
 
 ### Fixed
-  - Add the missing Arabic localization.
-  - Subscription plans modifications.
 
-## [1.7.1-rc.2] - 30-03-2022
+- Add the missing Arabic localization.
+- Subscription plans modifications.
+
+## [0.7.1] - 30-03-2022
 
 `@bigcapital/webapp`
 
@@ -57,7 +121,7 @@ All notable changes to Bigcapital server-side will be in this file.
   - `BIG-341` Refactoring expenses services for smaller classes.
   - `BIG-342` Assign default currency as base currency when create customer, vendor or expense transaction.
 
-## [1.7.0-rc.1] - 24-03-2022
+## [0.7.0] - 24-03-2022
 
 `@bigcapital/webapp`
 
@@ -89,23 +153,26 @@ All notable changes to Bigcapital server-side will be in this file.
  - Integrate financial reports with multiply branches.
  - Integrate inventory reports with multiply warehouses.
 
-## [1.6.3] - 21-02-2022
+## [0.6.3] - 21-02-2022
 
 `@bigcapital/webapp`
 
 ### Fixed
- - `BIG-337` Display billing page once the organization subscription is inactive.
 
-## [1.6.2] - 19-02-2022
+- `BIG-337` Display billing page once the organization subscription is inactive.
+
+## [0.6.2] - 19-02-2022
 
 ### Fixed
- - fix syled components dependency with imported as default components.
 
-## [1.6.0] - 18-02-2022
+- fix syled components dependency with imported as default components.
+
+## [0.6.0] - 18-02-2022
 
 `@bigcapital/webapp`
 
 ### Added
+
 - Balance sheet comparison of previous period (PP).
 - Balance sheet comparison of previous year (PY).
 - Balance sheet percentage analysis columns and rows basis.
@@ -113,11 +180,12 @@ All notable changes to Bigcapital server-side will be in this file.
 - Profit & loss sheet comparison of previous year (PY).
 - Profit & loss sheet percentage analysis columns, rows, income and expenses basis.
 
-## [1.5.8] - 13-01-2022
+## [0.5.8] - 13-01-2022
 
 `@bigcapital/webapp`
 
 ### Added
+
 - Add payment receive PDF print.
 - Add credit note PDF print.
 
@@ -139,7 +207,7 @@ All notable changes to Bigcapital server-side will be in this file.
 - Profit & loss sheet comparison of previous year (PY).
 - Profit & loss sheet percentage analysis columns, rows, income and expenses basis.
 
-## [1.5.3] - 03-01-2020
+## [0.5.3] - 03-01-2020
 
 `@bigcapital/webapp`
 
@@ -148,7 +216,7 @@ All notable changes to Bigcapital server-side will be in this file.
 - Localize the global errors.
 - Expand account name column on trial balance sheet.
 
-## [1.5.0] - 20-12-2021
+## [0.5.0] - 20-12-2021
 
 `@bigcapital/webapp`
 
@@ -170,7 +238,7 @@ All notable changes to Bigcapital server-side will be in this file.
 - Dashboard meta boot and authenticated user request query.
 - Optimize Arabic localization.
 
-## [1.4.0] - 11-09-2021
+## [0.4.0] - 11-09-2021
 
 `@bigcapital/webapp`
 
@@ -191,7 +259,7 @@ fix: BIG-144 - Typo adjustment dialog success message.
 fix: BIG-148 - Items entries ordered by index.
 fix: BIG-132 AR/AP aging summary report filter by none transactions/zero contacts.
 
-## [1.2.0-RC] - 03-09-2021
+## [0.2.0] - 03-09-2021
 
 `@bigcapital/webapp`
 

DISCLAIMER

@@ -0,0 +1,3 @@
+This software is provided "as is" and without any express or implied warranties, including, without limitation, the implied warranties of merchantability and fitness for a particular purpose.
+
+In no event shall the authors or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.

LICENSE

@@ -0,0 +1,660 @@
+### GNU AFFERO GENERAL PUBLIC LICENSE
+
+Version 3, 19 November 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+### Preamble
+
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains
+free software for all its users.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing
+under this license.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS
+
+#### 0. Definitions.
+
+"This License" refers to version 3 of the GNU Affero General Public
+License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+#### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+#### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+#### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+#### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+#### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+#### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+#### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+#### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+#### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+#### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+#### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+#### 13. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your
+version supports such interaction) an opportunity to receive the
+Corresponding Source of your version by providing access to the
+Corresponding Source from a network server at no charge, through some
+standard or customary means of facilitating copying of software. This
+Corresponding Source shall include the Corresponding Source for any
+work covered by version 3 of the GNU General Public License that is
+incorporated pursuant to the following paragraph.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+#### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Affero General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever
+published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+#### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+#### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+#### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU Affero General Public License as
+        published by the Free Software Foundation, either version 3 of the
+        License, or (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU Affero General Public License for more details.
+
+        You should have received a copy of the GNU Affero General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for
+the specific requirements.
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU AGPL, see <https://www.gnu.org/licenses/>.

README.md

@@ -22,10 +22,10 @@ Bigcapital is a smart and open-source accounting and inventory software, Bigcapi
 # Resources
 
 - [Documentation](https://docs.bigcapital.ly/) - Learn how to use.
-- [Discord](https://discord.gg/s3ARzDcf) - Ask for help.
-- [Bug Tracker](https://github.com/bigcapital/bigcapital/issues) - Notify us new bugs.
-- [Source Code](https://github.com/bigcapital/bigcapital) - Github repo.
+- [Discord](https://discord.com/invite/c8nPBJafeb) - Ask for help.
+- [Bug Tracker](https://github.com/bigcapitalhq/bigcapital/issues) - Notify us new bugs.
+- [Source Code](https://github.com/bigcapitalhq/bigcapital) - Github repo.
 
 # Changlog
 
-Please see [Releases](https://github.com/bigcapital/bigcapital) for more information what has changed recently.
+Please see [Releases](https://github.com/bigcapitalhq/bigcapital/releases) for more information what has changed recently.

docker-compose.prod.yml

@@ -0,0 +1,130 @@
+# This is a production version of the Bigcapital docker-compose.yml file.
+
+version: '3.3'
+
+services:
+  nginx:
+    container_name: bigcapital-nginx-gateway
+    build:
+      context: ./docker/nginx
+      args:
+        - SERVER_PROXY_PORT=3000
+        - WEB_SSL=false
+        - SELF_SIGNED=false
+    volumes:
+      - ./data/logs/nginx/:/var/log/nginx
+      - ./docker/certbot/certs/:/var/certs
+    ports:
+      - "80:80"
+      - "443:443"
+    tty: true
+    depends_on:
+      - server
+      - webapp
+
+  webapp: 
+    container_name: bigcapital-webapp
+    image: ghcr.io/bigcapitalhq/webapp:latest
+
+  server:
+    container_name: bigcapital-server
+    image: ghcr.io/bigcapitalhq/server:latest
+    links:
+      - mysql
+      - mongo
+      - redis
+    depends_on:
+      - mysql
+      - mongo
+      - redis
+    environment:
+      # Mail
+      - MAIL_HOST=${MAIL_HOST}
+      - MAIL_USERNAME=${MAIL_USERNAM}
+      - MAIL_PASSWORD=${MAIL_PASSWORD}
+      - MAIL_PORT=${MAIL_PORT}
+      - MAIL_SECURE=${MAIL_SECURE}
+      - MAIL_FROM_NAME=${MAIL_FROM_NAME}
+      - MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS}
+
+      # Database
+      - DB_HOST=mysql
+      - DB_USER=${DB_USER}
+      - DB_PASSWORD=${DB_PASSWORD}
+      - DB_CHARSET=${DB_CHARSET}
+
+      # System database
+      - SYSTEM_DB_NAME=${SYSTEM_DB_NAME}
+
+      # Tenants databases
+      - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
+
+      # Authentication
+      - JWT_SECRET=${JWT_SECRET}
+
+      # MongoDB 
+      - MONGODB_DATABASE_URL=mongodb://mongo/bigcapital
+
+      # Application
+      - BASE_URL=${BASE_URL}
+
+      # Agendash
+      - AGENDASH_AUTH_USER=${AGENDASH_AUTH_USER}
+      - AGENDASH_AUTH_PASSWORD=${AGENDASH_AUTH_PASSWORD}
+
+  database_migration:
+    container_name: bigcapital-database-migration
+    build:
+      context: ./
+      dockerfile: docker/migration/Dockerfile
+      args:
+        - DB_HOST=mysql
+        - DB_USER=${DB_USER}
+        - DB_PASSWORD=${DB_PASSWORD}
+        - DB_CHARSET=${DB_CHARSET}
+        - SYSTEM_DB_NAME=${SYSTEM_DB_NAME}
+
+  mysql:
+    container_name: bigcapital-mysql
+    build:
+      context: ./docker/mysql
+      args:
+        - MYSQL_DATABASE=${SYSTEM_DB_NAME}
+        - MYSQL_USER=${DB_NAME}
+        - MYSQL_PASSWORD=${DB_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
+    volumes:
+      - mysql:/var/lib/mysql
+    expose:
+      - '3306'
+
+  mongo:
+    container_name: bigcapital-mongo 
+    build: ./docker/mongo
+    expose:
+      - '27017'
+    volumes:
+      - mongo:/var/lib/mongodb
+
+  redis:
+    container_name: bigcapital-redis
+    build:
+      context: ./docker/redis
+    expose:
+      - "6379"
+    volumes:
+      - redis:/data
+
+# Volumes
+volumes:
+  mysql:
+    name: bigcapital_prod_mysql
+    driver: local
+
+  mongo:
+    name: bigcapital_prod_mongo
+    driver: local
+
+  redis:
+    name: bigcapital_prod_redis
+    driver: local

docker-compose.yml

@@ -0,0 +1,53 @@
+# WARNING!
+# This is a development version of THE Bigcapital docker-compose.yml file.
+# Avoid using this file in your production environment.
+# We're exposing here sensitive ports and mounting code volumes for rapid development and debugging of the server stack.
+
+version: '3.3'
+
+services:
+  mysql:
+    build:
+      context: ./docker/mysql
+      args:
+        - MYSQL_DATABASE=${SYSTEM_DB_NAME}
+        - MYSQL_USER=${DB_NAME}
+        - MYSQL_PASSWORD=${DB_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
+    volumes:
+      - mysql:/var/lib/mysql
+    expose:
+      - '3306'
+    ports:
+      - '3306:3306'
+
+  mongo:
+    build: ./docker/mongo
+    expose:
+      - '27017'
+    volumes:
+      - mongo:/var/lib/mongodb
+    ports:
+      - '27017:27017'
+
+  redis:
+    build:
+      context: ./docker/redis
+    expose:
+      - "6379"
+    volumes:
+      - redis:/data
+
+# Volumes
+volumes:
+  mysql:
+    name: bigcapital_dev_mysql
+    driver: local
+
+  mongo:
+    name: bigcapital_dev_mongo
+    driver: local
+
+  redis:
+    name: bigcapital_dev_redis
+    driver: local

docker/migration/Dockerfile

@@ -0,0 +1,38 @@
+FROM ghcr.io/bigcapitalhq/server:latest as build
+
+ARG DB_HOST= \
+  DB_USER= \
+  DB_PASSWORD= \
+  DB_CHARSET= \
+  # System database.
+  SYSTEM_DB_NAME= \
+  SYSTEM_DB_PASSWORD= \
+  SYSTEM_DB_USER= \
+  SYSTEM_DB_HOST= \
+  SYSTEM_DB_CHARSET=
+
+ENV DB_HOST=$DB_HOST \
+  DB_USER=$DB_USER \
+  DB_PASSWORD=$DB_PASSWORD \
+  DB_CHARSET=$DB_CHARSET \
+  # System database.
+  SYSTEM_DB_HOST=$SYSTEM_DB_HOST \
+  SYSTEM_DB_USER=$SYSTEM_DB_USER \
+  SYSTEM_DB_PASSWORD=$SYSTEM_DB_PASSWORD \
+  SYSTEM_DB_NAME=$SYSTEM_DB_NAME \
+  SYSTEM_DB_CHARSET=$SYSTEM_DB_CHARSET
+
+USER root
+RUN apk update && \
+  apk upgrade && \
+  apk add git
+
+RUN apk add --no-cache bash
+
+# Change working dir to the server package.
+WORKDIR /app/packages/server
+
+RUN git clone https://github.com/vishnubob/wait-for-it.git
+
+# Once we listen the mysql port run the migration task.
+CMD ["./wait-for-it/wait-for-it.sh", "mysql:3306", "--", "node", "./build/commands.js", "system:migrate:latest"]

docker/mongo/Dockerfile

@@ -0,0 +1 @@
+FROM mongo:5.0

docker/mysql/Dockerfile

@@ -0,0 +1,16 @@
+FROM mysql:5.7
+
+ADD my.cnf /etc/mysql/conf.d/my.cnf
+
+ARG MYSQL_DATABASE=default_database
+ARG MYSQL_USER=default_user
+ARG MYSQL_PASSWORD=secret
+ARG MYSQL_ROOT_PASSWORD=root
+
+ENV MYSQL_DATABASE=$MYSQL_DATABASE
+ENV MYSQL_USER=$MYSQL_USER
+ENV MYSQL_PASSWORD=$MYSQL_PASSWORD
+ENV MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
+
+CMD ["mysqld"]
+EXPOSE 3306

docker/mysql/my.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+bind-address = 0.0.0.0

docker/nginx/Dockerfile

@@ -0,0 +1,21 @@
+FROM nginx:1.11
+
+RUN mkdir /etc/nginx/sites-available && rm /etc/nginx/conf.d/default.conf
+ADD nginx.conf /etc/nginx/
+
+COPY scripts /root/scripts/
+COPY certs /etc/ssl/
+
+COPY sites /etc/nginx/templates
+
+ARG SERVER_PROXY_PORT=3000
+ARG WEB_SSL=false
+ARG SELF_SIGNED=false
+
+ENV SERVER_PROXY_PORT=$SERVER_PROXY_PORT
+ENV WEB_SSL=$WEB_SSL
+ENV SELF_SIGNED=$SELF_SIGNED
+
+RUN /bin/bash /root/scripts/build-nginx.sh
+
+CMD nginx

docker/nginx/nginx.conf

@@ -0,0 +1,33 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+daemon off;
+
+events {
+  worker_connections  2048;
+  use epoll;
+}
+
+http {
+  server_tokens off;
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  keepalive_timeout 15;
+  types_hash_max_size 2048;
+  client_max_body_size 20M;
+  open_file_cache max=100;
+  gzip on;
+  gzip_disable "msie6";
+
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
+
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+
+  include /etc/nginx/conf.d/*.conf;
+  include /etc/nginx/sites-available/*;
+  access_log /var/log/nginx/access.log;
+  error_log /var/log/nginx/error.log;
+}

docker/nginx/scripts/build-nginx.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for conf in /etc/nginx/templates/*.conf; do
+  mv $conf "/etc/nginx/sites-available/"$(basename $conf) > /dev/null
+done
+
+for template in /etc/nginx/templates/*.template; do
+  envsubst < $template > "/etc/nginx/sites-available/"$(basename $template)".conf"
+done

docker/nginx/sites/server.template

@@ -0,0 +1,16 @@
+server {
+  listen 80 default_server;
+
+  location /api {
+    proxy_pass http://server:${SERVER_PROXY_PORT};
+  }
+
+  location / {
+    proxy_pass http://webapp;
+  }
+
+  location /.well-known/acme-challenge/ {
+    root /var/www/letsencrypt/;
+    log_not_found off;
+  }
+}

docker/redis/Dockerfile

@@ -0,0 +1,5 @@
+FROM redis:4.0
+
+COPY redis.conf /usr/local/etc/redis/redis.conf
+
+CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ]

docker/redis/redis.conf

@@ -0,0 +1,48 @@
+daemonize no
+pidfile /var/run/redis.pid
+port 6379
+tcp-backlog 511
+timeout 0
+tcp-keepalive 0
+loglevel notice
+logfile ""
+databases 16
+save 900 1
+save 300 10
+save 60 10000
+stop-writes-on-bgsave-error yes
+rdbcompression yes
+rdbchecksum yes
+dbfilename dump.rdb
+slave-serve-stale-data yes
+slave-read-only yes
+repl-diskless-sync no
+repl-diskless-sync-delay 5
+repl-disable-tcp-nodelay no
+slave-priority 100
+appendonly no
+appendfilename "appendonly.aof"
+appendfsync everysec
+no-appendfsync-on-rewrite no
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+aof-load-truncated yes
+lua-time-limit 5000
+slowlog-log-slower-than 10000
+slowlog-max-len 128
+latency-monitor-threshold 0
+notify-keyspace-events ""
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+list-max-ziplist-entries 512
+list-max-ziplist-value 64
+set-max-intset-entries 512
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+hll-sparse-max-bytes 3000
+activerehashing yes
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+hz 10
+aof-rewrite-incremental-fsync yes

package.json

@@ -9,6 +9,7 @@
     "build:webapp": "lerna run build --scope \"@bigcapital/webapp\"",
     "dev:server": "lerna run dev --scope \"@bigcapital/server\"",
     "build:server": "lerna run build --scope \"@bigcapital/server\"",
+    "serve:server": "lerna run serve --scope \"@bigcapital/server\"",
     "prepare": "husky install"
   },
   "workspaces": [

packages/server/.env.example

@@ -1,41 +0,0 @@
-MAIL_HOST=smtp.mailtrap.io
-MAIL_USERNAME=842f331d3dc005
-MAIL_PASSWORD=172f97b34f1a17
-MAIL_PORT=587
-MAIL_SECURE=false
-MAIL_FROM_NAME=Bigcapital
-MAIL_FROM_ADDRESS=noreply@sender.bigcapital.ly
-
-SYSTEM_DB_CLIENT=mysql
-SYSTEM_DB_HOST=127.0.0.1
-SYSTEM_DB_USER=root
-SYSTEM_DB_PASSWORD=root
-SYSTEM_DB_NAME=bigcapital_system
-SYSTEM_MIGRATIONS_DIR=./src/system/migrations
-SYSTEM_SEEDS_DIR=./src/system/seeds
-
-TENANT_DB_CLIENT=mysql
-TENANT_DB_NAME_PERFIX=bigcapital_tenant_
-TENANT_DB_HOST=127.0.0.1
-TENANT_DB_PASSWORD=root
-TENANT_DB_USER=root
-TENANT_DB_CHARSET=utf8
-TENANT_MIGRATIONS_DIR=src/database/migrations
-TENANT_SEEDS_DIR=src/database/seeds/core
-
-DB_MANAGER_SUPER_USER=root
-DB_MANAGER_SUPER_PASSWORD=root
-
-MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
-
-JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
-
-CONTACT_US_MAIL=support@bigcapital.ly
-BASE_URL=https://bigcapital.ly
-
-LICENSES_AUTH_USER=root
-LICENSES_AUTH_PASSWORD=root
-
-AGENDASH_AUTH_USER=agendash
-AGENDASH_AUTH_PASSWORD=123123
-BROWSER_WS_ENDPOINT=ws://localhost:4080/

packages/server/Dockerfile

@@ -0,0 +1,93 @@
+FROM node:14.20-alpine as build
+
+USER root
+
+ARG MAIL_HOST= \
+  MAIL_USERNAME= \
+  MAIL_PASSWORD= \
+  MAIL_PORT= \
+  MAIL_SECURE= \
+  MAIL_FROM_NAME= \
+  MAIL_FROM_ADDRESS= \
+  # Database
+  DB_HOST= \
+  DB_USER= \
+  DB_PASSWORD= \
+  DB_CHARSET= \
+  # System database.
+  SYSTEM_DB_NAME= \
+  SYSTEM_DB_PASSWORD= \
+  SYSTEM_DB_USER= \
+  SYSTEM_DB_HOST= \
+  SYSTEM_DB_CHARSET= \
+  # Tenant databases.
+  TENANT_DB_USER= \
+  TENANT_DB_PASSWORD= \
+  TENANT_DB_HOST= \
+  TENANT_DB_NAME_PERFIX= \
+  TENANT_DB_CHARSET= \
+  # MongoDB
+  MONGODB_DATABASE_URL= \
+  # Authentication
+  JWT_SECRET= \
+  # Application
+  BASE_URL= \
+  # Agendash
+  AGENDASH_AUTH_USER=agendash \
+  AGENDASH_AUTH_PASSWORD=123123 
+
+ENV MAIL_HOST=$MAIL_HOST \
+  MAIL_USERNAME=$MAIL_USERNAME \
+  MAIL_PASSWORD=$MAIL_PASSWORD \
+  MAIL_PORT=$MAIL_PORT \
+  MAIL_SECURE=$MAIL_SECURE \
+  MAIL_FROM_NAME=$MAIL_FROM_NAME \
+  MAIL_FROM_ADDRESS=$MAIL_FROM_ADDRESS \
+  # Database
+  DB_HOST=$DB_HOST \
+  DB_USER=$DB_USER \
+  DB_PASSWORD=$DB_PASSWORD \
+  DB_CHARSET=$DB_CHARSET \
+  # System database.
+  SYSTEM_DB_HOST=$SYSTEM_DB_HOST \
+  SYSTEM_DB_USER=$SYSTEM_DB_USER \
+  SYSTEM_DB_PASSWORD=$SYSTEM_DB_PASSWORD \
+  SYSTEM_DB_NAME=$SYSTEM_DB_NAME \
+  SYSTEM_DB_CHARSET=$SYSTEM_DB_CHARSET \
+  # Tenant databases.
+  TENANT_DB_NAME_PERFIX=$TENANT_DB_NAME_PERFIX \
+  TENANT_DB_HOST=$TENANT_DB_HOST \
+  TENANT_DB_PASSWORD=$TENANT_DB_PASSWORD \
+  TENANT_DB_USER=$TENANT_DB_USER \
+  TENANT_DB_CHARSET=$TENANT_DB_CHARSET \
+  # Authentication
+  JWT_SECRET=$JWT_SECRET \
+  # Agendash
+  AGENDASH_AUTH_USER=$AGENDASH_AUTH_USER \
+  AGENDASH_AUTH_PASSWORD=$AGENDASH_AUTH_PASSWORD \
+  # MongoDB
+  MONGODB_DATABASE_URL=$MONGODB_DATABASE_URL \
+  # Application
+  BASE_URL=$BASE_URL
+
+# Create app directory.
+WORKDIR /app
+
+RUN chown node:node /
+
+# Copy application dependency manifests to the container image.
+COPY ./package*.json ./
+COPY ./packages/server/package*.json ./packages/server/
+
+COPY ./lerna.json ./lerna.json
+
+# Install app dependencies for production.
+RUN npm install
+RUN npm run bootstrap
+
+COPY --chown=node:node ./packages/server ./packages/server
+
+# # Creates a "dist" folder with the production build
+RUN npm run build:server --skip-nx-cache
+
+CMD [ "node", "./packages/server/build/index.js" ]

packages/server/package.json

@@ -11,6 +11,7 @@
     "build:app": "cross-env NODE_ENV=production webpack --config scripts/webpack.config.js",
     "build:commands": "cross-env NODE_ENV=production webpack --config scripts/webpack.cli.js",
     "build": "npm-run-all build:*",
+    "serve": "node ./build/index.js",
     "lint:fix": "eslint --fix ./**/*.ts"
   },
   "author": "Ahmed Bouhuolia, <a.bouhuolia@gmail.com>",

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

@@ -9,6 +9,7 @@ import DynamicListingService from '@/services/DynamicListing/DynamicListService'
 import { DATATYPES_LENGTH } from '@/data/DataTypes';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AccountsApplication } from '@/services/Accounts/AccountsApplication';
+import { MAX_ACCOUNTS_CHART_DEPTH } from 'services/Accounts/constants';
 
 @Service()
 export default class AccountsController extends BaseController {
@@ -494,6 +495,22 @@ export default class AccountsController extends BaseController {
           }
         );
       }
+      if (error.errorType === 'PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL') {
+        return res.boom.badRequest(
+          'The parent account exceeded the depth level of accounts chart.',
+          {
+            errors: [
+              {
+                type: 'PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL',
+                code: 1500,
+                data: {
+                  maxDepth: MAX_ACCOUNTS_CHART_DEPTH,
+                },
+              },
+            ],
+          }
+        );
+      }
     }
     next(error);
   }

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

@@ -1,26 +1,23 @@
 import { Request, Response, Router } from 'express';
 import { check, ValidationChain } from 'express-validator';
 import { Service, Inject } from 'typedi';
-import countries from 'country-codes-list';
-import parsePhoneNumber from 'libphonenumber-js';
 import BaseController from '@/api/controllers/BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import AuthenticationService from '@/services/Authentication';
 import { ILoginDTO, ISystemUser, IRegisterDTO } from '@/interfaces';
 import { ServiceError, ServiceErrors } from '@/exceptions';
 import { DATATYPES_LENGTH } from '@/data/DataTypes';
 import LoginThrottlerMiddleware from '@/api/middleware/LoginThrottlerMiddleware';
-import config from '@/config';
+import AuthenticationApplication from '@/services/Authentication/AuthApplication';
 
 @Service()
 export default class AuthenticationController extends BaseController {
   @Inject()
-  authService: AuthenticationService;
+  private authApplication: AuthenticationApplication;
 
   /**
    * Constructor method.
    */
-  router() {
+  public router() {
     const router = Router();
 
     router.post(
@@ -56,9 +53,10 @@ export default class AuthenticationController extends BaseController {
   }
 
   /**
-   * Login schema.
+   * Login validation schema.
+   * @returns {ValidationChain[]}
    */
-  get loginSchema(): ValidationChain[] {
+  private get loginSchema(): ValidationChain[] {
     return [
       check('crediential').exists().isEmail(),
       check('password').exists().isLength({ min: 5 }),
@@ -66,9 +64,10 @@ export default class AuthenticationController extends BaseController {
   }
 
   /**
-   * Register schema.
+   * Register validation schema.
+   * @returns {ValidationChain[]}
    */
-  get registerSchema(): ValidationChain[] {
+  private get registerSchema(): ValidationChain[] {
     return [
       check('first_name')
         .exists()
@@ -89,71 +88,20 @@ export default class AuthenticationController extends BaseController {
         .trim()
         .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
-      check('phone_number')
-        .exists()
-        .isString()
-        .trim()
-        .escape()
-        .custom(this.phoneNumberValidator)
-        .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('password')
         .exists()
         .isString()
         .trim()
         .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
-      check('country')
-        .exists()
-        .isString()
-        .trim()
-        .escape()
-        .custom(this.countryValidator)
-        .isLength({ max: DATATYPES_LENGTH.STRING }),
     ];
   }
 
-  /**
-   * Country validator.
-   */
-  countryValidator(value, { req }) {
-    const {
-      countries: { whitelist, blacklist },
-    } = config.registration;
-    const foundCountry = countries.findOne('countryCode', value);
-
-    if (!foundCountry) {
-      throw new Error('The country code is invalid.');
-    }
-    if (
-      // Focus with me! In case whitelist is not empty and the given coutry is not
-      // in whitelist throw the error.
-      //
-      // Or in case the blacklist is not empty and the given country exists
-      // in the blacklist throw the goddamn error.
-      (whitelist.length > 0 && whitelist.indexOf(value) === -1) ||
-      (blacklist.length > 0 && blacklist.indexOf(value) !== -1)
-    ) {
-      throw new Error('The country code is not supported yet.');
-    }
-    return true;
-  }
-
-  /**
-   * Phone number validator.
-   */
-  phoneNumberValidator(value, { req }) {
-    const phoneNumber = parsePhoneNumber(value, req.body.country);
-
-    if (!phoneNumber || !phoneNumber.isValid()) {
-      throw new Error('Phone number is invalid with the given country code.');
-    }
-    return true;
-  }
-
   /**
    * Reset password schema.
+   * @returns {ValidationChain[]}
    */
-  get resetPasswordSchema(): ValidationChain[] {
+  private get resetPasswordSchema(): ValidationChain[] {
     return [
       check('password')
         .exists()
@@ -170,8 +118,9 @@ export default class AuthenticationController extends BaseController {
 
   /**
    * Send reset password validation schema.
+   * @returns {ValidationChain[]}
    */
-  get sendResetPasswordSchema(): ValidationChain[] {
+  private get sendResetPasswordSchema(): ValidationChain[] {
     return [check('email').exists().isEmail().trim().escape()];
   }
 
@@ -180,11 +129,11 @@ export default class AuthenticationController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async login(req: Request, res: Response, next: Function): Response {
+  private async login(req: Request, res: Response, next: Function): Response {
     const userDTO: ILoginDTO = this.matchedBodyData(req);
 
     try {
-      const { token, user, tenant } = await this.authService.signIn(
+      const { token, user, tenant } = await this.authApplication.signIn(
         userDTO.crediential,
         userDTO.password
       );
@@ -199,13 +148,11 @@ export default class AuthenticationController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async register(req: Request, res: Response, next: Function) {
+  private async register(req: Request, res: Response, next: Function) {
     const registerDTO: IRegisterDTO = this.matchedBodyData(req);
 
     try {
-      const registeredUser: ISystemUser = await this.authService.register(
-        registerDTO
-      );
+      await this.authApplication.signUp(registerDTO);
 
       return res.status(200).send({
         type: 'success',
@@ -222,11 +169,11 @@ export default class AuthenticationController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async sendResetPassword(req: Request, res: Response, next: Function) {
+  private async sendResetPassword(req: Request, res: Response, next: Function) {
     const { email } = this.matchedBodyData(req);
 
     try {
-      await this.authService.sendResetPassword(email);
+      await this.authApplication.sendResetPassword(email);
 
       return res.status(200).send({
         code: 'SEND_RESET_PASSWORD_SUCCESS',
@@ -244,12 +191,12 @@ export default class AuthenticationController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async resetPassword(req: Request, res: Response, next: Function) {
+  private async resetPassword(req: Request, res: Response, next: Function) {
     const { token } = req.params;
     const { password } = req.body;
 
     try {
-      await this.authService.resetPassword(token, password);
+      await this.authApplication.resetPassword(token, password);
 
       return res.status(200).send({
         type: 'RESET_PASSWORD_SUCCESS',
@@ -263,7 +210,7 @@ export default class AuthenticationController extends BaseController {
   /**
    * Handles the service errors.
    */
-  handlerErrors(error, req: Request, res: Response, next: Function) {
+  private handlerErrors(error, req: Request, res: Response, next: Function) {
     if (error instanceof ServiceError) {
       if (
         ['INVALID_DETAILS', 'invalid_password'].indexOf(error.errorType) !== -1
@@ -295,18 +242,10 @@ export default class AuthenticationController extends BaseController {
           errors: [{ type: 'EMAIL.NOT.REGISTERED', code: 500 }],
         });
       }
-    }
-    if (error instanceof ServiceErrors) {
-      const errorReasons = [];
-
-      if (error.hasType('PHONE_NUMBER_EXISTS')) {
-        errorReasons.push({ type: 'PHONE_NUMBER_EXISTS', code: 100 });
-      }
-      if (error.hasType('EMAIL_EXISTS')) {
-        errorReasons.push({ type: 'EMAIL.EXISTS', code: 200 });
-      }
-      if (errorReasons.length > 0) {
-        return res.boom.badRequest(null, { errors: errorReasons });
+      if (error.errorType === 'EMAIL_EXISTS') {
+        return res.status(400).send({
+          errors: [{ type: 'EMAIL.EXISTS', code: 600 }],
+        });
       }
     }
     next(error);

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

@@ -11,10 +11,10 @@ import AcceptInviteUserService from '@/services/InviteUsers/AcceptInviteUser';
 @Service()
 export default class InviteUsersController extends BaseController {
   @Inject()
-  inviteUsersService: InviteTenantUserService;
+  private inviteUsersService: InviteTenantUserService;
 
   @Inject()
-  acceptInviteService: AcceptInviteUserService;
+  private acceptInviteService: AcceptInviteUserService;
 
   /**
    * Routes that require authentication.
@@ -68,13 +68,13 @@ export default class InviteUsersController extends BaseController {
 
   /**
    * Invite DTO schema validation.
+   * @returns {ValidationChain[]}
    */
-  get inviteUserDTO() {
+  private get inviteUserDTO() {
     return [
       check('first_name').exists().trim().escape(),
       check('last_name').exists().trim().escape(),
-      check('phone_number').exists().trim().escape(),
-      check('password').exists().trim().escape(),
+      check('password').exists().trim().escape().isLength({ min: 5 }),
       param('token').exists().trim().escape(),
     ];
   }
@@ -85,17 +85,13 @@ export default class InviteUsersController extends BaseController {
    * @param {Response} res - Response object.
    * @param {NextFunction} next - Next function.
    */
-  async sendInvite(req: Request, res: Response, next: Function) {
+  private async sendInvite(req: Request, res: Response, next: Function) {
     const sendInviteDTO = this.matchedBodyData(req);
     const { tenantId } = req;
     const { user } = req;
 
     try {
-      const { invite } = await this.inviteUsersService.sendInvite(
-        tenantId,
-        sendInviteDTO,
-        user
-      );
+      await this.inviteUsersService.sendInvite(tenantId, sendInviteDTO, user);
       return res.status(200).send({
         type: 'success',
         code: 'INVITE.SENT.SUCCESSFULLY',
@@ -112,7 +108,7 @@ export default class InviteUsersController extends BaseController {
    * @param {Response} res - Response object.
    * @param {NextFunction} next - Next function.
    */
-  async resendInvite(req: Request, res: Response, next: NextFunction) {
+  private async resendInvite(req: Request, res: Response, next: NextFunction) {
     const { tenantId, user } = req;
     const { userId } = req.params;
 
@@ -135,7 +131,7 @@ export default class InviteUsersController extends BaseController {
    * @param {Response} res -
    * @param {NextFunction} next -
    */
-  async accept(req: Request, res: Response, next: Function) {
+  private async accept(req: Request, res: Response, next: Function) {
     const inviteUserInput: IInviteUserInput = this.matchedBodyData(req, {
       locations: ['body'],
       includeOptionals: true,
@@ -161,7 +157,7 @@ export default class InviteUsersController extends BaseController {
    * @param {Response} res -
    * @param {NextFunction} next -
    */
-  async invited(req: Request, res: Response, next: Function) {
+  private async invited(req: Request, res: Response, next: Function) {
     const { token } = req.params;
 
     try {
@@ -181,7 +177,12 @@ export default class InviteUsersController extends BaseController {
   /**
    * Handles the service error.
    */
-  handleServicesError(error, req: Request, res: Response, next: Function) {
+  private handleServicesError(
+    error,
+    req: Request,
+    res: Response,
+    next: Function
+  ) {
     if (error instanceof ServiceError) {
       if (error.errorType === 'EMAIL_EXISTS') {
         return res.status(400).send({

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

@@ -6,25 +6,18 @@ import { check, ValidationChain } from 'express-validator';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import JWTAuth from '@/api/middleware/jwtAuth';
 import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
-import SubscriptionMiddleware from '@/api/middleware/SubscriptionMiddleware';
 import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
 import OrganizationService from '@/services/Organization/OrganizationService';
-import {
-  ACCEPTED_CURRENCIES,
-  MONTHS,
-  ACCEPTED_LOCALES,
-} from '@/services/Organization/constants';
+import { MONTHS, ACCEPTED_LOCALES } from '@/services/Organization/constants';
 import { DATE_FORMATS } from '@/services/Miscellaneous/DateFormats/constants';
 
 import { ServiceError } from '@/exceptions';
 import BaseController from '@/api/controllers/BaseController';
 
-const ACCEPTED_LOCATIONS = ['libya'];
-
 @Service()
 export default class OrganizationController extends BaseController {
   @Inject()
-  organizationService: OrganizationService;
+  private organizationService: OrganizationService;
 
   /**
    * Router constructor.
@@ -32,13 +25,10 @@ export default class OrganizationController extends BaseController {
   router() {
     const router = Router();
 
-    // Should before build tenant database the user be authorized and
-    // most important than that, should be subscribed to any plan.
     router.use(JWTAuth);
     router.use(AttachCurrentTenantUser);
     router.use(TenancyMiddleware);
 
-    router.use('/build', SubscriptionMiddleware('main'));
     router.post(
       '/build',
       this.organizationValidationSchema,
@@ -69,8 +59,8 @@ export default class OrganizationController extends BaseController {
     return [
       check('name').exists().trim(),
       check('industry').optional().isString(),
-      check('location').exists().isString().isIn(ACCEPTED_LOCATIONS),
-      check('base_currency').exists().isIn(ACCEPTED_CURRENCIES),
+      check('location').exists().isString().isISO31661Alpha2(),
+      check('base_currency').exists().isISO4217(),
       check('timezone').exists().isIn(moment.tz.names()),
       check('fiscal_year').exists().isIn(MONTHS),
       check('language').exists().isString().isIn(ACCEPTED_LOCALES),

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

@@ -1,102 +0,0 @@
-import { Router, Request, Response, NextFunction } from 'express';
-import { check, ValidationChain } from 'express-validator';
-import BaseController from './BaseController';
-import SetupService from '@/services/Setup/SetupService';
-import { Inject, Service } from 'typedi';
-import { IOrganizationSetupDTO } from '@/interfaces';
-import { ServiceError } from '@/exceptions';
-// Middlewares
-import JWTAuth from '@/api/middleware/jwtAuth';
-import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
-import SubscriptionMiddleware from '@/api/middleware/SubscriptionMiddleware';
-import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
-import EnsureTenantIsInitialized from '@/api/middleware/EnsureTenantIsInitialized';
-import SettingsMiddleware from '@/api/middleware/SettingsMiddleware';
-
-@Service()
-export default class SetupController extends BaseController {
-  @Inject()
-  setupService: SetupService;
-
-  router() {
-    const router = Router('/setup');
-
-    router.use(JWTAuth);
-    router.use(AttachCurrentTenantUser);
-    router.use(TenancyMiddleware);
-    router.use(SubscriptionMiddleware('main'));
-    router.use(EnsureTenantIsInitialized);
-    router.use(SettingsMiddleware);
-    router.post(
-      '/organization',
-      this.organizationSetupSchema,
-      this.validationResult,
-      this.asyncMiddleware(this.organizationSetup.bind(this)),
-      this.handleServiceErrors
-    );
-    return router;
-  }
-
-  /**
-   * Organization setup schema.
-   */
-  private get organizationSetupSchema(): ValidationChain[] {
-    return [
-      check('organization_name').exists().trim(),
-      check('base_currency').exists(),
-      check('time_zone').exists(),
-      check('fiscal_year').exists(),
-      check('industry').optional(),
-    ];
-  }
-
-  /**
-   * Organization setup.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns
-   */
-  async organizationSetup(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const setupDTO: IOrganizationSetupDTO = this.matchedBodyData(req);
-
-    try {
-      await this.setupService.organizationSetup(tenantId, setupDTO);
-
-      return res.status(200).send({
-        message: 'The setup settings set successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Handles service errors.
-   * @param {Error} error
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  handleServiceErrors(
-    error: Error,
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    if (error instanceof ServiceError) {
-      if (error.errorType === 'TENANT_IS_ALREADY_SETUPED') {
-        return res.status(400).send({
-          errors: [{ type: 'TENANT_IS_ALREADY_SETUPED', code: 1000 }],
-        });
-      }
-      if (error.errorType === 'BASE_CURRENCY_INVALID') {
-        return res.status(400).send({
-          errors: [{ type: 'BASE_CURRENCY_INVALID', code: 110 }],
-        });
-      }
-    }
-    next(error);
-  }
-}

packages/server/src/api/controllers/Subscription/Licenses.ts

@@ -1,250 +0,0 @@
-import { Service, Inject } from 'typedi';
-import { Router, Request, Response, NextFunction } from 'express';
-import { check, oneOf, ValidationChain } from 'express-validator';
-import basicAuth from 'express-basic-auth';
-import config from '@/config';
-import { License } from '@/system/models';
-import { ServiceError } from '@/exceptions';
-import BaseController from '@/api/controllers/BaseController';
-import LicenseService from '@/services/Payment/License';
-import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import { ILicensesFilter, ISendLicenseDTO } from '@/interfaces';
-
-@Service()
-export default class LicensesController extends BaseController {
-  @Inject()
-  licenseService: LicenseService;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.use(
-      basicAuth({
-        users: {
-          [config.licensesAuth.user]: config.licensesAuth.password,
-        },
-        challenge: true,
-      })
-    );
-    router.post(
-      '/generate',
-      this.generateLicenseSchema,
-      this.validationResult,
-      asyncMiddleware(this.generateLicense.bind(this)),
-      this.catchServiceErrors,
-    );
-    router.post(
-      '/disable/:licenseId',
-      this.validationResult,
-      asyncMiddleware(this.disableLicense.bind(this)),
-      this.catchServiceErrors,
-    );
-    router.post(
-      '/send',
-      this.sendLicenseSchemaValidation,
-      this.validationResult,
-      asyncMiddleware(this.sendLicense.bind(this)),
-      this.catchServiceErrors,
-    );
-    router.delete(
-      '/:licenseId',
-      asyncMiddleware(this.deleteLicense.bind(this)),
-      this.catchServiceErrors,
-    );
-    router.get('/', asyncMiddleware(this.listLicenses.bind(this)));
-    return router;
-  }
-
-  /**
-   * Generate license validation schema.
-   */
-  get generateLicenseSchema(): ValidationChain[] {
-    return [
-      check('loop').exists().isNumeric().toInt(),
-      check('period').exists().isNumeric().toInt(),
-      check('period_interval')
-        .exists()
-        .isIn(['month', 'months', 'year', 'years', 'day', 'days']),
-      check('plan_slug').exists().trim().escape(),
-    ];
-  }
-
-  /**
-   * Specific license validation schema.
-   */
-  get specificLicenseSchema(): ValidationChain[] {
-    return [
-      oneOf(
-        [check('license_id').exists().isNumeric().toInt()],
-        [check('license_code').exists().isNumeric().toInt()]
-      ),
-    ];
-  }
-
-  /**
-   * Send license validation schema.
-   */
-  get sendLicenseSchemaValidation(): ValidationChain[] {
-    return [
-      check('period').exists().isNumeric(),
-      check('period_interval').exists().trim().escape(),
-      check('plan_slug').exists().trim().escape(),
-      oneOf([
-        check('phone_number').exists().trim().escape(),
-        check('email').exists().trim().escape(),
-      ]),
-    ];
-  }
-
-  /**
-   * Generate licenses codes with given period in bulk.
-   * @param {Request} req
-   * @param {Response} res
-   * @return {Response}
-   */
-  async generateLicense(req: Request, res: Response, next: Function) {
-    const { loop = 10, period, periodInterval, planSlug } = this.matchedBodyData(
-      req
-    );
-
-    try {
-      await this.licenseService.generateLicenses(
-        loop,
-        period,
-        periodInterval,
-        planSlug
-      );
-      return res.status(200).send({
-        code: 100,
-        type: 'LICENSEES.GENERATED.SUCCESSFULLY',
-        message: 'The licenses have been generated successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Disable the given license on the storage.
-   * @param {Request} req
-   * @param {Response} res
-   * @return {Response}
-   */
-  async disableLicense(req: Request, res: Response, next: Function) {
-    const { licenseId } = req.params;
-
-    try {
-      await this.licenseService.disableLicense(licenseId);
-
-      return res.status(200).send({ license_id: licenseId });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Deletes the given license code on the storage.
-   * @param {Request} req
-   * @param {Response} res
-   * @return {Response}
-   */
-  async deleteLicense(req: Request, res: Response, next: Function) {
-    const { licenseId } = req.params;
-
-    try {
-      await this.licenseService.deleteLicense(licenseId);
-
-      return res.status(200).send({ license_id: licenseId });
-    } catch (error) {
-      next(error)
-    }
-  }
-
-  /**
-   * Send license code in the given period to the customer via email or phone number
-   * @param {Request} req
-   * @param {Response} res
-   * @return {Response}
-   */
-  async sendLicense(req: Request, res: Response, next: Function) {
-    const sendLicenseDTO: ISendLicenseDTO = this.matchedBodyData(req);
-
-    try {
-      await this.licenseService.sendLicenseToCustomer(sendLicenseDTO);
-
-      return res.status(200).send({
-        status: 100,
-        code: 'LICENSE.CODE.SENT',
-        message: 'The license has been sent to the given customer.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Listing licenses.
-   * @param {Request} req
-   * @param {Response} res
-   */
-  async listLicenses(req: Request, res: Response) {
-    const filter: ILicensesFilter = {
-      disabled: false,
-      used: false,
-      sent: false,
-      active: false,
-      ...req.query,
-    };
-    const licenses = await License.query().onBuild((builder) => {
-      builder.modify('filter', filter);
-      builder.orderBy('createdAt', 'ASC');
-    });
-    return res.status(200).send({ licenses });
-  }
-
-  /**
-   * Catches all service errors.
-   */
-  catchServiceErrors(error, req: Request, res: Response, next: NextFunction) {
-    if (error instanceof ServiceError) {
-      if (error.errorType === 'PLAN_NOT_FOUND') {
-        return res.status(400).send({
-          errors: [{
-            type: 'PLAN.NOT.FOUND',
-            code: 100,
-            message: 'The given plan not found.',
-        }],
-        });
-      }
-      if (error.errorType === 'LICENSE_NOT_FOUND') {
-        return res.status(400).send({
-          errors: [{
-            type: 'LICENSE_NOT_FOUND',
-            code: 200,
-            message: 'The given license id not found.'
-          }],
-        });
-      }
-      if (error.errorType === 'LICENSE_ALREADY_DISABLED') {
-        return res.status(400).send({
-          errors: [{
-            type: 'LICENSE.ALREADY.DISABLED',
-            code: 200, 
-            message: 'License is already disabled.'
-          }],
-        });
-      }
-      if (error.errorType === 'NO_AVALIABLE_LICENSE_CODE') {
-        return res.status(400).send({
-          status: 110,
-          message: 'There is no licenses availiable right now with the given period and plan.',
-          code: 'NO.AVALIABLE.LICENSE.CODE',
-        });
-      }
-    }
-    next(error);
-  }
-}

packages/server/src/api/controllers/Subscription/PaymentMethod.ts

@@ -1,31 +0,0 @@
-import { Inject } from 'typedi';
-import { Request, Response } from 'express';
-import { Plan } from '@/system/models';
-import BaseController from '@/api/controllers/BaseController';
-import SubscriptionService from '@/services/Subscription/SubscriptionService';
-
-export default class PaymentMethodController extends BaseController {
-  @Inject()
-  subscriptionService: SubscriptionService;
-
-  /**
-   * Validate the given plan slug exists on the storage.
-   * 
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next
-   * 
-   * @return {Response|void}
-   */
-  async validatePlanSlugExistance(req: Request, res: Response, next: Function) {
-    const { planSlug } = this.matchedBodyData(req);
-    const foundPlan = await Plan.query().where('slug', planSlug).first();
-
-    if (!foundPlan) {
-      return res.status(400).send({
-        errors: [{ type: 'PLAN.SLUG.NOT.EXISTS', code: 110 }],
-      });
-    }
-    next();
-  }
-}

packages/server/src/api/controllers/Subscription/PaymentViaLicense.ts

@@ -1,125 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Router, Request, Response } from 'express';
-import { check } from 'express-validator';
-import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import PaymentMethodController from '@/api/controllers/Subscription/PaymentMethod';
-import {
-  NotAllowedChangeSubscriptionPlan,
-  NoPaymentModelWithPricedPlan,
-  PaymentAmountInvalidWithPlan,
-  PaymentInputInvalid,
-  VoucherCodeRequired,
-} from '@/exceptions';
-import { ILicensePaymentModel } from '@/interfaces';
-import instance from 'tsyringe/dist/typings/dependency-container';
-
-@Service()
-export default class PaymentViaLicenseController extends PaymentMethodController {
-  @Inject('logger')
-  logger: any;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.post(
-      '/payment',
-      this.paymentViaLicenseSchema,
-      this.validationResult,
-      asyncMiddleware(this.validatePlanSlugExistance.bind(this)),
-      asyncMiddleware(this.paymentViaLicense.bind(this)),
-      this.handleErrors,
-    );
-    return router;
-  }
-
-  /**
-   * Payment via license validation schema.
-   */
-  get paymentViaLicenseSchema() {
-    return [
-      check('plan_slug').exists().trim().escape(),
-      check('license_code').exists().trim().escape(),
-    ];
-  }
-
-  /**
-   * Handle the subscription payment via license code.
-   * @param {Request} req
-   * @param {Response} res
-   * @return {Response}
-   */
-  async paymentViaLicense(req: Request, res: Response, next: Function) {
-    const { planSlug, licenseCode } = this.matchedBodyData(req);
-    const { tenant } = req;
-
-    try {
-      const licenseModel: ILicensePaymentModel = { licenseCode };
-
-      await this.subscriptionService.subscriptionViaLicense(
-        tenant.id,
-        planSlug,
-        licenseModel
-      );
-
-      return res.status(200).send({
-        type: 'success',
-        code: 'PAYMENT.SUCCESSFULLY.MADE',
-        message: 'Payment via license has been made successfully.',
-      });
-    } catch (exception) {
-      next(exception);
-    }
-  }
-
-  /**
-   * Handle service errors.
-   * @param {Error} error
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private handleErrors(
-    exception: Error,
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const errorReasons = [];
-
-    if (exception instanceof VoucherCodeRequired) {
-      errorReasons.push({
-        type: 'VOUCHER_CODE_REQUIRED',
-        code: 100,
-      });
-    }
-    if (exception instanceof NoPaymentModelWithPricedPlan) {
-      errorReasons.push({
-        type: 'NO_PAYMENT_WITH_PRICED_PLAN',
-        code: 140,
-      });
-    }
-    if (exception instanceof NotAllowedChangeSubscriptionPlan) {
-      errorReasons.push({
-        type: 'NOT.ALLOWED.RENEW.SUBSCRIPTION.WHILE.ACTIVE',
-        code: 120,
-      });
-    }
-    if (errorReasons.length > 0) {
-      return res.status(400).send({ errors: errorReasons });
-    }
-    if (exception instanceof PaymentInputInvalid) {
-      return res.status(400).send({
-        errors: [{ type: 'LICENSE.CODE.IS.INVALID', code: 120 }],
-      });
-    }
-    if (exception instanceof PaymentAmountInvalidWithPlan) {
-      return res.status(400).send({
-        errors: [{ type: 'LICENSE.NOT.FOR.GIVEN.PLAN' }],
-      });
-    }
-    next(exception);
-  }
-}

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

@@ -1,49 +0,0 @@
-import { Router, Request, Response, NextFunction } from 'express';
-import { Container, Service, Inject } from 'typedi';
-import JWTAuth from '@/api/middleware/jwtAuth';
-import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
-import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
-import PaymentViaLicenseController from '@/api/controllers/Subscription/PaymentViaLicense';
-import SubscriptionService from '@/services/Subscription/SubscriptionService';
-import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-
-@Service()
-export default class SubscriptionController {
-  @Inject()
-  subscriptionService: SubscriptionService;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.use(JWTAuth);
-    router.use(AttachCurrentTenantUser);
-    router.use(TenancyMiddleware);
-
-    router.use('/license', Container.get(PaymentViaLicenseController).router());
-    router.get('/', asyncMiddleware(this.getSubscriptions.bind(this)));
-
-    return router;
-  }
-
-  /**
-   * Retrieve all subscriptions of the authenticated user's tenant.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  async getSubscriptions(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-
-    try {
-      const subscriptions = await this.subscriptionService.getSubscriptions(
-        tenantId
-      );
-      return res.status(200).send({ subscriptions });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -47,7 +47,6 @@ export default class UsersController extends BaseController {
         check('first_name').exists(),
         check('last_name').exists(),
         check('email').exists().isEmail(),
-        check('phone_number').optional().isMobilePhone(),
         check('role_id').exists().isNumeric().toInt(),
       ],
       this.validationResult,

packages/server/src/api/index.ts

@@ -4,7 +4,6 @@ import { Container } from 'typedi';
 // Middlewares
 import JWTAuth from '@/api/middleware/jwtAuth';
 import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
-import SubscriptionMiddleware from '@/api/middleware/SubscriptionMiddleware';
 import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
 import EnsureTenantIsInitialized from '@/api/middleware/EnsureTenantIsInitialized';
 import SettingsMiddleware from '@/api/middleware/SettingsMiddleware';
@@ -37,8 +36,6 @@ import Resources from './controllers/Resources';
 import ExchangeRates from '@/api/controllers/ExchangeRates';
 import Media from '@/api/controllers/Media';
 import Ping from '@/api/controllers/Ping';
-import Subscription from '@/api/controllers/Subscription';
-import Licenses from '@/api/controllers/Subscription/Licenses';
 import InventoryAdjustments from '@/api/controllers/Inventory/InventoryAdjustments';
 import asyncRenderMiddleware from './middleware/AsyncRenderMiddleware';
 import Jobs from './controllers/Jobs';
@@ -69,8 +66,6 @@ export default () => {
 
   app.use('/auth', Container.get(Authentication).router());
   app.use('/invite', Container.get(InviteUsers).nonAuthRouter());
-  app.use('/licenses', Container.get(Licenses).router());
-  app.use('/subscription', Container.get(Subscription).router());
   app.use('/organization', Container.get(Organization).router());
   app.use('/ping', Container.get(Ping).router());
   app.use('/jobs', Container.get(Jobs).router());
@@ -83,7 +78,6 @@ export default () => {
   dashboard.use(JWTAuth);
   dashboard.use(AttachCurrentTenantUser);
   dashboard.use(TenancyMiddleware);
-  dashboard.use(SubscriptionMiddleware('main'));
   dashboard.use(EnsureTenantIsInitialized);
   dashboard.use(SettingsMiddleware);
   dashboard.use(I18nAuthenticatedMiddlware);

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

@@ -1,41 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-import { Container } from 'typedi';
-
-export default (subscriptionSlug = 'main') => async (
-  req: Request,
-  res: Response,
-  next: NextFunction
-) => {
-  const { tenant, tenantId } = req;
-  const Logger = Container.get('logger');
-  const { subscriptionRepository } = Container.get('repositories');
-
-  if (!tenant) {
-    throw new Error('Should load `TenancyMiddlware` before this middleware.');
-  }
-  Logger.info('[subscription_middleware] trying get tenant main subscription.');
-  const subscription = await subscriptionRepository.getBySlugInTenant(
-    subscriptionSlug,
-    tenantId
-  );
-  // Validate in case there is no any already subscription.
-  if (!subscription) {
-    Logger.info('[subscription_middleware] tenant has no subscription.', {
-      tenantId,
-    });
-    return res.boom.badRequest('Tenant has no subscription.', {
-      errors: [{ type: 'TENANT.HAS.NO.SUBSCRIPTION' }],
-    });
-  }
-  // Validate in case the subscription is inactive.
-  else if (subscription.inactive()) {
-    Logger.info(
-      '[subscription_middleware] tenant main subscription is expired.',
-      { tenantId }
-    );
-    return res.boom.badRequest(null, {
-      errors: [{ type: 'ORGANIZATION.SUBSCRIPTION.INACTIVE' }],
-    });
-  }
-  next();
-};

packages/server/src/commands/bigcapital.ts

@@ -4,6 +4,7 @@ import color from 'colorette';
 import argv from 'getopts';
 import Knex from 'knex';
 import { knexSnakeCaseMappers } from 'objection';
+import '../before';
 import config from '../config';
 
 function initSystemKnex() {

packages/server/src/config/index.ts

@@ -1,13 +1,7 @@
 import dotenv from 'dotenv';
+import path from 'path';
 
-// Set the NODE_ENV to 'development' by default
-// process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-
-const envFound = dotenv.config();
-if (envFound.error) {
-  // This error should crash whole process
-  throw new Error("⚠️  Couldn't find .env file  ⚠️");
-}
+dotenv.config();
 
 module.exports = {
   /**
@@ -19,36 +13,36 @@ module.exports = {
    * System database configuration.
    */
   system: {
-    db_client: process.env.SYSTEM_DB_CLIENT,
-    db_host: process.env.SYSTEM_DB_HOST,
-    db_user: process.env.SYSTEM_DB_USER,
-    db_password: process.env.SYSTEM_DB_PASSWORD,
+    db_client: process.env.SYSTEM_DB_CLIENT || process.env.DB_CLIENT || 'mysql',
+    db_host: process.env.SYSTEM_DB_HOST || process.env.DB_HOST,
+    db_user: process.env.SYSTEM_DB_USER || process.env.DB_USER,
+    db_password: process.env.SYSTEM_DB_PASSWORD || process.env.DB_PASSWORD,
     db_name: process.env.SYSTEM_DB_NAME,
-    charset: process.env.SYSTEM_DB_CHARSET,
-    migrations_dir: process.env.SYSTEM_MIGRATIONS_DIR,
-    seeds_dir: process.env.SYSTEM_SEEDS_DIR,
+    charset: process.env.SYSTEM_DB_CHARSET || process.env.DB_CHARSET,
+    migrations_dir: path.join(global.__root_dir, './src/system/migrations'),
+    seeds_dir: path.join(global.__root_dir, './src/system/seeds'),
   },
 
   /**
    * Tenant database configuration.
    */
   tenant: {
-    db_client: process.env.TENANT_DB_CLIENT,
+    db_client: process.env.TENANT_DB_CLIENT || process.env.DB_CLIENT || 'mysql',
     db_name_prefix: process.env.TENANT_DB_NAME_PERFIX,
-    db_host: process.env.TENANT_DB_HOST,
-    db_user: process.env.TENANT_DB_USER,
-    db_password: process.env.TENANT_DB_PASSWORD,
-    charset: process.env.TENANT_DB_CHARSET,
-    migrations_dir: process.env.TENANT_MIGRATIONS_DIR,
-    seeds_dir: process.env.TENANT_SEEDS_DIR,
+    db_host: process.env.TENANT_DB_HOST || process.env.DB_HOST,
+    db_user: process.env.TENANT_DB_USER || process.env.DB_USER,
+    db_password: process.env.TENANT_DB_PASSWORD || process.env.DB_PASSWORD,
+    charset: process.env.TENANT_DB_CHARSET || process.env.DB_CHARSET,
+    migrations_dir: path.join(global.__root_dir, './src/database/migrations'),
+    seeds_dir: path.join(global.__root_dir, './src/database/seeds/core'),
   },
 
   /**
    * Databases manager config.
    */
   manager: {
-    superUser: process.env.DB_MANAGER_SUPER_USER,
-    superPassword: process.env.DB_MANAGER_SUPER_PASSWORD,
+    superUser: process.env.SYSTEM_DB_USER || process.env.DB_USER,
+    superPassword: process.env.SYSTEM_DB_PASSWORD || process.env.DB_PASSWORD,
   },
 
   /**
@@ -119,14 +113,6 @@ module.exports = {
     prefix: '/api',
   },
 
-  /**
-   * Licenses api basic authentication.
-   */
-  licensesAuth: {
-    user: process.env.LICENSES_AUTH_USER,
-    password: process.env.LICENSES_AUTH_PASSWORD,
-  },
-
   /**
    * Redis storage configuration.
    */

packages/server/src/database/migrations/20230405232607_drop_phone_number_from_users.js

@@ -0,0 +1,9 @@
+exports.up = function (knex) {
+  return knex.schema.table('users', (table) => {
+    table.dropColumn('phone_number');
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.table('users', (table) => {});
+};

packages/server/src/exceptions/NoPaymentModelWithPricedPlan.ts

@@ -1,8 +0,0 @@
-
-
-export default class NoPaymentModelWithPricedPlan {
-
-  constructor() {
-    
-  }
-}

packages/server/src/exceptions/NotAllowedChangeSubscriptionPlan.ts

@@ -1,8 +0,0 @@
-
-
-export default class NotAllowedChangeSubscriptionPlan {
-
-  constructor() {
-    this.name = "NotAllowedChangeSubscriptionPlan";
-  }
-}

packages/server/src/exceptions/PaymentAmountInvalidWithPlan.ts

@@ -1,7 +0,0 @@
-
-
-export default class PaymentAmountInvalidWithPlan{
-  constructor() {
-    
-  }
-}

packages/server/src/exceptions/PaymentInputInvalid.ts

@@ -1,3 +0,0 @@
-export default class PaymentInputInvalid {
-  constructor() {}
-}

packages/server/src/exceptions/VoucherCodeRequired.ts

@@ -1,5 +0,0 @@
-export default class VoucherCodeRequired {
-  constructor() {
-    this.name = 'VoucherCodeRequired';
-  }
-}

packages/server/src/exceptions/index.ts

@@ -1,25 +1,15 @@
-import NotAllowedChangeSubscriptionPlan from './NotAllowedChangeSubscriptionPlan';
 import ServiceError from './ServiceError';
 import ServiceErrors from './ServiceErrors';
-import NoPaymentModelWithPricedPlan from './NoPaymentModelWithPricedPlan';
-import PaymentInputInvalid from './PaymentInputInvalid';
-import PaymentAmountInvalidWithPlan from './PaymentAmountInvalidWithPlan';
 import TenantAlreadyInitialized from './TenantAlreadyInitialized';
 import TenantAlreadySeeded from './TenantAlreadySeeded';
 import TenantDBAlreadyExists from './TenantDBAlreadyExists';
 import TenantDatabaseNotBuilt from './TenantDatabaseNotBuilt';
-import VoucherCodeRequired from './VoucherCodeRequired';
 
 export {
-  NotAllowedChangeSubscriptionPlan,
-  NoPaymentModelWithPricedPlan,
-  PaymentAmountInvalidWithPlan,
   ServiceError,
   ServiceErrors,
-  PaymentInputInvalid,
   TenantAlreadyInitialized,
   TenantAlreadySeeded,
   TenantDBAlreadyExists,
   TenantDatabaseNotBuilt,
-  VoucherCodeRequired,
-};
+};

packages/server/src/interfaces/Authentication.ts

@@ -1,29 +1,77 @@
 import { ISystemUser } from './User';
 import { ITenant } from './Tenancy';
+import { SystemUser } from '@/system/models';
 
 export interface IRegisterDTO {
-  firstName: string,
-  lastName: string,
-  email: string,
-  password: string,
-  organizationName: string,
-};
+  firstName: string;
+  lastName: string;
+  email: string;
+  password: string;
+  organizationName: string;
+}
 
 export interface ILoginDTO {
-  crediential: string,
-  password: string,
-};
+  crediential: string;
+  password: string;
+}
 
 export interface IPasswordReset {
-  id: number,
-  email: string,
-  token: string,
-  createdAt: Date,
-};
+  id: number;
+  email: string;
+  token: string;
+  createdAt: Date;
+}
 
 export interface IAuthenticationService {
-  signIn(emailOrPhone: string, password: string): Promise<{ user: ISystemUser, token: string, tenant: ITenant }>;
+  signIn(
+    email: string,
+    password: string
+  ): Promise<{ user: ISystemUser; token: string; tenant: ITenant }>;
   register(registerDTO: IRegisterDTO): Promise<ISystemUser>;
   sendResetPassword(email: string): Promise<IPasswordReset>;
   resetPassword(token: string, password: string): Promise<void>;
+}
+
+export interface IAuthSigningInEventPayload {
+  email: string;
+  password: string;
+  user: ISystemUser;
+}
+
+export interface IAuthSignedInEventPayload {
+  email: string;
+  password: string;
+  user: ISystemUser;
+}
+
+export interface IAuthSigningUpEventPayload {
+  signupDTO: IRegisterDTO;
+}
+
+export interface IAuthSignedUpEventPayload {
+  signupDTO: IRegisterDTO;
+  tenant: ITenant;
+  user: ISystemUser;
+}
+
+export interface IAuthSignInPOJO {
+  user: ISystemUser;
+  token: string;
+  tenant: ITenant;
+}
+
+export interface IAuthResetedPasswordEventPayload {
+  user: SystemUser;
+  token: string;
+  password: string;
+}
+
+
+export interface IAuthSendingResetPassword {
+  user: ISystemUser,
+  token: string;
+}
+export interface IAuthSendedResetPassword {
+  user: ISystemUser,
+  token: string;
 }

packages/server/src/interfaces/User.ts

@@ -9,7 +9,6 @@ export interface ISystemUser extends Model {
   active: boolean;
   password: string;
   email: string;
-  phoneNumber: string;
 
   roleId: number;
   tenantId: number;
@@ -26,7 +25,6 @@ export interface ISystemUserDTO {
   firstName: string;
   lastName: string;
   password: string;
-  phoneNumber: string;
   active: boolean;
   email: string;
   roleId?: number;
@@ -35,7 +33,6 @@ export interface ISystemUserDTO {
 export interface IEditUserDTO {
   firstName: string;
   lastName: string;
-  phoneNumber: string;
   active: boolean;
   email: string;
   roleId: number;
@@ -44,7 +41,6 @@ export interface IEditUserDTO {
 export interface IInviteUserInput {
   firstName: string;
   lastName: string;
-  phoneNumber: string;
   password: string;
 }
 export interface IUserInvite {
@@ -111,7 +107,6 @@ export interface ITenantUser {
   id?: number;
   firstName: string;
   lastName: string;
-  phoneNumber: string;
   active: boolean;
   email: string;
   roleId?: number;

packages/server/src/jobs/MailNotificationSubscribeEnd.ts

@@ -1,34 +0,0 @@
-import Container from 'typedi';
-import SubscriptionService from '@/services/Subscription/Subscription';
-
-export default class MailNotificationSubscribeEnd {
-  /**
-   * Job handler.
-   * @param {Job} job -
-   */
-  handler(job) {
-    const { tenantId, phoneNumber, remainingDays } = job.attrs.data;
-
-    const subscriptionService = Container.get(SubscriptionService);
-    const Logger = Container.get('logger');
-
-    Logger.info(
-      `Send mail notification subscription end soon - started: ${job.attrs.data}`
-    );
-
-    try {
-      subscriptionService.mailMessages.sendRemainingTrialPeriod(
-        phoneNumber,
-        remainingDays
-      );
-      Logger.info(
-        `Send mail notification subscription end soon - finished: ${job.attrs.data}`
-      );
-    } catch (error) {
-      Logger.info(
-        `Send mail notification subscription end soon - failed: ${job.attrs.data}, error: ${e}`
-      );
-      done(e);
-    }
-  }
-}

packages/server/src/jobs/MailNotificationTrialEnd.ts

@@ -1,34 +0,0 @@
-import Container from 'typedi';
-import SubscriptionService from '@/services/Subscription/Subscription';
-
-export default class MailNotificationTrialEnd {
-  /**
-   *
-   * @param {Job} job -
-   */
-  handler(job) {
-    const { tenantId, phoneNumber, remainingDays } = job.attrs.data;
-
-    const subscriptionService = Container.get(SubscriptionService);
-    const Logger = Container.get('logger');
-
-    Logger.info(
-      `Send mail notification subscription end soon - started: ${job.attrs.data}`
-    );
-
-    try {
-      subscriptionService.mailMessages.sendRemainingTrialPeriod(
-        phoneNumber,
-        remainingDays
-      );
-      Logger.info(
-        `Send mail notification subscription end soon - finished: ${job.attrs.data}`
-      );
-    } catch (error) {
-      Logger.info(
-        `Send mail notification subscription end soon - failed: ${job.attrs.data}, error: ${e}`
-      );
-      done(e);
-    }
-  }
-}

packages/server/src/jobs/ResetPasswordMail.ts

@@ -1,5 +1,5 @@
 import { Container, Inject } from 'typedi';
-import AuthenticationService from '@/services/Authentication';
+import AuthenticationService from '@/services/Authentication/AuthApplication';
 
 export default class WelcomeEmailJob {
   /**

packages/server/src/jobs/SMSNotificationSubscribeEnd.ts

@@ -1,28 +0,0 @@
-import Container from 'typedi';
-import SubscriptionService from '@/services/Subscription/Subscription';
-
-export default class SMSNotificationSubscribeEnd {
-
-  /**
-   * 
-   * @param {Job}job 
-   */
-  handler(job) {
-    const { tenantId, phoneNumber, remainingDays } = job.attrs.data;
-
-    const subscriptionService = Container.get(SubscriptionService);
-    const Logger = Container.get('logger');
-
-    Logger.info(`Send SMS notification subscription end soon - started: ${job.attrs.data}`);
-
-    try {
-      subscriptionService.smsMessages.sendRemainingSubscriptionPeriod(
-        phoneNumber, remainingDays,
-      );
-      Logger.info(`Send SMS notification subscription end soon - finished: ${job.attrs.data}`);
-    } catch(error) {
-      Logger.info(`Send SMS notification subscription end soon - failed: ${job.attrs.data}, error: ${e}`);
-      done(e);
-    }
-  }
-}

packages/server/src/jobs/SMSNotificationTrialEnd.ts

@@ -1,28 +0,0 @@
-import Container from 'typedi';
-import SubscriptionService from '@/services/Subscription/Subscription';
-
-export default class SMSNotificationTrialEnd {
-
-  /**
-   * 
-   * @param {Job}job 
-   */
-  handler(job) {
-    const { tenantId, phoneNumber, remainingDays } = job.attrs.data;
-
-    const subscriptionService = Container.get(SubscriptionService);
-    const Logger = Container.get('logger');
-
-    Logger.info(`Send notification subscription end soon - started: ${job.attrs.data}`);
-
-    try {
-      subscriptionService.smsMessages.sendRemainingTrialPeriod(
-        phoneNumber, remainingDays,
-      );
-      Logger.info(`Send notification subscription end soon - finished: ${job.attrs.data}`);
-    } catch(error) {
-      Logger.info(`Send notification subscription end soon - failed: ${job.attrs.data}, error: ${e}`);
-      done(e);
-    }
-  }
-}

packages/server/src/jobs/SendLicenseEmail.ts

@@ -1,33 +0,0 @@
-import { Container } from 'typedi';
-import LicenseService from '@/services/Payment/License';
-
-export default class SendLicenseViaEmailJob {
-  /**
-   * Constructor method.
-   * @param agenda 
-   */
-  constructor(agenda) {
-    agenda.define(
-      'send-license-via-email',
-      { priority: 'high', concurrency: 1, },
-      this.handler,
-    );
-  }
-
-  public async handler(job, done: Function): Promise<void> {
-    const Logger = Container.get('logger');
-    const licenseService = Container.get(LicenseService);
-    const { email, licenseCode } = job.attrs.data;
-
-    Logger.info(`[send_license_via_mail] started: ${job.attrs.data}`);
-
-    try {
-      await licenseService.mailMessages.sendMailLicense(licenseCode, email);
-      Logger.info(`[send_license_via_mail] completed: ${job.attrs.data}`);
-      done();
-    } catch(e) {
-      Logger.error(`[send_license_via_mail] ${job.attrs.data}, error: ${e}`);
-      done(e);  
-    } 
-  }
-}

packages/server/src/jobs/SendLicensePhone.ts

@@ -1,33 +0,0 @@
-import { Container } from 'typedi';
-import LicenseService from '@/services/Payment/License';
-
-export default class SendLicenseViaPhoneJob {
-  /**
-   * Constructor method.
-   */
-  constructor(agenda) {
-    agenda.define(
-      'send-license-via-phone',
-      { priority: 'high', concurrency: 1, },
-      this.handler,
-    );
-  }
-
-  public async handler(job, done: Function): Promise<void> {
-    const { phoneNumber, licenseCode } = job.attrs.data;
-
-    const Logger = Container.get('logger');
-    const licenseService = Container.get(LicenseService);
-
-    Logger.debug(`Send license via phone number - started: ${job.attrs.data}`);
-
-    try {
-      await licenseService.smsMessages.sendLicenseSMSMessage(phoneNumber, licenseCode);
-      Logger.debug(`Send license via phone number - completed: ${job.attrs.data}`);
-      done();
-    } catch(e) {
-      Logger.error(`Send license via phone number: ${job.attrs.data}, error: ${e}`);
-      done(e);  
-    }
-  }
-}

packages/server/src/jobs/WelcomeSMS.ts

@@ -1,5 +1,5 @@
 import { Container, Inject } from 'typedi';
-import AuthenticationService from '@/services/Authentication';
+import AuthenticationService from '@/services/Authentication/AuthApplication';
 
 export default class WelcomeSMSJob {
   /**

packages/server/src/jobs/welcomeEmail.ts

@@ -1,5 +1,5 @@
 import { Container } from 'typedi';
-import AuthenticationService from '@/services/Authentication';
+import AuthenticationService from '@/services/Authentication/AuthApplication';
 
 export default class WelcomeEmailJob {
   /**

packages/server/src/loaders/jobs.ts

@@ -4,12 +4,6 @@ import WelcomeSMSJob from 'jobs/WelcomeSMS';
 import ResetPasswordMailJob from 'jobs/ResetPasswordMail';
 import ComputeItemCost from 'jobs/ComputeItemCost';
 import RewriteInvoicesJournalEntries from 'jobs/writeInvoicesJEntries';
-import SendLicenseViaPhoneJob from 'jobs/SendLicensePhone';
-import SendLicenseViaEmailJob from 'jobs/SendLicenseEmail';
-import SendSMSNotificationSubscribeEnd from 'jobs/SMSNotificationSubscribeEnd';
-import SendSMSNotificationTrialEnd from 'jobs/SMSNotificationTrialEnd';
-import SendMailNotificationSubscribeEnd from 'jobs/MailNotificationSubscribeEnd';
-import SendMailNotificationTrialEnd from 'jobs/MailNotificationTrialEnd';
 import UserInviteMailJob from 'jobs/UserInviteMail';
 import OrganizationSetupJob from 'jobs/OrganizationSetup';
 import OrganizationUpgrade from 'jobs/OrganizationUpgrade';
@@ -20,33 +14,11 @@ export default ({ agenda }: { agenda: Agenda }) => {
   new ResetPasswordMailJob(agenda);
   new WelcomeSMSJob(agenda);
   new UserInviteMailJob(agenda);
-  new SendLicenseViaEmailJob(agenda);
-  new SendLicenseViaPhoneJob(agenda);
   new ComputeItemCost(agenda);
   new RewriteInvoicesJournalEntries(agenda);
   new OrganizationSetupJob(agenda);
   new OrganizationUpgrade(agenda);
   new SmsNotification(agenda);
 
-  agenda.define(
-    'send-sms-notification-subscribe-end',
-    { priority: 'nromal', concurrency: 1, },
-    new SendSMSNotificationSubscribeEnd().handler,
-  );
-  agenda.define(
-    'send-sms-notification-trial-end',
-    { priority: 'normal', concurrency: 1, },
-    new SendSMSNotificationTrialEnd().handler,
-  );
-  agenda.define(
-    'send-mail-notification-subscribe-end',
-    { priority: 'high', concurrency: 1, },
-    new SendMailNotificationSubscribeEnd().handler
-  );
-  agenda.define(
-    'send-mail-notification-trial-end',
-    { priority: 'high', concurrency: 1, },
-    new SendMailNotificationTrialEnd().handler
-  );
   agenda.start();
 };

packages/server/src/loaders/systemRepositories.ts

@@ -1,7 +1,6 @@
 import Container from 'typedi';
 import {
   SystemUserRepository,
-  SubscriptionRepository,
   TenantRepository,
 } from '@/system/repositories';
 
@@ -11,7 +10,6 @@ export default () => {
 
   return {
     systemUserRepository: new SystemUserRepository(knex, cache),
-    subscriptionRepository: new SubscriptionRepository(knex, cache),
     tenantRepository: new TenantRepository(knex, cache),
   };
 }

packages/server/src/server.ts

@@ -1,6 +1,6 @@
 import 'reflect-metadata'; // We need this in order to use @Decorators
-import '@/config';
 import './before';
+import '@/config';
 
 import express from 'express';
 import loadersFactory from 'loaders';

packages/server/src/services/Accounts/CommandAccountValidators.ts

@@ -3,7 +3,7 @@ import TenancyService from '@/services/Tenancy/TenancyService';
 import { ServiceError } from '@/exceptions';
 import { IAccountDTO, IAccount, IAccountCreateDTO } from '@/interfaces';
 import AccountTypesUtils from '@/lib/AccountTypes';
-import { ERRORS } from './constants';
+import { ERRORS, MAX_ACCOUNTS_CHART_DEPTH } from './constants';
 
 @Service()
 export class CommandAccountValidators {
@@ -154,13 +154,13 @@ export class CommandAccountValidators {
    * parent account.
    * @param  {IAccountCreateDTO} accountDTO
    * @param  {IAccount} parentAccount
-   * @param  {string} baseCurrency - 
+   * @param  {string} baseCurrency -
    * @throws {ServiceError(ERRORS.ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT)}
    */
   public validateCurrentSameParentAccount = (
     accountDTO: IAccountCreateDTO,
     parentAccount: IAccount,
-    baseCurrency: string,
+    baseCurrency: string
   ) => {
     // If the account DTO currency not assigned and the parent account has no base currency.
     if (
@@ -208,4 +208,24 @@ export class CommandAccountValidators {
     }
     return account;
   }
+
+  /**
+   * Validates the max depth level of accounts chart.
+   * @param {numebr} tenantId - Tenant id.
+   * @param {number} parentAccountId - Parent account id.
+   */
+  public async validateMaxParentAccountDepthLevels(
+    tenantId: number,
+    parentAccountId: number
+  ) {
+    const { accountRepository } = this.tenancy.repositories(tenantId);
+
+    const accountsGraph = await accountRepository.getDependencyGraph();
+
+    const parentDependantsIds = accountsGraph.dependantsOf(parentAccountId);
+
+    if (parentDependantsIds.length >= MAX_ACCOUNTS_CHART_DEPTH) {
+      throw new ServiceError(ERRORS.PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL);
+    }
+  }
 }

packages/server/src/services/Accounts/CreateAccount.ts

@@ -70,6 +70,11 @@ export class CreateAccount {
         parentAccount,
         baseCurrency
       );
+      // Validates the max depth level of accounts chart.
+      await this.validator.validateMaxParentAccountDepthLevels(
+        tenantId,
+        accountDTO.parentAccountId
+      );
     }
     // Validates the given account type supports the multi-currency.
     this.validator.validateAccountTypeSupportCurrency(accountDTO, baseCurrency);

packages/server/src/services/Accounts/GetAccounts.ts

@@ -5,6 +5,7 @@ import TenancyService from '@/services/Tenancy/TenancyService';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import { AccountTransformer } from './AccountTransform';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
+import { flatToNestedArray } from '@/utils';
 
 @Service()
 export class GetAccounts {
@@ -53,11 +54,17 @@ export class GetAccounts {
       builder.modify('inactiveMode', filter.inactiveMode);
     });
     // Retrievs the formatted accounts collection.
-    const transformedAccounts = await this.transformer.transform(
+    const preTransformedAccounts = await this.transformer.transform(
       tenantId,
       accounts,
       new AccountTransformer()
     );
+    // Transform accounts to nested array.
+    const transformedAccounts = flatToNestedArray(preTransformedAccounts, {
+      id: 'id',
+      parentId: 'parentAccountId',
+    });
+
     return {
       accounts: transformedAccounts,
       filterMeta: dynamicList.getResponseMeta(),

packages/server/src/services/Accounts/constants.ts

@@ -13,8 +13,12 @@ export const ERRORS = {
   CLOSE_ACCOUNT_AND_TO_ACCOUNT_NOT_SAME_TYPE:
     'close_account_and_to_account_not_same_type',
   ACCOUNTS_NOT_FOUND: 'accounts_not_found',
-  ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY: 'ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY',
-  ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT: 'ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT',
+  ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY:
+    'ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY',
+  ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT:
+    'ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT',
+  PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL:
+    'PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL',
 };
 
 // Default views columns.
@@ -27,6 +31,8 @@ export const DEFAULT_VIEW_COLUMNS = [
   { key: 'currencyCode', label: 'Currency' },
 ];
 
+export const MAX_ACCOUNTS_CHART_DEPTH = 5;
+
 // Accounts default views.
 export const DEFAULT_VIEWS = [
   {
@@ -43,7 +49,12 @@ export const DEFAULT_VIEWS = [
     slug: 'liabilities',
     rolesLogicExpression: '1',
     roles: [
-      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'liability' },
+      {
+        fieldKey: 'root_type',
+        index: 1,
+        comparator: 'equals',
+        value: 'liability',
+      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },
@@ -52,7 +63,12 @@ export const DEFAULT_VIEWS = [
     slug: 'equity',
     rolesLogicExpression: '1',
     roles: [
-      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'equity' },
+      {
+        fieldKey: 'root_type',
+        index: 1,
+        comparator: 'equals',
+        value: 'equity',
+      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },
@@ -61,7 +77,12 @@ export const DEFAULT_VIEWS = [
     slug: 'income',
     rolesLogicExpression: '1',
     roles: [
-      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'income' },
+      {
+        fieldKey: 'root_type',
+        index: 1,
+        comparator: 'equals',
+        value: 'income',
+      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },
@@ -70,7 +91,12 @@ export const DEFAULT_VIEWS = [
     slug: 'expenses',
     rolesLogicExpression: '1',
     roles: [
-      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'expense' },
+      {
+        fieldKey: 'root_type',
+        index: 1,
+        comparator: 'equals',
+        value: 'expense',
+      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },

packages/server/src/services/Authentication/AuthApplication.ts

@@ -0,0 +1,56 @@
+import { Service, Inject, Container } from 'typedi';
+import { IRegisterDTO, ISystemUser, IPasswordReset } from '@/interfaces';
+import { AuthSigninService } from './AuthSignin';
+import { AuthSignupService } from './AuthSignup';
+import { AuthSendResetPassword } from './AuthSendResetPassword';
+
+@Service()
+export default class AuthenticationApplication {
+  @Inject()
+  private authSigninService: AuthSigninService;
+
+  @Inject()
+  private authSignupService: AuthSignupService;
+
+  @Inject()
+  private authResetPasswordService: AuthSendResetPassword;
+
+  /**
+   * Signin and generates JWT token.
+   * @throws {ServiceError}
+   * @param {string} email - Email address.
+   * @param {string} password - Password.
+   * @return {Promise<{user: IUser, token: string}>}
+   */
+  public async signIn(email: string, password: string) {
+    return this.authSigninService.signIn(email, password);
+  }
+
+  /**
+   * Signup a new user.
+   * @param {IRegisterDTO} signupDTO
+   * @returns {Promise<ISystemUser>}
+   */
+  public async signUp(signupDTO: IRegisterDTO): Promise<ISystemUser> {
+    return this.authSignupService.signUp(signupDTO);
+  }
+
+  /**
+   * Generates and retrieve password reset token for the given user email.
+   * @param {string} email
+   * @return {<Promise<IPasswordReset>}
+   */
+  public async sendResetPassword(email: string): Promise<IPasswordReset> {
+    return this.authResetPasswordService.sendResetPassword(email);
+  }
+
+  /**
+   * Resets a user password from given token.
+   * @param {string} token - Password reset token.
+   * @param {string} password - New Password.
+   * @return {Promise<void>}
+   */
+  public async resetPassword(token: string, password: string): Promise<void> {
+    return this.authResetPasswordService.resetPassword(token, password);
+  }
+}

packages/server/src/services/Authentication/AuthSendResetPassword.ts

@@ -0,0 +1,130 @@
+import { Inject, Service } from 'typedi';
+import uniqid from 'uniqid';
+import moment from 'moment';
+import config from '@/config';
+import {
+  IAuthResetedPasswordEventPayload,
+  IAuthSendedResetPassword,
+  IAuthSendingResetPassword,
+  IPasswordReset,
+  ISystemUser,
+} from '@/interfaces';
+import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import events from '@/subscribers/events';
+import { PasswordReset } from '@/system/models';
+import { ERRORS } from './_constants';
+import { ServiceError } from '@/exceptions';
+import { hashPassword } from '@/utils';
+
+@Service()
+export class AuthSendResetPassword {
+  @Inject()
+  private eventPublisher: EventPublisher;
+
+  @Inject('repositories')
+  private sysRepositories: any;
+
+  /**
+   * Generates and retrieve password reset token for the given user email.
+   * @param {string} email
+   * @return {<Promise<IPasswordReset>}
+   */
+  public async sendResetPassword(email: string): Promise<PasswordReset> {
+    const user = await this.validateEmailExistance(email);
+
+    const token: string = uniqid();
+
+    // Triggers sending reset password event.
+    await this.eventPublisher.emitAsync(events.auth.sendingResetPassword, {
+      user,
+      token,
+    } as IAuthSendingResetPassword);
+
+    // Delete all stored tokens of reset password that associate to the give email.
+    this.deletePasswordResetToken(email);
+
+    // Creates a new password reset row with unique token.
+    const passwordReset = await PasswordReset.query().insert({ email, token });
+
+    // Triggers sent reset password event.
+    await this.eventPublisher.emitAsync(events.auth.sendResetPassword, {
+      user,
+      token,
+    } as IAuthSendedResetPassword);
+
+    return passwordReset;
+  }
+
+  /**
+   * Resets a user password from given token.
+   * @param {string} token - Password reset token.
+   * @param {string} password - New Password.
+   * @return {Promise<void>}
+   */
+  public async resetPassword(token: string, password: string): Promise<void> {
+    const { systemUserRepository } = this.sysRepositories;
+
+    // Finds the password reset token.
+    const tokenModel: IPasswordReset = await PasswordReset.query().findOne(
+      'token',
+      token
+    );
+    // In case the password reset token not found throw token invalid error..
+    if (!tokenModel) {
+      throw new ServiceError(ERRORS.TOKEN_INVALID);
+    }
+    // Different between tokne creation datetime and current time.
+    if (
+      moment().diff(tokenModel.createdAt, 'seconds') >
+      config.resetPasswordSeconds
+    ) {
+      // Deletes the expired token by expired token email.
+      await this.deletePasswordResetToken(tokenModel.email);
+      throw new ServiceError(ERRORS.TOKEN_EXPIRED);
+    }
+    const user = await systemUserRepository.findOneByEmail(tokenModel.email);
+
+    if (!user) {
+      throw new ServiceError(ERRORS.USER_NOT_FOUND);
+    }
+    const hashedPassword = await hashPassword(password);
+
+    await systemUserRepository.update(
+      { password: hashedPassword },
+      { id: user.id }
+    );
+    // Deletes the used token.
+    await this.deletePasswordResetToken(tokenModel.email);
+
+    // Triggers `onResetPassword` event.
+    await this.eventPublisher.emitAsync(events.auth.resetPassword, {
+      user,
+      token,
+      password,
+    } as IAuthResetedPasswordEventPayload);
+  }
+
+  /**
+   * Deletes the password reset token by the given email.
+   * @param {string} email
+   * @returns {Promise}
+   */
+  private async deletePasswordResetToken(email: string) {
+    return PasswordReset.query().where('email', email).delete();
+  }
+
+  /**
+   * Validates the given email existance on the storage.
+   * @throws {ServiceError}
+   * @param {string} email - email address.
+   */
+  private async validateEmailExistance(email: string): Promise<ISystemUser> {
+    const { systemUserRepository } = this.sysRepositories;
+    const userByEmail = await systemUserRepository.findOneByEmail(email);
+
+    if (!userByEmail) {
+      throw new ServiceError(ERRORS.EMAIL_NOT_FOUND);
+    }
+    return userByEmail;
+  }
+}

packages/server/src/services/Authentication/AuthSignin.ts

@@ -0,0 +1,103 @@
+import { Container, Inject } from 'typedi';
+import { cloneDeep } from 'lodash';
+import { Tenant } from '@/system/models';
+import {
+  IAuthSignedInEventPayload,
+  IAuthSigningInEventPayload,
+  IAuthSignInPOJO,
+  ISystemUser,
+} from '@/interfaces';
+import { ServiceError } from '@/exceptions';
+import events from '@/subscribers/events';
+import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import { generateToken } from './_utils';
+import { ERRORS } from './_constants';
+
+@Inject()
+export class AuthSigninService {
+  @Inject()
+  private eventPublisher: EventPublisher;
+
+  @Inject('repositories')
+  private sysRepositories: any;
+
+  /**
+   * Validates the given email and password.
+   * @param {ISystemUser} user
+   * @param {string} email
+   * @param {string} password
+   */
+  public async validateSignIn(
+    user: ISystemUser,
+    email: string,
+    password: string
+  ) {
+    const loginThrottler = Container.get('rateLimiter.login');
+
+    // Validate if the user is not exist.
+    if (!user) {
+      await loginThrottler.hit(email);
+      throw new ServiceError(ERRORS.INVALID_DETAILS);
+    }
+    // Validate if the given user's password is wrong.
+    if (!user.verifyPassword(password)) {
+      await loginThrottler.hit(email);
+      throw new ServiceError(ERRORS.INVALID_DETAILS);
+    }
+    // Validate if the given user is inactive.
+    if (!user.active) {
+      throw new ServiceError(ERRORS.USER_INACTIVE);
+    }
+  }
+
+  /**
+   * Signin and generates JWT token.
+   * @throws {ServiceError}
+   * @param {string} email - Email address.
+   * @param {string} password - Password.
+   * @return {Promise<{user: IUser, token: string}>}
+   */
+  public async signIn(
+    email: string,
+    password: string
+  ): Promise<IAuthSignInPOJO> {
+    const { systemUserRepository } = this.sysRepositories;
+
+    // Finds the user of the given email address.
+    const user = await systemUserRepository.findOneByEmail(email);
+
+    // Validate the given email and password.
+    await this.validateSignIn(user, email, password);
+
+    // Triggers on signing-in event.
+    await this.eventPublisher.emitAsync(events.auth.signingIn, {
+      email,
+      password,
+      user,
+    } as IAuthSigningInEventPayload);
+
+    const token = generateToken(user);
+
+    // Update the last login at of the user.
+    await systemUserRepository.patchLastLoginAt(user.id);
+
+    // Triggers `onSignIn` event.
+    await this.eventPublisher.emitAsync(events.auth.signIn, {
+      email,
+      password,
+      user,
+    } as IAuthSignedInEventPayload);
+
+    const tenant = await Tenant.query()
+      .findById(user.tenantId)
+      .withGraphFetched('metadata');
+
+    // Keep the user object immutable.
+    const outputUser = cloneDeep(user);
+
+    // Remove password property from user object.
+    Reflect.deleteProperty(outputUser, 'password');
+
+    return { user: outputUser, token, tenant };
+  }
+}

packages/server/src/services/Authentication/AuthSignup.ts

@@ -0,0 +1,77 @@
+import { omit } from 'lodash';
+import moment from 'moment';
+import { ServiceError } from '@/exceptions';
+import {
+  IAuthSignedUpEventPayload,
+  IAuthSigningUpEventPayload,
+  IRegisterDTO,
+  ISystemUser,
+} from '@/interfaces';
+import { ERRORS } from './_constants';
+import { Inject } from 'typedi';
+import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import TenantsManagerService from '../Tenancy/TenantsManager';
+import events from '@/subscribers/events';
+import { hashPassword } from '@/utils';
+
+export class AuthSignupService {
+  @Inject()
+  private eventPublisher: EventPublisher;
+
+  @Inject('repositories')
+  private sysRepositories: any;
+
+  @Inject()
+  private tenantsManager: TenantsManagerService;
+
+  /**
+   * Registers a new tenant with user from user input.
+   * @throws {ServiceErrors}
+   * @param {IRegisterDTO} signupDTO
+   * @returns {Promise<ISystemUser>}
+   */
+  public async signUp(signupDTO: IRegisterDTO): Promise<ISystemUser> {
+    const { systemUserRepository } = this.sysRepositories;
+
+    // Validates the given email uniqiness.
+    await this.validateEmailUniqiness(signupDTO.email);
+
+    const hashedPassword = await hashPassword(signupDTO.password);
+
+    // Triggers signin up event.
+    await this.eventPublisher.emitAsync(events.auth.signingUp, {
+      signupDTO,
+    } as IAuthSigningUpEventPayload);
+
+    const tenant = await this.tenantsManager.createTenant();
+    const registeredUser = await systemUserRepository.create({
+      ...omit(signupDTO, 'country'),
+      active: true,
+      password: hashedPassword,
+      tenantId: tenant.id,
+      inviteAcceptedAt: moment().format('YYYY-MM-DD'),
+    });
+    // Triggers signed up event.
+    await this.eventPublisher.emitAsync(events.auth.signUp, {
+      signupDTO,
+      tenant,
+      user: registeredUser,
+    } as IAuthSignedUpEventPayload);
+
+    return registeredUser;
+  }
+
+  /**
+   * Validates email uniqiness on the storage.
+   * @throws {ServiceErrors}
+   * @param  {string} email - Email address
+   */
+  private async validateEmailUniqiness(email: string) {
+    const { systemUserRepository } = this.sysRepositories;
+    const isEmailExists = await systemUserRepository.findOneByEmail(email);
+
+    if (isEmailExists) {
+      throw new ServiceError(ERRORS.EMAIL_EXISTS);
+    }
+  }
+}

packages/server/src/services/Authentication/_constants.ts

@@ -0,0 +1,10 @@
+export const ERRORS = {
+  INVALID_DETAILS: 'INVALID_DETAILS',
+  USER_INACTIVE: 'USER_INACTIVE',
+  EMAIL_NOT_FOUND: 'EMAIL_NOT_FOUND',
+  TOKEN_INVALID: 'TOKEN_INVALID',
+  USER_NOT_FOUND: 'USER_NOT_FOUND',
+  TOKEN_EXPIRED: 'TOKEN_EXPIRED',
+  PHONE_NUMBER_EXISTS: 'PHONE_NUMBER_EXISTS',
+  EMAIL_EXISTS: 'EMAIL_EXISTS',
+};

packages/server/src/services/Authentication/_utils.ts

@@ -0,0 +1,22 @@
+import JWT from 'jsonwebtoken';
+import { ISystemUser } from '@/interfaces';
+import config from '@/config';
+
+/**
+ * Generates JWT token for the given user.
+ * @param {ISystemUser} user
+ * @return {string} token
+ */
+export const generateToken = (user: ISystemUser): string => {
+  const today = new Date();
+  const exp = new Date(today);
+  exp.setDate(today.getDate() + 60);
+
+  return JWT.sign(
+    {
+      id: user.id, // We are gonna use this in the middleware 'isAuth'
+      exp: exp.getTime() / 1000,
+    },
+    config.jwtSecret
+  );
+};

packages/server/src/services/Authentication/index.ts

@@ -1,322 +0,0 @@
-import { Service, Inject, Container } from 'typedi';
-import JWT from 'jsonwebtoken';
-import uniqid from 'uniqid';
-import { omit, cloneDeep } from 'lodash';
-import moment from 'moment';
-import { PasswordReset, Tenant } from '@/system/models';
-import {
-  IRegisterDTO,
-  ITenant,
-  ISystemUser,
-  IPasswordReset,
-  IAuthenticationService,
-} from '@/interfaces';
-import { hashPassword } from 'utils';
-import { ServiceError, ServiceErrors } from '@/exceptions';
-import config from '@/config';
-import events from '@/subscribers/events';
-import AuthenticationMailMessages from '@/services/Authentication/AuthenticationMailMessages';
-import TenantsManager from '@/services/Tenancy/TenantsManager';
-import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-
-const ERRORS = {
-  INVALID_DETAILS: 'INVALID_DETAILS',
-  USER_INACTIVE: 'USER_INACTIVE',
-  EMAIL_NOT_FOUND: 'EMAIL_NOT_FOUND',
-  TOKEN_INVALID: 'TOKEN_INVALID',
-  USER_NOT_FOUND: 'USER_NOT_FOUND',
-  TOKEN_EXPIRED: 'TOKEN_EXPIRED',
-  PHONE_NUMBER_EXISTS: 'PHONE_NUMBER_EXISTS',
-  EMAIL_EXISTS: 'EMAIL_EXISTS',
-};
-@Service()
-export default class AuthenticationService implements IAuthenticationService {
-  @Inject('logger')
-  logger: any;
-
-  @Inject()
-  eventPublisher: EventPublisher;
-
-  @Inject()
-  mailMessages: AuthenticationMailMessages;
-
-  @Inject('repositories')
-  sysRepositories: any;
-
-  @Inject()
-  tenantsManager: TenantsManager;
-
-  /**
-   * Signin and generates JWT token.
-   * @throws  {ServiceError}
-   * @param  {string} emailOrPhone - Email or phone number.
-   * @param  {string} password - Password.
-   * @return {Promise<{user: IUser, token: string}>}
-   */
-  public async signIn(
-    emailOrPhone: string,
-    password: string
-  ): Promise<{
-    user: ISystemUser;
-    token: string;
-    tenant: ITenant;
-  }> {
-    this.logger.info('[login] Someone trying to login.', {
-      emailOrPhone,
-      password,
-    });
-    const { systemUserRepository } = this.sysRepositories;
-    const loginThrottler = Container.get('rateLimiter.login');
-
-    // Finds the user of the given email or phone number.
-    const user = await systemUserRepository.findByCrediential(emailOrPhone);
-
-    if (!user) {
-      // Hits the loging throttler to the given crediential.
-      await loginThrottler.hit(emailOrPhone);
-
-      this.logger.info('[login] invalid data');
-      throw new ServiceError(ERRORS.INVALID_DETAILS);
-    }
-
-    this.logger.info('[login] check password validation.', {
-      emailOrPhone,
-      password,
-    });
-    if (!user.verifyPassword(password)) {
-      // Hits the loging throttler to the given crediential.
-      await loginThrottler.hit(emailOrPhone);
-
-      throw new ServiceError(ERRORS.INVALID_DETAILS);
-    }
-    if (!user.active) {
-      this.logger.info('[login] user inactive.', { userId: user.id });
-      throw new ServiceError(ERRORS.USER_INACTIVE);
-    }
-
-    this.logger.info('[login] generating JWT token.', { userId: user.id });
-    const token = this.generateToken(user);
-
-    this.logger.info('[login] updating user last login at.', {
-      userId: user.id,
-    });
-    await systemUserRepository.patchLastLoginAt(user.id);
-
-    this.logger.info('[login] Logging success.', { user, token });
-
-    // Triggers `onLogin` event.
-    await this.eventPublisher.emitAsync(events.auth.login, {
-      emailOrPhone,
-      password,
-      user,
-    });
-    const tenant = await Tenant.query().findById(user.tenantId).withGraphFetched('metadata');
-
-    // Keep the user object immutable.
-    const outputUser = cloneDeep(user);
-
-    // Remove password property from user object.
-    Reflect.deleteProperty(outputUser, 'password');
-
-    return { user: outputUser, token, tenant };
-  }
-
-  /**
-   * Validates email and phone number uniqiness on the storage.
-   * @throws {ServiceErrors}
-   * @param  {IRegisterDTO} registerDTO - Register data object.
-   */
-  private async validateEmailAndPhoneUniqiness(registerDTO: IRegisterDTO) {
-    const { systemUserRepository } = this.sysRepositories;
-
-    const isEmailExists = await systemUserRepository.findOneByEmail(
-      registerDTO.email
-    );
-    const isPhoneExists = await systemUserRepository.findOneByPhoneNumber(
-      registerDTO.phoneNumber
-    );
-    const errorReasons: ServiceError[] = [];
-
-    if (isPhoneExists) {
-      this.logger.info('[register] phone number exists on the storage.');
-      errorReasons.push(new ServiceError(ERRORS.PHONE_NUMBER_EXISTS));
-    }
-    if (isEmailExists) {
-      this.logger.info('[register] email exists on the storage.');
-      errorReasons.push(new ServiceError(ERRORS.EMAIL_EXISTS));
-    }
-    if (errorReasons.length > 0) {
-      throw new ServiceErrors(errorReasons);
-    }
-  }
-
-  /**
-   * Registers a new tenant with user from user input.
-   * @throws {ServiceErrors}
-   * @param {IUserDTO} user
-   */
-  public async register(registerDTO: IRegisterDTO): Promise<ISystemUser> {
-    this.logger.info('[register] Someone trying to register.');
-    await this.validateEmailAndPhoneUniqiness(registerDTO);
-
-    this.logger.info('[register] Creating a new tenant organization.');
-    const tenant = await this.newTenantOrganization();
-
-    this.logger.info('[register] Trying hashing the password.');
-    const hashedPassword = await hashPassword(registerDTO.password);
-
-    const { systemUserRepository } = this.sysRepositories;
-    const registeredUser = await systemUserRepository.create({
-      ...omit(registerDTO, 'country'),
-      active: true,
-      password: hashedPassword,
-      tenantId: tenant.id,
-      inviteAcceptedAt: moment().format('YYYY-MM-DD'),
-    });
-    // Triggers `onRegister` event.
-    await this.eventPublisher.emitAsync(events.auth.register, {
-      registerDTO,
-      tenant,
-      user: registeredUser,
-    });
-    return registeredUser;
-  }
-
-  /**
-   * Generates and insert new tenant organization id.
-   * @async
-   * @return {Promise<ITenant>}
-   */
-  private async newTenantOrganization(): Promise<ITenant> {
-    return this.tenantsManager.createTenant();
-  }
-
-  /**
-   * Validate the given email existance on the storage.
-   * @throws {ServiceError}
-   * @param  {string} email - email address.
-   */
-  private async validateEmailExistance(email: string): Promise<ISystemUser> {
-    const { systemUserRepository } = this.sysRepositories;
-    const userByEmail = await systemUserRepository.findOneByEmail(email);
-
-    if (!userByEmail) {
-      this.logger.info('[send_reset_password] The given email not found.');
-      throw new ServiceError(ERRORS.EMAIL_NOT_FOUND);
-    }
-    return userByEmail;
-  }
-
-  /**
-   * Generates and retrieve password reset token for the given user email.
-   * @param {string} email
-   * @return {<Promise<IPasswordReset>}
-   */
-  public async sendResetPassword(email: string): Promise<IPasswordReset> {
-    this.logger.info('[send_reset_password] Trying to send reset password.');
-    const user = await this.validateEmailExistance(email);
-
-    // Delete all stored tokens of reset password that associate to the give email.
-    this.logger.info(
-      '[send_reset_password] trying to delete all tokens by email.'
-    );
-    this.deletePasswordResetToken(email);
-
-    const token: string = uniqid();
-
-    this.logger.info('[send_reset_password] insert the generated token.');
-    const passwordReset = await PasswordReset.query().insert({ email, token });
-
-    // Triggers `onSendResetPassword` event.
-    await this.eventPublisher.emitAsync(events.auth.sendResetPassword, {
-      user,
-      token,
-    });
-    return passwordReset;
-  }
-
-  /**
-   * Resets a user password from given token.
-   * @param {string} token - Password reset token.
-   * @param {string} password - New Password.
-   * @return {Promise<void>}
-   */
-  public async resetPassword(token: string, password: string): Promise<void> {
-    const { systemUserRepository } = this.sysRepositories;
-
-    // Finds the password reset token.
-    const tokenModel: IPasswordReset = await PasswordReset.query().findOne(
-      'token',
-      token
-    );
-    // In case the password reset token not found throw token invalid error..
-    if (!tokenModel) {
-      this.logger.info('[reset_password] token invalid.');
-      throw new ServiceError(ERRORS.TOKEN_INVALID);
-    }
-    // Different between tokne creation datetime and current time.
-    if (
-      moment().diff(tokenModel.createdAt, 'seconds') >
-      config.resetPasswordSeconds
-    ) {
-      this.logger.info('[reset_password] token expired.');
-
-      // Deletes the expired token by expired token email.
-      await this.deletePasswordResetToken(tokenModel.email);
-      throw new ServiceError(ERRORS.TOKEN_EXPIRED);
-    }
-    const user = await systemUserRepository.findOneByEmail(tokenModel.email);
-
-    if (!user) {
-      throw new ServiceError(ERRORS.USER_NOT_FOUND);
-    }
-    const hashedPassword = await hashPassword(password);
-
-    this.logger.info('[reset_password] saving a new hashed password.');
-    await systemUserRepository.update(
-      { password: hashedPassword },
-      { id: user.id }
-    );
-
-    // Deletes the used token.
-    await this.deletePasswordResetToken(tokenModel.email);
-
-    // Triggers `onResetPassword` event.
-    await this.eventPublisher.emitAsync(events.auth.resetPassword, {
-      user,
-      token,
-      password,
-    });
-    this.logger.info('[reset_password] reset password success.');
-  }
-
-  /**
-   * Deletes the password reset token by the given email.
-   * @param  {string} email
-   * @returns {Promise}
-   */
-  private async deletePasswordResetToken(email: string) {
-    this.logger.info('[reset_password] trying to delete all tokens by email.');
-    return PasswordReset.query().where('email', email).delete();
-  }
-
-  /**
-   * Generates JWT token for the given user.
-   * @param {ISystemUser} user
-   * @return {string} token
-   */
-  generateToken(user: ISystemUser): string {
-    const today = new Date();
-    const exp = new Date(today);
-    exp.setDate(today.getDate() + 60);
-
-    this.logger.silly(`Sign JWT for userId: ${user.id}`);
-    return JWT.sign(
-      {
-        id: user.id, // We are gonna use this in the middleware 'isAuth'
-        exp: exp.getTime() / 1000,
-      },
-      config.jwtSecret
-    );
-  }
-}

packages/server/src/services/InviteUsers/AcceptInviteUser.ts

@@ -3,8 +3,6 @@ import moment from 'moment';
 import { ServiceError } from '@/exceptions';
 import { Invite, SystemUser, Tenant } from '@/system/models';
 import { hashPassword } from 'utils';
-import TenancyService from '@/services/Tenancy/TenancyService';
-import InviteUsersMailMessages from '@/services/InviteUsers/InviteUsersMailMessages';
 import events from '@/subscribers/events';
 import {
   IAcceptInviteEventPayload,
@@ -12,29 +10,13 @@ import {
   ICheckInviteEventPayload,
   IUserInvite,
 } from '@/interfaces';
-import TenantsManagerService from '@/services/Tenancy/TenantsManager';
 import { ERRORS } from './constants';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 
 @Service()
 export default class AcceptInviteUserService {
   @Inject()
-  eventPublisher: EventPublisher;
-
-  @Inject()
-  tenancy: TenancyService;
-
-  @Inject('logger')
-  logger: any;
-
-  @Inject()
-  mailMessages: InviteUsersMailMessages;
-
-  @Inject('repositories')
-  sysRepositories: any;
-
-  @Inject()
-  tenantsManager: TenantsManagerService;
+  private eventPublisher: EventPublisher;
 
   /**
    * Accept the received invite.
@@ -50,9 +32,6 @@ export default class AcceptInviteUserService {
     // Retrieve the invite token or throw not found error.
     const inviteToken = await this.getInviteTokenOrThrowError(token);
 
-    // Validates the user phone number.
-    await this.validateUserPhoneNumberNotExists(inviteUserDTO.phoneNumber);
-
     // Hash the given password.
     const hashedPassword = await hashPassword(inviteUserDTO.password);
 

packages/server/src/services/Organization/OrganizationService.ts

@@ -150,7 +150,6 @@ export default class OrganizationService {
   public async currentOrganization(tenantId: number): Promise<ITenant> {
     const tenant = await Tenant.query()
       .findById(tenantId)
-      .withGraphFetched('subscriptions')
       .withGraphFetched('metadata');
 
     this.throwIfTenantNotExists(tenant);

packages/server/src/services/Organization/constants.ts

@@ -14,8 +14,6 @@ export const DATE_FORMATS = [
   'MMMM dd, YYYY',
   'EEE, MMMM dd, YYYY',
 ];
-export const ACCEPTED_CURRENCIES = Object.keys(currencies);
-
 export const MONTHS = [
   'january',
   'february',

packages/server/src/services/Payment/License.ts

@@ -1,185 +0,0 @@
-import { Service, Container, Inject } from 'typedi';
-import cryptoRandomString from 'crypto-random-string';
-import { times } from 'lodash';
-import { License, Plan } from '@/system/models';
-import { ILicense, ISendLicenseDTO } from '@/interfaces';
-import LicenseMailMessages from '@/services/Payment/LicenseMailMessages';
-import LicenseSMSMessages from '@/services/Payment/LicenseSMSMessages';
-import { ServiceError } from '@/exceptions';
-
-const ERRORS = {
-  PLAN_NOT_FOUND: 'PLAN_NOT_FOUND',
-  LICENSE_NOT_FOUND: 'LICENSE_NOT_FOUND',
-  LICENSE_ALREADY_DISABLED: 'LICENSE_ALREADY_DISABLED',
-  NO_AVALIABLE_LICENSE_CODE: 'NO_AVALIABLE_LICENSE_CODE',
-};
-
-@Service()
-export default class LicenseService {
-  @Inject()
-  smsMessages: LicenseSMSMessages;
-
-  @Inject()
-  mailMessages: LicenseMailMessages;
-
-  /**
-   * Validate the plan existance on the storage.
-   * @param {number} tenantId -
-   * @param {string} planSlug - Plan slug.
-   */
-  private async getPlanOrThrowError(planSlug: string) {
-    const foundPlan = await Plan.query().where('slug', planSlug).first();
-
-    if (!foundPlan) {
-      throw new ServiceError(ERRORS.PLAN_NOT_FOUND);
-    }
-    return foundPlan;
-  }
-
-  /**
-   * Valdiate the license existance on the storage.
-   * @param {number} licenseId - License id.
-   */
-  private async getLicenseOrThrowError(licenseId: number) {
-    const foundLicense = await License.query().findById(licenseId);
-
-    if (!foundLicense) {
-      throw new ServiceError(ERRORS.LICENSE_NOT_FOUND);
-    }
-    return foundLicense;
-  }
-
-  /**
-   * Validates whether the license id is disabled.
-   * @param {ILicense} license
-   */
-  private validateNotDisabledLicense(license: ILicense) {
-    if (license.disabledAt) {
-      throw new ServiceError(ERRORS.LICENSE_ALREADY_DISABLED);
-    }
-  }
-
-  /**
-   * Generates the license code in the given period.
-   * @param  {number} licensePeriod
-   * @return {Promise<ILicense>}
-   */
-  public async generateLicense(
-    licensePeriod: number,
-    periodInterval: string = 'days',
-    planSlug: string
-  ): ILicense {
-    let licenseCode: string;
-    let repeat: boolean = true;
-
-    // Retrieve plan or throw not found error.
-    const plan = await this.getPlanOrThrowError(planSlug);
-
-    while (repeat) {
-      licenseCode = cryptoRandomString({ length: 10, type: 'numeric' });
-      const foundLicenses = await License.query().where(
-        'license_code',
-        licenseCode
-      );
-
-      if (foundLicenses.length === 0) {
-        repeat = false;
-      }
-    }
-    return License.query().insert({
-      licenseCode,
-      licensePeriod,
-      periodInterval,
-      planId: plan.id,
-    });
-  }
-
-  /**
-   * Generates licenses.
-   * @param {number} loop
-   * @param {number} licensePeriod
-   * @param {string} periodInterval
-   * @param {number} planId
-   */
-  public async generateLicenses(
-    loop = 1,
-    licensePeriod: number,
-    periodInterval: string = 'days',
-    planSlug: string
-  ) {
-    const asyncOpers: Promise<any>[] = [];
-
-    times(loop, () => {
-      const generateOper = this.generateLicense(
-        licensePeriod,
-        periodInterval,
-        planSlug
-      );
-      asyncOpers.push(generateOper);
-    });
-    return Promise.all(asyncOpers);
-  }
-
-  /**
-   * Disables the given license id on the storage.
-   * @param  {string} licenseSlug - License slug.
-   * @return {Promise}
-   */
-  public async disableLicense(licenseId: number) {
-    const license = await this.getLicenseOrThrowError(licenseId);
-
-    this.validateNotDisabledLicense(license);
-
-    return License.markLicenseAsDisabled(license.id, 'id');
-  }
-
-  /**
-   * Deletes the given license id from the storage.
-   * @param licenseSlug {string} - License slug.
-   */
-  public async deleteLicense(licenseSlug: string) {
-    const license = await this.getPlanOrThrowError(licenseSlug);
-
-    return License.query().where('id', license.id).delete();
-  }
-
-  /**
-   * Sends license code to the given customer via SMS or mail message.
-   * @param {string} licenseCode - License code.
-   * @param {string} phoneNumber - Phone number.
-   * @param {string} email - Email address.
-   */
-  public async sendLicenseToCustomer(sendLicense: ISendLicenseDTO) {
-    const agenda = Container.get('agenda');
-    const { phoneNumber, email, period, periodInterval } = sendLicense;
-
-    // Retreive plan details byt the given plan slug.
-    const plan = await this.getPlanOrThrowError(sendLicense.planSlug);
-
-    const license = await License.query()
-      .modify('filterActiveLicense')
-      .where('license_period', period)
-      .where('period_interval', periodInterval)
-      .where('plan_id', plan.id)
-      .first();
-
-    if (!license) {
-      throw new ServiceError(ERRORS.NO_AVALIABLE_LICENSE_CODE)
-    }
-    // Mark the license as used.
-    await License.markLicenseAsSent(license.licenseCode);
-
-    if (sendLicense.email) {
-      await agenda.schedule('1 second', 'send-license-via-email', {
-        licenseCode: license.licenseCode,
-        email,
-      });
-    }
-    if (phoneNumber) {
-      await agenda.schedule('1 second', 'send-license-via-phone', {
-        licenseCode: license.licenseCode,
-        phoneNumber,
-      });
-    }
-  }
-}

packages/server/src/services/Payment/LicenseMailMessages.ts

@@ -1,26 +0,0 @@
-import { Container } from 'typedi';
-import Mail from '@/lib/Mail';
-import config from '@/config';
-export default class SubscriptionMailMessages {
-  /**
-   * Send license code to the given mail address.
-   * @param {string} licenseCode 
-   * @param {email} email 
-   */
-  public async sendMailLicense(licenseCode: string, email: string) {
-    const Logger = Container.get('logger');
-    
-    const mail = new Mail()
-      .setView('mail/LicenseReceive.html')
-      .setSubject('Bigcapital - License code')
-      .setTo(email)
-      .setData({
-        licenseCode,
-        successEmail: config.customerSuccess.email,
-        successPhoneNumber: config.customerSuccess.phoneNumber,
-      });
-    
-    await mail.send();
-    Logger.info('[license_mail] sent successfully.');
-  }
-}

packages/server/src/services/Payment/LicensePaymentMethod.ts

@@ -1,67 +0,0 @@
-import { License } from '@/system/models';
-import PaymentMethod from '@/services/Payment/PaymentMethod';
-import { Plan } from '@/system/models';
-import { IPaymentMethod, ILicensePaymentModel } from '@/interfaces';
-import {
-  PaymentInputInvalid,
-  PaymentAmountInvalidWithPlan,
-  VoucherCodeRequired,
-} from '@/exceptions';
-
-export default class LicensePaymentMethod
-  extends PaymentMethod
-  implements IPaymentMethod
-{
-  /**
-   * Payment subscription of organization via license code.
-   * @param {ILicensePaymentModel} licensePaymentModel -
-   */
-  public async payment(licensePaymentModel: ILicensePaymentModel, plan: Plan) {
-    this.validateLicensePaymentModel(licensePaymentModel);
-
-    const license = await this.getLicenseOrThrowInvalid(licensePaymentModel);
-    this.validatePaymentAmountWithPlan(license, plan);
-
-    // Mark the license code as used.
-    return License.markLicenseAsUsed(licensePaymentModel.licenseCode);
-  }
-
-  /**
-   * Validates the license code activation on the storage.
-   * @param {ILicensePaymentModel} licensePaymentModel -
-   */
-  private async getLicenseOrThrowInvalid(
-    licensePaymentModel: ILicensePaymentModel
-  ) {
-    const foundLicense = await License.query()
-      .modify('filterActiveLicense')
-      .where('license_code', licensePaymentModel.licenseCode)
-      .first();
-
-    if (!foundLicense) {
-      throw new PaymentInputInvalid();
-    }
-    return foundLicense;
-  }
-
-  /**
-   * Validates the payment amount with given plan price.
-   * @param {License} license
-   * @param {Plan} plan
-   */
-  private validatePaymentAmountWithPlan(license: License, plan: Plan) {
-    if (license.planId !== plan.id) {
-      throw new PaymentAmountInvalidWithPlan();
-    }
-  }
-
-  /**
-   * Validate voucher payload.
-   * @param {ILicensePaymentModel} licenseModel -
-   */
-  private validateLicensePaymentModel(licenseModel: ILicensePaymentModel) {
-    if (!licenseModel || !licenseModel.licenseCode) {
-      throw new VoucherCodeRequired();
-    }
-  }
-}

packages/server/src/services/Payment/LicenseSMSMessages.ts

@@ -1,17 +0,0 @@
-import { Container, Inject } from 'typedi';
-import SMSClient from '@/services/SMSClient';
-
-export default class SubscriptionSMSMessages {
-  @Inject('SMSClient')
-  smsClient: SMSClient;
-
-  /**
-   * Sends license code to the given phone number via SMS message.
-   * @param {string} phoneNumber 
-   * @param {string} licenseCode 
-   */
-  public async sendLicenseSMSMessage(phoneNumber: string, licenseCode: string) {
-    const message: string = `Your license card number: ${licenseCode}. If you need any help please contact us. Bigcapital.`;
-    return this.smsClient.sendMessage(phoneNumber, message);
-  }
-}

packages/server/src/services/Payment/PaymentMethod.ts

@@ -1,6 +0,0 @@
-import moment from 'moment';
-import { IPaymentModel } from '@/interfaces';
-
-export default class PaymentMethod implements IPaymentModel {
-
-}

packages/server/src/services/Payment/index.ts

@@ -1,22 +0,0 @@
-import { IPaymentMethod, IPaymentContext } from "interfaces";
-import { Plan } from '@/system/models';
-
-export default class PaymentContext<PaymentModel> implements IPaymentContext{
-  paymentMethod: IPaymentMethod;
-
-  /**
-   * Constructor method. 
-   * @param {IPaymentMethod} paymentMethod 
-   */
-  constructor(paymentMethod: IPaymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  /**
-   * 
-   * @param {<PaymentModel>} paymentModel 
-   */
-  makePayment(paymentModel: PaymentModel, plan: Plan) {
-    return this.paymentMethod.payment(paymentModel, plan);
-  }
-}

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

@@ -1,30 +0,0 @@
-import { Service } from "typedi";
-
-@Service()
-export default class SubscriptionMailMessages {
-  /**
-   * 
-   * @param phoneNumber 
-   * @param remainingDays 
-   */
-  public async sendRemainingSubscriptionPeriod(phoneNumber: string, remainingDays: number) {
-    const message: string = `
-      Your remaining subscription is ${remainingDays} days,
-      please renew your subscription before expire.
-    `;
-    this.smsClient.sendMessage(phoneNumber, message);
-  }
-
-  /**
-   * 
-   * @param phoneNumber 
-   * @param remainingDays 
-   */
-  public async sendRemainingTrialPeriod(phoneNumber: string, remainingDays: number) {
-    const message: string = `
-      Your remaining free trial is ${remainingDays} days,
-      please subscription before ends, if you have any quation to contact us.`;
-
-    this.smsClient.sendMessage(phoneNumber, message);
-  }
-}

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

@@ -1,40 +0,0 @@
-import { Service, Inject } from 'typedi';
-import SMSClient from '@/services/SMSClient';
-
-@Service()
-export default class SubscriptionSMSMessages {
-  @Inject('SMSClient')
-  smsClient: SMSClient;
-
-  /**
-   * Send remaining subscription period SMS message.
-   * @param {string} phoneNumber -
-   * @param {number} remainingDays -
-   */
-  public async sendRemainingSubscriptionPeriod(
-    phoneNumber: string,
-    remainingDays: number
-  ): Promise<void> {
-    const message: string = `
-      Your remaining subscription is ${remainingDays} days,
-      please renew your subscription before expire.
-    `;
-    this.smsClient.sendMessage(phoneNumber, message);
-  }
-
-  /**
-   * Send remaining trial period SMS message.
-   * @param {string} phoneNumber -
-   * @param {number} remainingDays -
-   */
-  public async sendRemainingTrialPeriod(
-    phoneNumber: string,
-    remainingDays: number
-  ): Promise<void> {
-    const message: string = `
-      Your remaining free trial is ${remainingDays} days,
-      please subscription before ends, if you have any quation to contact us.`;
-
-    this.smsClient.sendMessage(phoneNumber, message);
-  }
-}

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

@@ -1,80 +0,0 @@
-import { Inject } from 'typedi';
-import { Tenant, Plan } from '@/system/models';
-import { IPaymentContext } from '@/interfaces';
-import { NotAllowedChangeSubscriptionPlan } from '@/exceptions';
-
-export default class Subscription<PaymentModel> {
-  paymentContext: IPaymentContext | null;
-
-  @Inject('logger')
-  logger: any;
-
-  /**
-   * Constructor method.
-   * @param {IPaymentContext}
-   */
-  constructor(payment?: IPaymentContext) {
-    this.paymentContext = payment;
-  }
-
-  /**
-   * Give the tenant a new subscription.
-   * @param {Tenant} tenant
-   * @param {Plan} plan
-   * @param {string} invoiceInterval
-   * @param {number} invoicePeriod
-   * @param {string} subscriptionSlug
-   */
-  protected async newSubscribtion(
-    tenant,
-    plan,
-    invoiceInterval: string,
-    invoicePeriod: number,
-    subscriptionSlug: string = 'main'
-  ) {
-    const subscription = await tenant
-      .$relatedQuery('subscriptions')
-      .modify('subscriptionBySlug', subscriptionSlug)
-      .first();
-
-    // No allowed to re-new the the subscription while the subscription is active.
-    if (subscription && subscription.active()) {
-      throw new NotAllowedChangeSubscriptionPlan();
-
-      // In case there is already subscription associated to the given tenant renew it.
-    } else if (subscription && subscription.inactive()) {
-      await subscription.renew(invoiceInterval, invoicePeriod);
-
-      // No stored past tenant subscriptions create new one.
-    } else {
-      await tenant.newSubscription(
-        plan.id,
-        invoiceInterval,
-        invoicePeriod,
-        subscriptionSlug
-      );
-    }
-  }
-
-  /**
-   * Subscripe to the given plan.
-   * @param {Plan} plan
-   * @throws {NotAllowedChangeSubscriptionPlan}
-   */
-  public async subscribe(
-    tenant: Tenant,
-    plan: Plan,
-    paymentModel?: PaymentModel,
-    subscriptionSlug: string = 'main'
-  ) {
-    await this.paymentContext.makePayment(paymentModel, plan);
-
-    return this.newSubscribtion(
-      tenant,
-      plan,
-      plan.invoiceInterval,
-      plan.invoicePeriod,
-      subscriptionSlug
-    );
-  }
-}

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

@@ -1,41 +0,0 @@
-import moment from 'moment';
-
-export default class SubscriptionPeriod {
-  start: Date;
-  end: Date;
-  interval: string;
-  count: number;
-
-  /**
-   * Constructor method.
-   * @param {string} interval -
-   * @param {number} count -
-   * @param {Date} start -
-   */
-  constructor(interval: string = 'month', count: number, start?: Date) {
-    this.interval = interval;
-    this.count = count;
-    this.start = start;
-
-    if (!start) {
-      this.start = moment().toDate();
-    }
-    this.end = moment(start).add(count, interval).toDate();
-  }
-
-  getStartDate() {
-    return this.start;
-  }
-
-  getEndDate() {
-    return this.end;
-  }
-
-  getInterval() {
-    return this.interval;
-  }
-
-  getIntervalCount() {
-    return this.interval;
-  }
-}

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

@@ -1,69 +0,0 @@
-import { Service, Inject } from 'typedi';
-import { Plan, PlanSubscription, Tenant } from '@/system/models';
-import Subscription from '@/services/Subscription/Subscription';
-import LicensePaymentMethod from '@/services/Payment/LicensePaymentMethod';
-import PaymentContext from '@/services/Payment';
-import SubscriptionSMSMessages from '@/services/Subscription/SMSMessages';
-import SubscriptionMailMessages from '@/services/Subscription/MailMessages';
-import { ILicensePaymentModel } from '@/interfaces';
-import SubscriptionViaLicense from './SubscriptionViaLicense';
-
-@Service()
-export default class SubscriptionService {
-  @Inject()
-  smsMessages: SubscriptionSMSMessages;
-
-  @Inject()
-  mailMessages: SubscriptionMailMessages;
-
-  @Inject('logger')
-  logger: any;
-
-  @Inject('repositories')
-  sysRepositories: any;
-
-  /**
-   * Handles the payment process via license code and than subscribe to
-   * the given tenant.
-   * @param {number} tenantId
-   * @param {String} planSlug
-   * @param {string} licenseCode
-   * @return {Promise}
-   */
-  public async subscriptionViaLicense(
-    tenantId: number,
-    planSlug: string,
-    paymentModel: ILicensePaymentModel,
-    subscriptionSlug: string = 'main'
-  ) {
-    // Retrieve plan details.
-    const plan = await Plan.query().findOne('slug', planSlug);
-
-    // Retrieve tenant details.
-    const tenant = await Tenant.query().findById(tenantId);
-
-    // License payment method.
-    const paymentViaLicense = new LicensePaymentMethod();
-
-    // Payment context.
-    const paymentContext = new PaymentContext(paymentViaLicense);
-
-    // Subscription.
-    const subscription = new SubscriptionViaLicense(paymentContext);
-
-    // Subscribe.
-    await subscription.subscribe(tenant, plan, paymentModel, subscriptionSlug);
-  }
-
-  /**
-   * Retrieve all subscription of the given tenant.
-   * @param {number} tenantId
-   */
-  public async getSubscriptions(tenantId: number) {
-    const subscriptions = await PlanSubscription.query().where(
-      'tenant_id',
-      tenantId
-    );
-    return subscriptions;
-  }
-}

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

@@ -1,54 +0,0 @@
-import { License, Tenant, Plan } from '@/system/models';
-import Subscription from './Subscription';
-import { PaymentModel } from '@/interfaces';
-
-export default class SubscriptionViaLicense extends Subscription<PaymentModel> {
-  /**
-   * Subscripe to the given plan.
-   * @param {Plan} plan
-   * @throws {NotAllowedChangeSubscriptionPlan}
-   */
-  public async subscribe(
-    tenant: Tenant,
-    plan: Plan,
-    paymentModel?: PaymentModel,
-    subscriptionSlug: string = 'main'
-  ): Promise<void> {
-    await this.paymentContext.makePayment(paymentModel, plan);
-
-    return this.newSubscriptionFromLicense(
-      tenant,
-      plan,
-      paymentModel.licenseCode,
-      subscriptionSlug
-    );
-  }
-
-  /**
-   * New subscription from the given license.
-   * @param {Tanant} tenant 
-   * @param {Plab} plan 
-   * @param {string} licenseCode 
-   * @param {string} subscriptionSlug 
-   * @returns {Promise<void>}
-   */
-  private async newSubscriptionFromLicense(
-    tenant,
-    plan,
-    licenseCode: string,
-    subscriptionSlug: string = 'main'
-  ): Promise<void> {
-    // License information.
-    const licenseInfo = await License.query().findOne(
-      'licenseCode',
-      licenseCode
-    );
-    return this.newSubscribtion(
-      tenant,
-      plan,
-      licenseInfo.periodInterval,
-      licenseInfo.licensePeriod,
-      subscriptionSlug
-    );
-  }
-}

packages/server/src/services/Users/UsersService.ts

@@ -17,20 +17,17 @@ import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 
 @Service()
 export default class UsersService {
-  @Inject('logger')
-  logger: any;
-
   @Inject('repositories')
-  repositories: any;
+  private repositories: any;
 
   @Inject()
-  rolesService: RolesService;
+  private rolesService: RolesService;
 
   @Inject()
-  tenancy: HasTenancyService;
+  private tenancy: HasTenancyService;
 
   @Inject()
-  eventPublisher: EventPublisher;
+  private eventPublisher: EventPublisher;
 
   /**
    * Creates a new user.
@@ -46,7 +43,7 @@ export default class UsersService {
     authorizedUser: ISystemUser
   ): Promise<any> {
     const { User } = this.tenancy.models(tenantId);
-    const { email, phoneNumber } = editUserDTO;
+    const { email } = editUserDTO;
 
     // Retrieve the tenant user or throw not found service error.
     const oldTenantUser = await this.getTenantUserOrThrowError(
@@ -62,9 +59,6 @@ export default class UsersService {
     // Validate user email should be unique.
     await this.validateUserEmailUniquiness(tenantId, email, userId);
 
-    // Validate user phone number should be unique.
-    await this.validateUserPhoneNumberUniqiness(tenantId, phoneNumber, userId);
-
     // Retrieve the given role or throw not found service error.
     const role = await this.rolesService.getRoleOrThrowError(
       tenantId,
@@ -295,27 +289,6 @@ export default class UsersService {
     }
   };
 
-  /**
-   * Validate user phone number should be unique.
-   * @param {string} phoneNumber -
-   * @param {number} userId -
-   */
-  private validateUserPhoneNumberUniqiness = async (
-    tenantId: number,
-    phoneNumber: string,
-    userId: number
-  ) => {
-    const { User } = this.tenancy.models(tenantId);
-
-    const userByPhoneNumber = await User.query()
-      .findOne('phone_number', phoneNumber)
-      .whereNot('id', userId);
-
-    if (userByPhoneNumber) {
-      throw new ServiceError(ERRORS.PHONE_NUMBER_ALREADY_EXIST);
-    }
-  };
-
   /**
    * Validate the authorized user cannot mutate its role.
    * @param {ITenantUser} oldTenantUser 

packages/server/src/subscribers/Authentication/ResetLoginThrottle.ts

@@ -1,27 +1,29 @@
 import { Container, Service } from 'typedi';
 import events from '@/subscribers/events';
+import { IAuthSignedInEventPayload } from '@/interfaces';
 
 @Service()
 export default class ResetLoginThrottleSubscriber {
   /**
    * Attaches events with handlers.
-   * @param bus 
+   * @param bus
    */
   public attach(bus) {
-    bus.subscribe(events.auth.login, this.resetLoginThrottleOnceSuccessLogin);
+    bus.subscribe(events.auth.signIn, this.resetLoginThrottleOnceSuccessLogin);
   }
 
   /**
    * Resets the login throttle once the login success.
+   * @param {IAuthSignedInEventPayload} payload -
    */
-  private async resetLoginThrottleOnceSuccessLogin(payload) {
-    const { emailOrPhone, password, user } = payload;
-
+  private async resetLoginThrottleOnceSuccessLogin(
+    payload: IAuthSignedInEventPayload
+  ) {
+    const { email, user } = payload;
     const loginThrottler = Container.get('rateLimiter.login');
 
     // Reset the login throttle by the given email and phone number.
     await loginThrottler.reset(user.email);
-    await loginThrottler.reset(user.phoneNumber);
-    await loginThrottler.reset(emailOrPhone);
+    await loginThrottler.reset(email);
   }
 }

packages/server/src/subscribers/Authentication/SendWelcomeMail.ts

@@ -10,14 +10,14 @@ export default class AuthSendWelcomeMailSubscriber {
    * Attaches events with handlers.
    */
   public attach(bus) {
-    bus.subscribe(events.auth.register, this.sendWelcomeEmailOnceUserRegister);
+    bus.subscribe(events.auth.signUp, this.sendWelcomeEmailOnceUserRegister);
   }
 
   /**
    * Sends welcome email once the user register.
    */
   private sendWelcomeEmailOnceUserRegister = async (payload) => {
-    const { registerDTO, tenant, user } = payload;
+    const { tenant, user } = payload;
 
     // Send welcome mail to the user.
     await this.agenda.now('welcome-email', {

packages/server/src/subscribers/events.ts

@@ -3,10 +3,17 @@ export default {
    * Authentication service.
    */
   auth: {
-    login: 'onLogin',
-    register: 'onRegister',
+    signIn: 'onSignIn',
+    signingIn: 'onSigningIn',
+
+    signUp: 'onSignUp',
+    signingUp: 'onSigningUp',
+
+    sendingResetPassword: 'onSendingResetPassword',
     sendResetPassword: 'onSendResetPassword',
+
     resetPassword: 'onResetPassword',
+    resetingPassword: 'onResetingPassword'
   },
 
   /**

packages/server/src/system/migrations/20200527091642_create_subscriptions_plans_table.js

@@ -1,22 +0,0 @@
-
-exports.up = function(knex) {
-  return knex.schema.createTable('subscriptions_plans', table => {
-    table.increments();
-
-    table.string('name');
-    table.string('description');
-    table.decimal('price');
-    table.string('currency', 3);
-
-    table.integer('trial_period');
-    table.string('trial_interval');
-    
-    table.integer('invoice_period');
-    table.string('invoice_interval');
-    table.timestamps();
-  });
-};
-
-exports.down = function(knex) {
-  return knex.schema.dropTableIfExists('subscriptions_plans')
-};

packages/server/src/system/migrations/20200823234134_create_plans_table.js

@@ -1,30 +0,0 @@
-
-exports.up = function(knex) {
-  return knex.schema.createTable('subscription_plans', table => {
-    table.increments();
-    table.string('slug');
-    table.string('name');
-    table.string('desc');
-    table.boolean('active');
-
-    table.decimal('price').unsigned();
-    table.string('currency', 3);
-
-    table.decimal('trial_period').nullable();
-    table.string('trial_interval').nullable();
-
-    table.decimal('invoice_period').nullable();
-    table.string('invoice_interval').nullable();
-
-    table.integer('index').unsigned();
-    table.timestamps();
-  }).then(() => {
-    return knex.seed.run({
-      specific: 'seed_subscriptions_plans.js',
-    });
-  });
-};
-
-exports.down = function(knex) {
-  return knex.schema.dropTableIfExists('subscription_plans')
-};

packages/server/src/system/migrations/20200823234434_create_subscription_plan_feature.js

@@ -1,15 +0,0 @@
-
-exports.up = function(knex) {
-  return knex.schema.createTable('subscription_plan_features', table => {
-    table.increments();
-    table.integer('plan_id').unsigned().index().references('id').inTable('subscription_plans');
-    table.string('slug');
-    table.string('name');
-    table.string('description');
-    table.timestamps();
-  });
-};
-
-exports.down = function(knex) {
-  return knex.schema.dropTableIfExists('subscription_plan_features');
-};

packages/server/src/system/migrations/20200823234636_create_subscription_plan_subscription.js

@@ -1,22 +0,0 @@
-
-exports.up = function(knex) {
-  return knex.schema.createTable('subscription_plan_subscriptions', table => {
-    table.increments('id');
-    table.string('slug');
-
-    table.integer('plan_id').unsigned().index().references('id').inTable('subscription_plans');
-    table.bigInteger('tenant_id').unsigned().index().references('id').inTable('tenants');
-
-    table.dateTime('starts_at').nullable();
-    table.dateTime('ends_at').nullable();
-
-    table.dateTime('cancels_at').nullable();
-    table.dateTime('canceled_at').nullable();
-
-    table.timestamps();
-  });
-};
-
-exports.down = function(knex) {
-  return knex.schema.dropTableIfExists('subscription_plan_subscriptions');
-};

packages/server/src/system/migrations/20200823235339_create_subscription_licenses_table.js

@@ -1,22 +0,0 @@
-
-exports.up = function(knex) {
-  return knex.schema.createTable('subscription_licenses', (table) => {
-    table.increments();
-
-    table.string('license_code').unique().index();
-    table.integer('plan_id').unsigned().index().references('id').inTable('subscription_plans');
-
-    table.integer('license_period').unsigned();
-    table.string('period_interval');
-
-    table.dateTime('sent_at').index();
-    table.dateTime('disabled_at').index();
-    table.dateTime('used_at').index();
-
-    table.timestamps();
-  })
-};
-
-exports.down = function(knex) {
-  return knex.schema.dropTableIfExists('subscription_licenses');
-};

packages/server/src/system/migrations/20230405011450_drop_phone_number_column_from_users_table.js

@@ -0,0 +1,9 @@
+exports.up = function (knex) {
+  return knex.schema.table('users', (table) => {
+    table.dropColumn('phone_number');
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.table('users', (table) => {});
+};

packages/server/src/system/models/Subscriptions/License.ts

@@ -1,129 +0,0 @@
-import { Model, mixin } from 'objection';
-import moment from 'moment';
-import SystemModel from '@/system/models/SystemModel';
-
-export default class License extends SystemModel {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'subscription_licenses';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return ['createdAt', 'updatedAt'];
-  }
-
-  /**
-   * Model modifiers.
-   */
-  static get modifiers() {
-    return {
-      // Filters active licenses.
-      filterActiveLicense(query) {
-        query.where('disabled_at', null);
-        query.where('used_at', null);
-      },
-
-      // Find license by its code or id.
-      findByCodeOrId(query, id, code) {
-        if (id) {
-          query.where('id', id);
-        }
-        if (code) {
-          query.where('license_code', code);
-        }
-      },
-
-      // Filters licenses list.
-      filter(builder, licensesFilter) {
-        if (licensesFilter.active) {
-          builder.modify('filterActiveLicense');
-        }
-        if (licensesFilter.disabled) {
-          builder.whereNot('disabled_at', null);
-        }
-        if (licensesFilter.used) {
-          builder.whereNot('used_at', null);
-        }
-        if (licensesFilter.sent) {
-          builder.whereNot('sent_at', null);
-        }
-      },
-    };
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const Plan = require('system/models/Subscriptions/Plan');
-
-    return {
-      plan: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Plan.default,
-        join: {
-          from: 'subscription_licenses.planId',
-          to: 'subscriptions_plans.id',
-        },
-      },
-    };
-  }
-
-  /**
-   * Deletes the given license code from the storage.
-   * @param {string} licenseCode
-   * @return {Promise}
-   */
-  static deleteLicense(licenseCode, viaAttribute = 'license_code') {
-    return this.query().where(viaAttribute, licenseCode).delete();
-  }
-
-  /**
-   * Marks the given license code as disabled on the storage.
-   * @param {string} licenseCode
-   * @return {Promise}
-   */
-  static markLicenseAsDisabled(licenseCode, viaAttribute = 'license_code') {
-    return this.query().where(viaAttribute, licenseCode).patch({
-      disabled_at: moment().toMySqlDateTime(),
-    });
-  }
-
-  /**
-   * Marks the given license code as sent on the storage.
-   * @param {string} licenseCode
-   */
-  static markLicenseAsSent(licenseCode, viaAttribute = 'license_code') {
-    return this.query().where(viaAttribute, licenseCode).patch({
-      sent_at: moment().toMySqlDateTime(),
-    });
-  }
-
-  /**
-   * Marks the given license code as used on the storage.
-   * @param {string} licenseCode
-   * @return {Promise}
-   */
-  static markLicenseAsUsed(licenseCode, viaAttribute = 'license_code') {
-    return this.query().where(viaAttribute, licenseCode).patch({
-      used_at: moment().toMySqlDateTime(),
-    });
-  }
-
-  /**
-   *
-   * @param {IIPlan} plan
-   * @return {boolean}
-   */
-  isEqualPlanPeriod(plan) {
-    return (
-      this.invoicePeriod === plan.invoiceInterval &&
-      license.licensePeriod === license.periodInterval
-    );
-  }
-}

packages/server/src/system/models/Subscriptions/Plan.ts

@@ -1,82 +0,0 @@
-import { Model, mixin } from 'objection';
-import SystemModel from '@/system/models/SystemModel';
-import { PlanSubscription } from '..';
-
-export default class Plan extends mixin(SystemModel) {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'subscription_plans';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return ['createdAt', 'updatedAt'];
-  }
-
-  /**
-   * Defined virtual attributes.
-   */
-  static get virtualAttributes() {
-    return ['isFree', 'hasTrial'];
-  }
-
-  /**
-   * Model modifiers.
-   */
-  static get modifiers() {
-    return {
-      getFeatureBySlug(builder, featureSlug) {
-        builder.where('slug', featureSlug);
-      },
-    };
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const PlanSubscription = require('system/models/Subscriptions/PlanSubscription');
-
-    return {
-      /**
-       * The plan may have many subscriptions.
-       */
-      subscriptions: {
-        relation: Model.HasManyRelation,
-        modelClass: PlanSubscription.default,
-        join: {
-          from: 'subscription_plans.id',
-          to: 'subscription_plan_subscriptions.planId',
-        },
-      }
-    };
-  }
-
-  /**
-   * Check if plan is free.
-   * @return {boolean}
-   */
-  isFree() {
-    return this.price <= 0;
-  }
-
-  /**
-   * Check if plan is paid.
-   * @return {boolean}
-   */
-  isPaid() {
-    return !this.isFree();
-  }
-
-  /**
-   * Check if plan has trial.
-   * @return {boolean}
-   */
-  hasTrial() {
-    return this.trialPeriod && this.trialInterval;
-  }
-}