QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 12:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: issue in mail sender.

Browse Source
This commit is contained in:
a.bouhuolia
2020-12-17 01:16:08 +02:00
parent 3ac6d8897e
commit 46d06bd591
32 changed files with 538 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/api/controllers/Authentication.ts
View File

@@ -6,7 +6,7 @@ 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, IRegisterOTD } from 'interfaces';
import { ILoginDTO, ISystemUser, IRegisterDTO } from 'interfaces';
import { ServiceError, ServiceErrors } from "exceptions";
import { DATATYPES_LENGTH } from 'data/DataTypes';
import LoginThrottlerMiddleware from 'api/middleware/LoginThrottlerMiddleware';
@@ -206,7 +206,7 @@ export default class AuthenticationController extends BaseController{
* @param {Response} res
*/
async register(req: Request, res: Response, next: Function) {
const registerDTO: IRegisterOTD = this.matchedBodyData(req);
const registerDTO: IRegisterDTO = this.matchedBodyData(req);
try {
const registeredUser: ISystemUser = await this.authService.register(registerDTO);

55
server/src/api/controllers/InviteUsers.ts
View File

@@ -1,10 +1,6 @@
import { Service, Inject } from 'typedi';
import { Router, Request, Response } from 'express';
import {
check,
body,
param,
} from 'express-validator';
import { check, body, param } from 'express-validator';
import asyncMiddleware from 'api/middleware/asyncMiddleware';
import InviteUserService from 'services/InviteUsers';
import { ServiceErrors, ServiceError } from 'exceptions';
@@ -21,11 +17,11 @@ export default class InviteUsersController extends BaseController {
authRouter() {
const router = Router();
router.post('/send', [
body('email').exists().trim().escape(),
],
router.post(
'/send',
[body('email').exists().trim().escape()],
this.validationResult,
asyncMiddleware(this.sendInvite.bind(this)),
asyncMiddleware(this.sendInvite.bind(this))
);
return router;
}
@@ -36,15 +32,15 @@ export default class InviteUsersController extends BaseController {
nonAuthRouter() {
const router = Router();
router.post('/accept/:token', [
...this.inviteUserDTO,
],
router.post(
'/accept/:token',
[...this.inviteUserDTO],
this.validationResult,
asyncMiddleware(this.accept.bind(this))
);
router.get('/invited/:token', [
param('token').exists().trim().escape(),
],
router.get(
'/invited/:token',
[param('token').exists().trim().escape()],
this.validationResult,
asyncMiddleware(this.invited.bind(this))
);
@@ -67,9 +63,9 @@ export default class InviteUsersController extends BaseController {
/**
* Invite a user to the authorized user organization.
* @param {Request} req -
* @param {Response} res -
* @param {NextFunction} next -
* @param {Request} req -
* @param {Response} res -
* @param {NextFunction} next -
*/
async sendInvite(req: Request, res: Response, next: Function) {
const { email } = req.body;
@@ -78,11 +74,12 @@ export default class InviteUsersController extends BaseController {
try {
await this.inviteUsersService.sendInvite(tenantId, email, user);
return res.status(200).send({
type: 'success',
code: 'INVITE.SENT.SUCCESSFULLY',
message: 'The invite has been sent to the given email.',
})
});
} catch (error) {
if (error instanceof ServiceError) {
if (error.errorType === 'email_already_invited') {
@@ -98,9 +95,9 @@ export default class InviteUsersController extends BaseController {
/**
* Accept the inviation.
* @param {Request} req -
* @param {Response} res -
* @param {NextFunction} next -
* @param {Request} req -
* @param {Response} res -
* @param {NextFunction} next -
*/
async accept(req: Request, res: Response, next: Function) {
const inviteUserInput: IInviteUserInput = this.matchedBodyData(req, {
@@ -135,15 +132,18 @@ export default class InviteUsersController extends BaseController {
/**
* Check if the invite token is valid.
* @param {Request} req -
* @param {Response} res -
* @param {NextFunction} next -
* @param {Request} req -
* @param {Response} res -
* @param {NextFunction} next -
*/
async invited(req: Request, res: Response, next: Function) {
const { token } = req.params;
try {
const { inviteToken, orgName } = await this.inviteUsersService.checkInvite(token);
const {
inviteToken,
orgName,
} = await this.inviteUsersService.checkInvite(token);
return res.status(200).send({
inviteToken: inviteToken.token,
@@ -151,7 +151,6 @@ export default class InviteUsersController extends BaseController {
organizationName: orgName?.value,
});
} catch (error) {
if (error instanceof ServiceError) {
if (error.errorType === 'invite_token_invalid') {
return res.status(400).send({
@@ -162,4 +161,4 @@ export default class InviteUsersController extends BaseController {
next(error);
}
}
}
}

6
server/src/api/controllers/Items.ts
View File

@@ -218,7 +218,11 @@ export default class ItemsController extends BaseController {
try {
const storedItem = await this.itemsService.newItem(tenantId, itemDTO);
return res.status(200).send({ id: storedItem.id });
return res.status(200).send({
id: storedItem.id,
message: 'Item has been created successfully.',
});
} catch (error) {
next(error);
}

3
server/src/api/controllers/Organization.ts
View File

@@ -58,9 +58,10 @@ export default class OrganizationController extends BaseController{
*/
async build(req: Request, res: Response, next: Function) {
const { organizationId } = req.tenant;
const { user } = req;
try {
await this.organizationService.build(organizationId);
await this.organizationService.build(organizationId, user);
return res.status(200).send({
type: 'success',

129
server/src/api/controllers/Subscription/Licenses.ts
View File

@@ -1,5 +1,5 @@
import { Service, Inject } from 'typedi';
import { Router, Request, Response } from 'express'
import { Router, Request, Response } from 'express';
import { check, oneOf, ValidationChain } from 'express-validator';
import basicAuth from 'express-basic-auth';
import config from 'config';
@@ -20,42 +20,41 @@ export default class LicensesController extends BaseController {
router() {
const router = Router();
router.use(basicAuth({
users: {
[config.licensesAuth.user]: config.licensesAuth.password,
},
challenge: true,
}));
router.use(
basicAuth({
users: {
[config.licensesAuth.user]: config.licensesAuth.password,
},
challenge: true,
})
);
router.post(
'/generate',
this.generateLicenseSchema,
this.validationResult,
asyncMiddleware(this.validatePlanExistance.bind(this)),
asyncMiddleware(this.generateLicense.bind(this)),
asyncMiddleware(this.generateLicense.bind(this))
);
router.post(
'/disable/:licenseId',
this.validationResult,
asyncMiddleware(this.validateLicenseExistance.bind(this)),
asyncMiddleware(this.validateNotDisabledLicense.bind(this)),
asyncMiddleware(this.disableLicense.bind(this)),
asyncMiddleware(this.disableLicense.bind(this))
);
router.post(
'/send',
this.sendLicenseSchemaValidation,
this.validationResult,
asyncMiddleware(this.sendLicense.bind(this)),
asyncMiddleware(this.sendLicense.bind(this))
);
router.delete(
'/:licenseId',
asyncMiddleware(this.validateLicenseExistance.bind(this)),
asyncMiddleware(this.deleteLicense.bind(this)),
);
router.get(
'/',
asyncMiddleware(this.listLicenses.bind(this)),
asyncMiddleware(this.deleteLicense.bind(this))
);
router.get('/', asyncMiddleware(this.listLicenses.bind(this)));
return router;
}
@@ -66,9 +65,9 @@ export default class LicensesController extends BaseController {
return [
check('loop').exists().isNumeric().toInt(),
check('period').exists().isNumeric().toInt(),
check('period_interval').exists().isIn([
'month', 'months', 'year', 'years', 'day', 'days'
]),
check('period_interval')
.exists()
.isIn(['month', 'months', 'year', 'years', 'day', 'days']),
check('plan_id').exists().isNumeric().toInt(),
];
}
@@ -78,12 +77,11 @@ export default class LicensesController extends BaseController {
*/
get specificLicenseSchema(): ValidationChain[] {
return [
oneOf([
check('license_id').exists().isNumeric().toInt(),
], [
check('license_code').exists().isNumeric().toInt(),
])
]
oneOf(
[check('license_id').exists().isNumeric().toInt()],
[check('license_code').exists().isNumeric().toInt()]
),
];
}
/**
@@ -103,9 +101,9 @@ export default class LicensesController extends BaseController {
/**
* Validate the plan existance on the storage.
* @param {Request} req
* @param {Response} res
* @param {Function} next
* @param {Request} req
* @param {Response} res
* @param {Function} next
*/
async validatePlanExistance(req: Request, res: Response, next: Function) {
const body = this.matchedBodyData(req);
@@ -122,8 +120,8 @@ export default class LicensesController extends BaseController {
/**
* Valdiate the license existance on the storage.
* @param {Request} req
* @param {Response} res
* @param {Request} req
* @param {Response} res
* @param {Function}
*/
async validateLicenseExistance(req: Request, res: Response, next: Function) {
@@ -142,11 +140,15 @@ export default class LicensesController extends BaseController {
/**
* Validates whether the license id is disabled.
* @param {Request} req
* @param {Response} res
* @param {Function} next
* @param {Request} req
* @param {Response} res
* @param {Function} next
*/
async validateNotDisabledLicense(req: Request, res: Response, next: Function) {
async validateNotDisabledLicense(
req: Request,
res: Response,
next: Function
) {
const licenseId = req.params.licenseId || req.query.licenseId;
const foundLicense = await License.query().findById(licenseId);
@@ -160,31 +162,36 @@ export default class LicensesController extends BaseController {
/**
* Generate licenses codes with given period in bulk.
* @param {Request} req
* @param {Response} res
* @param {Request} req
* @param {Response} res
* @return {Response}
*/
async generateLicense(req: Request, res: Response, next: Function) {
const { loop = 10, period, periodInterval, planId } = this.matchedBodyData(req);
const { loop = 10, period, periodInterval, planId } = this.matchedBodyData(
req
);
try {
await this.licenseService.generateLicenses(
loop, period, periodInterval, planId,
loop,
period,
periodInterval,
planId
);
return res.status(200).send({
code: 100,
type: 'LICENSEES.GENERATED.SUCCESSFULLY',
message: 'The licenses have been 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
* @param {Request} req
* @param {Response} res
* @return {Response}
*/
async disableLicense(req: Request, res: Response) {
@@ -197,8 +204,8 @@ export default class LicensesController extends BaseController {
/**
* Deletes the given license code on the storage.
* @param {Request} req
* @param {Response} res
* @param {Request} req
* @param {Response} res
* @return {Response}
*/
async deleteLicense(req: Request, res: Response) {
@@ -211,13 +218,19 @@ export default class LicensesController extends BaseController {
/**
* Send license code in the given period to the customer via email or phone number
* @param {Request} req
* @param {Response} res
* @param {Request} req
* @param {Response} res
* @return {Response}
*/
async sendLicense(req: Request, res: Response) {
const { phoneNumber, email, period, periodInterval, planId } = this.matchedBodyData(req);
const {
phoneNumber,
email,
period,
periodInterval,
planId,
} = this.matchedBodyData(req);
const license = await License.query()
.modify('filterActiveLicense')
.where('license_period', period)
@@ -228,12 +241,15 @@ export default class LicensesController extends BaseController {
if (!license) {
return res.status(400).send({
status: 110,
message: 'There is no licenses availiable right now with the given period and plan.',
message:
'There is no licenses availiable right now with the given period and plan.',
code: 'NO.AVALIABLE.LICENSE.CODE',
});
}
await this.licenseService.sendLicenseToCustomer(
license.licenseCode, phoneNumber, email,
license.licenseCode,
phoneNumber,
email
);
return res.status(200).send({
status: 100,
@@ -244,8 +260,8 @@ export default class LicensesController extends BaseController {
/**
* Listing licenses.
* @param {Request} req
* @param {Response} res
* @param {Request} req
* @param {Response} res
*/
async listLicenses(req: Request, res: Response) {
const filter: ILicensesFilter = {
@@ -255,11 +271,10 @@ export default class LicensesController extends BaseController {
active: false,
...req.query,
};
const licenses = await License.query()
.onBuild((builder) => {
builder.modify('filter', filter);
builder.orderBy('createdAt', 'ASC');
});
const licenses = await License.query().onBuild((builder) => {
builder.modify('filter', filter);
builder.orderBy('createdAt', 'ASC');
});
return res.status(200).send({ licenses });
}
}
}