Skip to content
This repository has been archived by the owner on Apr 19, 2023. It is now read-only.

Commit

Permalink
♻️ Use Joi.number() for ID
Browse files Browse the repository at this point in the history
  • Loading branch information
@AnandChowdhary
AnandChowdhary committed Aug 18, 2020
1 parent 661bf6d commit 08a2c53
Show file tree
Hide file tree
Showing 18 changed files with 109 additions and 109 deletions.
2 changes: 1 addition & 1 deletion src/controllers/auth/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export class AuthController {
@Post("impersonate/:id")
@Middleware(authHandler)
@Middleware(
validator({ impersonateUserId: Joi.string().required() }, "params")
validator({ impersonateUserId: Joi.number().required() }, "params")
)
async getImpersonate(req: Request, res: Response) {
const tokenUserId = res.locals.token.id;
Expand Down
20 changes: 10 additions & 10 deletions src/controllers/organizations/_id/api-keys.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class GroupApiKeysController {
@Get()
async getUserApiKeys(req: Request, res: Response) {
const id = twtToId(req.params.id);
joiValidate({ id: Joi.string().required() }, { id });
joiValidate({ id: Joi.number().required() }, { id });
return getGroupApiKeysForUser(localsToTokenOrKey(res), id, req.query);
}

Expand All @@ -50,7 +50,7 @@ export class GroupApiKeysController {
)
async putUserApiKeys(req: Request, res: Response) {
const id = twtToId(req.params.id);
joiValidate({ id: Joi.string().required() }, { id });
joiValidate({ id: Joi.number().required() }, { id });
const added = await createApiKeyForUser(
localsToTokenOrKey(res),
id,
Expand All @@ -66,8 +66,8 @@ export class GroupApiKeysController {
const apiKeyId = twtToId(req.params.apiKeyId);
joiValidate(
{
id: Joi.string().required(),
apiKeyId: Joi.string().required(),
id: Joi.number().required(),
apiKeyId: Joi.number().required(),
},
{ id, apiKeyId }
);
Expand All @@ -92,8 +92,8 @@ export class GroupApiKeysController {
const apiKeyId = twtToId(req.params.apiKeyId);
joiValidate(
{
id: Joi.string().required(),
apiKeyId: Joi.string().required(),
id: Joi.number().required(),
apiKeyId: Joi.number().required(),
},
{ id, apiKeyId }
);
Expand All @@ -113,8 +113,8 @@ export class GroupApiKeysController {
const apiKeyId = twtToId(req.params.apiKeyId);
joiValidate(
{
id: Joi.string().required(),
apiKeyId: Joi.string().required(),
id: Joi.number().required(),
apiKeyId: Joi.number().required(),
},
{ id, apiKeyId }
);
Expand All @@ -133,8 +133,8 @@ export class GroupApiKeysController {
const apiKeyId = twtToId(req.params.apiKeyId);
joiValidate(
{
id: Joi.string().required(),
apiKeyId: Joi.string().required(),
id: Joi.number().required(),
apiKeyId: Joi.number().required(),
},
{ id, apiKeyId }
);
Expand Down
6 changes: 3 additions & 3 deletions src/controllers/organizations/_id/billing.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ export class GroupBillingController {
@Get()
async getBilling(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
return getGroupBillingForUser(localsToTokenOrKey(res), groupId);
}

@Patch()
async patchBilling(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
await updateGroupBillingForUser(
localsToTokenOrKey(res),
groupId,
Expand All @@ -35,7 +35,7 @@ export class GroupBillingController {
const groupId = twtToId(req.params.id);
joiValidate(
{
groupId: Joi.string().required(),
groupId: Joi.number().required(),
},
{ groupId }
);
Expand Down
20 changes: 10 additions & 10 deletions src/controllers/organizations/_id/domains.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class GroupDomainsController {
@Get()
async getUserDomains(req: Request, res: Response) {
const id = twtToId(req.params.id);
joiValidate({ id: Joi.string().required() }, { id });
joiValidate({ id: Joi.number().required() }, { id });
return getGroupDomainsForUser(localsToTokenOrKey(res), id, req.query);
}

Expand All @@ -47,7 +47,7 @@ export class GroupDomainsController {
)
async putUserDomains(req: Request, res: Response) {
const id = twtToId(req.params.id);
joiValidate({ id: Joi.string().required() }, { id });
joiValidate({ id: Joi.number().required() }, { id });
const added = await createDomainForUser(
localsToTokenOrKey(res),
id,
Expand All @@ -63,8 +63,8 @@ export class GroupDomainsController {
const domainId = twtToId(req.params.domainId);
joiValidate(
{
id: Joi.string().required(),
domainId: Joi.string().required(),
id: Joi.number().required(),
domainId: Joi.number().required(),
},
{ id, domainId }
);
Expand All @@ -85,8 +85,8 @@ export class GroupDomainsController {
const domainId = twtToId(req.params.domainId);
joiValidate(
{
id: Joi.string().required(),
domainId: Joi.string().required(),
id: Joi.number().required(),
domainId: Joi.number().required(),
},
{ id, domainId }
);
Expand All @@ -106,8 +106,8 @@ export class GroupDomainsController {
const domainId = twtToId(req.params.domainId);
joiValidate(
{
id: Joi.string().required(),
domainId: Joi.string().required(),
id: Joi.number().required(),
domainId: Joi.number().required(),
},
{ id, domainId }
);
Expand All @@ -127,8 +127,8 @@ export class GroupDomainsController {
const method = req.body.method || req.query.method;
joiValidate(
{
id: Joi.string().required(),
domainId: Joi.string().required(),
id: Joi.number().required(),
domainId: Joi.number().required(),
method: Joi.string().allow("file", "dns").only(),
},
{ id, domainId, method }
Expand Down
8 changes: 4 additions & 4 deletions src/controllers/organizations/_id/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class GroupController {
@Get()
async get(req: Request, res: Response) {
const id = twtToId(req.params.id);
joiValidate({ id: Joi.string().required() }, { id });
joiValidate({ id: Joi.number().required() }, { id });
const group = await getGroupForUser(localsToTokenOrKey(res), id);
return group;
}
Expand All @@ -45,7 +45,7 @@ export class GroupController {
)
async patch(req: Request, res: Response) {
const id = twtToId(req.params.id);
joiValidate({ id: Joi.string().required() }, { id });
joiValidate({ id: Joi.number().required() }, { id });
const updated = await updateGroupForUser(
localsToTokenOrKey(res),
id,
Expand All @@ -58,15 +58,15 @@ export class GroupController {
@Delete()
async delete(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
await deleteGroupForUser(res.locals.token.id, groupId, res.locals);
return respond(RESOURCE_DELETED);
}

@Get("data")
async getData(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
return getAllGroupDataForUser(localsToTokenOrKey(res), groupId);
}
}
6 changes: 3 additions & 3 deletions src/controllers/organizations/_id/invoices.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export class GroupInvoicesController {
@Get()
async getInvoices(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
const subscriptionParams = { ...req.query };
joiValidate(
{
Expand All @@ -37,8 +37,8 @@ export class GroupInvoicesController {
const invoiceId = req.params.invoiceId;
joiValidate(
{
groupId: Joi.string().required(),
invoiceId: Joi.string().required(),
groupId: Joi.number().required(),
invoiceId: Joi.number().required(),
},
{ groupId, invoiceId }
);
Expand Down
16 changes: 8 additions & 8 deletions src/controllers/organizations/_id/memberships.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class GroupMembershipsController {
@Get()
async getMemberships(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
return getGroupMembershipsForUser(
localsToTokenOrKey(res),
groupId,
Expand All @@ -47,7 +47,7 @@ export class GroupMembershipsController {
const role = req.body.role;
joiValidate(
{
groupId: Joi.string().required(),
groupId: Joi.number().required(),
newMemberName: Joi.string().min(6).required(),
newMemberEmail: Joi.string().email().required(),
role: Joi.number(),
Expand Down Expand Up @@ -76,8 +76,8 @@ export class GroupMembershipsController {
const membershipId = twtToId(req.params.membershipId);
joiValidate(
{
groupId: Joi.string().required(),
membershipId: Joi.string().required(),
groupId: Joi.number().required(),
membershipId: Joi.number().required(),
},
{ groupId, membershipId }
);
Expand All @@ -102,8 +102,8 @@ export class GroupMembershipsController {
const membershipId = twtToId(req.params.membershipId);
joiValidate(
{
groupId: Joi.string().required(),
membershipId: Joi.string().required(),
groupId: Joi.number().required(),
membershipId: Joi.number().required(),
},
{ groupId, membershipId }
);
Expand All @@ -122,8 +122,8 @@ export class GroupMembershipsController {
const membershipId = twtToId(req.params.membershipId);
joiValidate(
{
groupId: Joi.string().required(),
membershipId: Joi.string().required(),
groupId: Joi.number().required(),
membershipId: Joi.number().required(),
},
{ groupId, membershipId }
);
Expand Down
16 changes: 8 additions & 8 deletions src/controllers/organizations/_id/sources.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class GroupSourcesController {
@Get()
async getSources(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
const subscriptionParams = { ...req.query };
joiValidate(
{
Expand All @@ -48,7 +48,7 @@ export class GroupSourcesController {
@Put()
async putSources(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
await createGroupSourceForUser(
localsToTokenOrKey(res),
groupId,
Expand All @@ -64,8 +64,8 @@ export class GroupSourcesController {
const sourceId = req.params.sourceId;
joiValidate(
{
groupId: Joi.string().required(),
sourceId: Joi.string().required(),
groupId: Joi.number().required(),
sourceId: Joi.number().required(),
},
{ groupId, sourceId }
);
Expand All @@ -78,8 +78,8 @@ export class GroupSourcesController {
const groupId = twtToId(req.params.id);
joiValidate(
{
groupId: Joi.string().required(),
sourceId: Joi.string().required(),
groupId: Joi.number().required(),
sourceId: Joi.number().required(),
},
{ groupId, sourceId }
);
Expand All @@ -99,8 +99,8 @@ export class GroupSourcesController {
const groupId = twtToId(req.params.id);
joiValidate(
{
groupId: Joi.string().required(),
sourceId: Joi.string().required(),
groupId: Joi.number().required(),
sourceId: Joi.number().required(),
},
{ groupId, sourceId }
);
Expand Down
12 changes: 6 additions & 6 deletions src/controllers/organizations/_id/subscriptions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class GroupSubscriptionsController {
@Get()
async getSubscriptions(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
const subscriptionParams = { ...req.query };
joiValidate(
{
Expand All @@ -44,7 +44,7 @@ export class GroupSubscriptionsController {
@Put()
async putSubscriptions(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
const subscriptionParams = { ...req.body };
joiValidate(
{
Expand All @@ -70,8 +70,8 @@ export class GroupSubscriptionsController {
const subscriptionId = req.params.subscriptionId;
joiValidate(
{
groupId: Joi.string().required(),
subscriptionId: Joi.string().required(),
groupId: Joi.number().required(),
subscriptionId: Joi.number().required(),
},
{ groupId, subscriptionId }
);
Expand All @@ -89,8 +89,8 @@ export class GroupSubscriptionsController {
const data = req.body;
joiValidate(
{
groupId: Joi.string().required(),
subscriptionId: Joi.string().required(),
groupId: Joi.number().required(),
subscriptionId: Joi.number().required(),
},
{ groupId, subscriptionId }
);
Expand Down
8 changes: 4 additions & 4 deletions src/controllers/organizations/_id/transactions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export class GroupTransactionsController {
@Get()
async getTransactions(req: Request, res: Response) {
const groupId = twtToId(req.params.id);
joiValidate({ groupId: Joi.string().required() }, { groupId });
joiValidate({ groupId: Joi.number().required() }, { groupId });
const transactionParams = { ...req.query };
joiValidate(
{
Expand All @@ -35,7 +35,7 @@ export class GroupTransactionsController {
const couponCode = req.body.couponCode;
joiValidate(
{
groupId: Joi.string().required(),
groupId: Joi.number().required(),
couponCode: Joi.string().required(),
},
{ groupId, couponCode }
Expand All @@ -53,8 +53,8 @@ export class GroupTransactionsController {
const transactionId = req.params.transactionId;
joiValidate(
{
groupId: Joi.string().required(),
transactionId: Joi.string().required(),
groupId: Joi.number().required(),
transactionId: Joi.number().required(),
},
{ groupId, transactionId }
);
Expand Down
Loading

0 comments on commit 08a2c53

Please sign in to comment.