+
|
+
-
+
- Bigcapital Cloud + Bigcapital Cloud
@@ -51,7 +51,7 @@ Bigcapital is available open-source under AGPL license. You can host it on your ### Docker -To get started with self-hosted with Docker and Docker Compose, take a look at the [Docker guide](https://docs.bigcapital.ly/deployment/docker). +To get started with self-hosted with Docker and Docker Compose, take a look at the [Docker guide](https://docs.bigcapital.app/deployment/docker). ## Development @@ -74,7 +74,7 @@ You can integrate Bigcapital API with your system to organize your transactions # Resources -- [Documentation](https://docs.bigcapital.ly/) - Learn how to use. +- [Documentation](https://docs.bigcapital.app/) - Learn how to use. - [Contribution](https://github.com/bigcapitalhq/bigcapital/blob/develop/CONTRIBUTING.md) - Welcome to any contributions. - [Discord](https://discord.com/invite/c8nPBJafeb) - Ask for help. - [Bug Tracker](https://github.com/bigcapitalhq/bigcapital/issues) - Notify us new bugs. diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index d842d1d86..bdbc136bf 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -25,12 +25,12 @@ services: webapp: container_name: bigcapital-webapp - image: ghcr.io/bigcapitalhq/webapp:latest + image: bigcapitalhq/webapp:latest restart: on-failure server: container_name: bigcapital-server - image: ghcr.io/bigcapitalhq/server:latest + image: bigcapitalhq/server:latest expose: - '3000' links: @@ -102,6 +102,13 @@ services: - LEMONSQUEEZY_WEBHOOK_SECRET=${LEMONSQUEEZY_WEBHOOK_SECRET} - HOSTED_ON_BIGCAPITAL_CLOUD=${HOSTED_ON_BIGCAPITAL_CLOUD} + # New Relic matrics tracking. + - NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=${NEW_RELIC_DISTRIBUTED_TRACING_ENABLED} + - NEW_RELIC_LOG=${NEW_RELIC_LOG} + - NEW_RELIC_AI_MONITORING_ENABLED=${NEW_RELIC_AI_MONITORING_ENABLED} + - NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED} + - NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED} + # OIDC - OIDC_LOGIN_DISABLED=${OIDC_LOGIN_DISABLED:-false} - OIDC_ISSUER=${OIDC_ISSUER} diff --git a/docker/migration/Dockerfile b/docker/migration/Dockerfile index 162d5039c..d61ef0679 100644 --- a/docker/migration/Dockerfile +++ b/docker/migration/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bigcapitalhq/server:latest as build +FROM bigcapitalhq/server:latest as build ARG DB_HOST= \ DB_USER= \ @@ -34,7 +34,5 @@ WORKDIR /app/packages/server RUN git clone https://github.com/vishnubob/wait-for-it.git -ADD docker/migration/start.sh / -RUN chmod +x /start.sh - -CMD ["/start.sh"] \ No newline at end of file +# Once we listen the mysql port run the migration task. +CMD ./wait-for-it/wait-for-it.sh mysql:3306 -- sh -c "node ./build/commands.js system:migrate:latest && node ./build/commands.js tenants:migrate:latest" diff --git a/docker/migration/start.sh b/docker/migration/start.sh deleted file mode 100644 index 5fa9f0c28..000000000 --- a/docker/migration/start.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Migrate the master system database. -./wait-for-it/wait-for-it.sh mysql:3306 -- node ./build/commands.js system:migrate:latest - -# Migrate all tenants. -./wait-for-it/wait-for-it.sh mysql:3306 -- node ./build/commands.js tenants:migrate:latest \ No newline at end of file diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index 095508e2d..be4426405 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -78,6 +78,9 @@ ENV MAIL_HOST=$MAIL_HOST \ SIGNUP_ALLOWED_DOMAINS=$SIGNUP_ALLOWED_DOMAINS \ SIGNUP_ALLOWED_EMAILS=$SIGNUP_ALLOWED_EMAILS +# New Relic config file. +ENV NEW_RELIC_NO_CONFIG_FILE=true + # Create app directory. WORKDIR /app @@ -89,8 +92,8 @@ RUN npm install -g pnpm # Copy application dependency manifests to the container image. COPY ./package*.json ./ COPY ./pnpm-lock.yaml ./pnpm-lock.yaml -COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml COPY ./lerna.json ./lerna.json +COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml COPY ./packages/server/package*.json ./packages/server/ # Install application dependencies diff --git a/packages/server/package.json b/packages/server/package.json index 1e3660471..2ba20d9d0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -83,6 +83,7 @@ "mustache": "^3.0.3", "mysql": "^2.17.1", "mysql2": "^1.6.5", + "newrelic": "^11.15.0", "node-cache": "^4.2.1", "nodemailer": "^6.3.0", "nodemon": "^1.19.1", diff --git a/packages/server/resources/locales/en.json b/packages/server/resources/locales/en.json index 13fc8a174..ba4c158b8 100644 --- a/packages/server/resources/locales/en.json +++ b/packages/server/resources/locales/en.json @@ -244,6 +244,7 @@ "account.field.active": "Active", "account.field.currency": "Currency", "account.field.balance": "Balance", + "account.field.bank_balance": "Bank Balance", "account.field.parent_account": "Parent Account", "account.field.created_at": "Created at", "item.field.type": "Item Type", @@ -331,7 +332,7 @@ "bill_payment.field.reference_no": "Reference No.", "bill_payment.field.description": "Description", "bill_payment.field.exchange_rate": "Exchange Rate", - "bill_payment.field.statement": "Statement", + "bill_payment.field.note": "Note", "bill_payment.field.entries.bill": "Bill No.", "bill_payment.field.entries.payment_amount": "Payment Amount", "bill_payment.field.reference": "Reference No.", @@ -431,6 +432,7 @@ "vendor.field.created_at": "Created at", "vendor.field.balance": "Balance", "vendor.field.status": "Status", + "vendor.field.note": "Note", "vendor.field.currency": "Currency", "vendor.field.status.active": "Active", "vendor.field.status.inactive": "Inactive", diff --git a/packages/server/src/api/controllers/Authentication.ts b/packages/server/src/api/controllers/Authentication.ts index c26da733e..354d37475 100644 --- a/packages/server/src/api/controllers/Authentication.ts +++ b/packages/server/src/api/controllers/Authentication.ts @@ -11,6 +11,8 @@ import AuthenticationApplication from '@/services/Authentication/AuthApplication import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser'; import JWTAuth from '@/api/middleware/jwtAuth'; +import JWTAuth from '@/api/middleware/jwtAuth'; +import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser'; @Service() export default class AuthenticationController extends BaseController { @Inject() @@ -30,6 +32,20 @@ export default class AuthenticationController extends BaseController { asyncMiddleware(this.login.bind(this)), this.handlerErrors ); + router.use('/register/verify/resend', JWTAuth); + router.use('/register/verify/resend', AttachCurrentTenantUser); + router.post( + '/register/verify/resend', + asyncMiddleware(this.registerVerifyResendMail.bind(this)), + this.handlerErrors + ); + router.post( + '/register/verify', + this.signupVerifySchema, + this.validationResult, + asyncMiddleware(this.registerVerify.bind(this)), + this.handlerErrors + ); router.post( '/register', this.registerSchema, @@ -107,6 +123,17 @@ export default class AuthenticationController extends BaseController { ]; } + private get signupVerifySchema(): ValidationChain[] { + return [ + check('email') + .exists() + .isString() + .isEmail() + .isLength({ max: DATATYPES_LENGTH.STRING }), + check('token').exists().isString(), + ]; + } + /** * Reset password schema. * @returns {ValidationChain[]} @@ -174,6 +201,58 @@ export default class AuthenticationController extends BaseController { } } + /** + * Verifies the provider user's email after signin-up. + * @param {Request} req + * @param {Response}| res + * @param {Function} next + * @returns {Response|void} + */ + private async registerVerify(req: Request, res: Response, next: Function) { + const signUpVerifyDTO: { email: string; token: string } = + this.matchedBodyData(req); + + try { + const user = await this.authApplication.signUpConfirm( + signUpVerifyDTO.email, + signUpVerifyDTO.token + ); + return res.status(200).send({ + type: 'success', + message: 'The given user has verified successfully', + user, + }); + } catch (error) { + next(error); + } + } + + /** + * Resends the confirmation email to the user. + * @param {Request} req + * @param {Response}| res + * @param {Function} next + */ + private async registerVerifyResendMail( + req: Request, + res: Response, + next: Function + ) { + const { user } = req; + + try { + const data = await this.authApplication.signUpConfirmResend(user.id); + + return res.status(200).send({ + type: 'success', + message: 'The given user has verified successfully', + data, + }); + } catch (error) { + next(error); + } + } + /** * Send reset password handler * @param {Request} req diff --git a/packages/server/src/api/controllers/Export/ExportController.ts b/packages/server/src/api/controllers/Export/ExportController.ts new file mode 100644 index 000000000..632c84932 --- /dev/null +++ b/packages/server/src/api/controllers/Export/ExportController.ts @@ -0,0 +1,99 @@ +import { Inject, Service } from 'typedi'; +import { Router, Request, Response, NextFunction } from 'express'; +import { query } from 'express-validator'; +import BaseController from '@/api/controllers/BaseController'; +import { ServiceError } from '@/exceptions'; +import { ExportApplication } from '@/services/Export/ExportApplication'; +import { ACCEPT_TYPE } from '@/interfaces/Http'; + +@Service() +export class ExportController extends BaseController { + @Inject() + private exportResourceApp: ExportApplication; + + /** + * Router constructor method. + */ + router() { + const router = Router(); + + router.get( + '/', + [ + query('resource').exists(), + query('format').isIn(['csv', 'xlsx']).optional(), + ], + this.validationResult, + this.export.bind(this), + this.catchServiceErrors + ); + return router; + } + + /** + * Imports xlsx/csv to the given resource type. + * @param {Request} req - + * @param {Response} res - + * @param {NextFunction} next - + */ + private async export(req: Request, res: Response, next: NextFunction) { + const { tenantId } = req; + const query = this.matchedQueryData(req); + + try { + const accept = this.accepts(req); + + const acceptType = accept.types([ + ACCEPT_TYPE.APPLICATION_XLSX, + ACCEPT_TYPE.APPLICATION_CSV, + ACCEPT_TYPE.APPLICATION_PDF, + ]); + const data = await this.exportResourceApp.export( + tenantId, + query.resource, + acceptType === ACCEPT_TYPE.APPLICATION_XLSX ? 'xlsx' : 'csv' + ); + if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) { + res.setHeader('Content-Disposition', 'attachment; filename=output.csv'); + res.setHeader('Content-Type', 'text/csv'); + + return res.send(data); + // Retrieves the xlsx format. + } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) { + res.setHeader( + 'Content-Disposition', + 'attachment; filename=output.xlsx' + ); + res.setHeader( + 'Content-Type', + 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' + ); + return res.send(data); + } + } catch (error) { + next(error); + } + } + + /** + * Transforms service errors to response. + * @param {Error} + * @param {Request} req + * @param {Response} res + * @param {ServiceError} error + */ + private catchServiceErrors( + error, + req: Request, + res: Response, + next: NextFunction + ) { + if (error instanceof ServiceError) { + return res.status(400).send({ + errors: [{ type: error.errorType }], + }); + } + + next(error); + } +} diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts index e5943475b..a3af24354 100644 --- a/packages/server/src/api/index.ts +++ b/packages/server/src/api/index.ts @@ -2,66 +2,67 @@ import { Router } from 'express'; 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'; -import I18nMiddleware from '@/api/middleware/I18nMiddleware'; -import I18nAuthenticatedMiddlware from '@/api/middleware/I18nAuthenticatedMiddlware'; import EnsureTenantIsSeeded from '@/api/middleware/EnsureTenantIsSeeded'; +import I18nAuthenticatedMiddlware from '@/api/middleware/I18nAuthenticatedMiddlware'; +import I18nMiddleware from '@/api/middleware/I18nMiddleware'; +import SettingsMiddleware from '@/api/middleware/SettingsMiddleware'; +import SubscriptionMiddleware from '@/api/middleware/SubscriptionMiddleware'; +import TenancyMiddleware from '@/api/middleware/TenancyMiddleware'; +import JWTAuth from '@/api/middleware/jwtAuth'; // Routes -import Authentication from '@/api/controllers/Authentication'; -import InviteUsers from '@/api/controllers/InviteUsers'; -import Organization from '@/api/controllers/Organization'; import Account from '@/api/controllers/Account'; -import Users from '@/api/controllers/Users'; -import Items from '@/api/controllers/Items'; -import ItemCategories from '@/api/controllers/ItemCategories'; -import Accounts from '@/api/controllers/Accounts'; import AccountTypes from '@/api/controllers/AccountTypes'; -import Views from '@/api/controllers/Views'; -import ManualJournals from '@/api/controllers/ManualJournals'; -import FinancialStatements from '@/api/controllers/FinancialStatements'; -import Expenses from '@/api/controllers/Expenses'; -import Settings from '@/api/controllers/Settings'; -import Currencies from '@/api/controllers/Currencies'; +import Accounts from '@/api/controllers/Accounts'; +import Authentication from '@/api/controllers/Authentication'; import Contacts from '@/api/controllers/Contacts/Contacts'; import Customers from '@/api/controllers/Contacts/Customers'; import Vendors from '@/api/controllers/Contacts/Vendors'; -import Sales from '@/api/controllers/Sales'; -import Purchases from '@/api/controllers/Purchases'; -import Resources from './controllers/Resources'; +import Currencies from '@/api/controllers/Currencies'; import ExchangeRates from '@/api/controllers/ExchangeRates'; -import Media from '@/api/controllers/Media'; -import Ping from '@/api/controllers/Ping'; -import { SubscriptionController } from '@/api/controllers/Subscription'; +import Expenses from '@/api/controllers/Expenses'; +import FinancialStatements from '@/api/controllers/FinancialStatements'; import InventoryAdjustments from '@/api/controllers/Inventory/InventoryAdjustments'; -import asyncRenderMiddleware from './middleware/AsyncRenderMiddleware'; -import Jobs from './controllers/Jobs'; +import InviteUsers from '@/api/controllers/InviteUsers'; +import ItemCategories from '@/api/controllers/ItemCategories'; +import Items from '@/api/controllers/Items'; +import ManualJournals from '@/api/controllers/ManualJournals'; +import Media from '@/api/controllers/Media'; import Miscellaneous from '@/api/controllers/Miscellaneous'; +import OidcController from '@/api/controllers/Oidc'; +import Organization from '@/api/controllers/Organization'; import OrganizationDashboard from '@/api/controllers/OrganizationDashboard'; +import Ping from '@/api/controllers/Ping'; +import Purchases from '@/api/controllers/Purchases'; +import Sales from '@/api/controllers/Sales'; +import Settings from '@/api/controllers/Settings'; +import { SubscriptionController } from '@/api/controllers/Subscription'; +import Users from '@/api/controllers/Users'; +import Views from '@/api/controllers/Views'; +import { BranchIntegrationErrorsMiddleware } from '@/services/Branches/BranchIntegrationErrorsMiddleware'; +import { BankingController } from './controllers/Banking/BankingController'; +import { BranchesController } from './controllers/Branches'; import CashflowController from './controllers/Cashflow/CashflowController'; -import AuthorizationMiddleware from './middleware/AuthorizationMiddleware'; -import RolesController from './controllers/Roles'; -import TransactionsLocking from './controllers/TransactionsLocking'; import DashboardController from './controllers/Dashboard'; -import { BranchesController } from './controllers/Branches'; -import { WarehousesController } from './controllers/Warehouses'; -import { WarehousesTransfers } from './controllers/Warehouses/WarehouseTransfers'; -import { WarehousesItemController } from './controllers/Warehouses/WarehousesItem'; -import { BranchIntegrationErrorsMiddleware } from '@/services/Branches/BranchIntegrationErrorsMiddleware'; +import { ExportController } from './controllers/Export/ExportController'; +import { ImportController } from './controllers/Import/ImportController'; import { InventoryItemsCostController } from './controllers/Inventory/InventortyItemsCosts'; +import Jobs from './controllers/Jobs'; import { ProjectsController } from './controllers/Projects/Projects'; import { ProjectTasksController } from './controllers/Projects/Tasks'; import { ProjectTimesController } from './controllers/Projects/Times'; +import Resources from './controllers/Resources'; +import RolesController from './controllers/Roles'; import { TaxRatesController } from './controllers/TaxRates/TaxRates'; -import { ImportController } from './controllers/Import/ImportController'; -import { BankingController } from './controllers/Banking/BankingController'; +import TransactionsLocking from './controllers/TransactionsLocking'; +import { WarehousesController } from './controllers/Warehouses'; +import { WarehousesTransfers } from './controllers/Warehouses/WarehouseTransfers'; +import { WarehousesItemController } from './controllers/Warehouses/WarehousesItem'; import { Webhooks } from './controllers/Webhooks/Webhooks'; -import OidcController from '@/api/controllers/Oidc' +import asyncRenderMiddleware from './middleware/AsyncRenderMiddleware'; +import AuthorizationMiddleware from './middleware/AuthorizationMiddleware'; export default () => { const app = Router(); @@ -70,7 +71,7 @@ export default () => { // --------------------------- app.use(asyncRenderMiddleware); app.use(I18nMiddleware); - + app.use('/oidc', Container.get(OidcController).router()); app.use('/auth', Container.get(Authentication).router()); app.use('/invite', Container.get(InviteUsers).nonAuthRouter()); @@ -143,6 +144,7 @@ export default () => { dashboard.use('/projects', Container.get(ProjectsController).router()); dashboard.use('/tax-rates', Container.get(TaxRatesController).router()); dashboard.use('/import', Container.get(ImportController).router()); + dashboard.use('/export', Container.get(ExportController).router()); dashboard.use('/', Container.get(ProjectTasksController).router()); dashboard.use('/', Container.get(ProjectTimesController).router()); diff --git a/packages/server/src/config/index.ts b/packages/server/src/config/index.ts index 6a61b70d1..72307d080 100644 --- a/packages/server/src/config/index.ts +++ b/packages/server/src/config/index.ts @@ -153,6 +153,13 @@ module.exports = { ), }, + /** + * Sign-up email confirmation + */ + signupConfirmation: { + enabled: parseBoolean| + |
+
+
+
+
+
|
+ + |
+ We sent an email to asdahmed@gmail.com Click the + link inside to get started. +
+ +