Skip to content

V1.10 validations fix #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pranavkparti wants to merge 2 commits into
base: v1.10
Choose a base branch
from
Open

V1.10 validations fix #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b578943
fix: schema validations
pranavkparti Sep 14, 2023
a768638
fix: broken tests
pranavkparti Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __tests__/trust-relationship-api.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ describe('Trust relationship management', () => {

it("GET /trust_relationships", async () => {
const res = await request(server)
.get("/trust_relationships")
.get("/trust_relationships?limit=20")
.set('treetracker-api-key', apiKey)
.set('Authorization', `Bearer ${bearerToken}`);
expect(res).property("statusCode").to.eq(200); // Integration
Expand Down
2 changes: 1 addition & 1 deletion server/routes/authRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ authRouter.post(
req.body,
Joi.object({
wallet: Joi.alternatives().try(
Joi.string().min(4).max(36),
Joi.string().min(4).max(254),
).required(),
password: Joi.string()
.max(32)
Expand Down
25 changes: 19 additions & 6 deletions server/routes/tokenRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ tokenRouter.get('/:id',
helper.apiKeyHandler,
helper.verifyJWTHandler,
helper.handlerWrapper(async (req, res, next) => {
Joi.assert(
req.params,
Joi.object({
id: Joi.string().uuid().required(),
})
);

const {id} = req.params;
const session = new Session();
const tokenService = new TokenService(session);
Expand Down Expand Up @@ -42,8 +49,8 @@ tokenRouter.get('/',
Joi.assert(
req.query,
Joi.object({
limit: Joi.number().min(1).max(1000).required(),
start: Joi.number().min(1).integer(),
limit: Joi.number().integer().min(1).max(2000).required(),
start: Joi.number().integer().min(1).default(1),
wallet: Joi.string(),
})
);
Expand Down Expand Up @@ -104,12 +111,18 @@ tokenRouter.get('/:id/transactions',
Joi.assert(
req.query,
Joi.object({
limit: Joi.number().required(),
start: Joi.number().min(1).max(10000).integer(),
id: Joi.string().uuid(),
transactions: Joi.string(),
limit: Joi.number().integer().min(1).max(2000).required(),
start: Joi.number().integer().min(1).default(1),
})
);

Joi.assert(
req.params,
Joi.object({
id: Joi.string().uuid().required(),
})
);

const {limit, start} = req.query;

const session = new Session();
Expand Down
12 changes: 6 additions & 6 deletions server/routes/transferRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ transferRouter.post(
tokens: Joi.any().required(),
}).unknown(),{
then: Joi.object({
tokens: Joi.array().items(Joi.string()).required().unique(),
tokens: Joi.array().items(Joi.string().uuid()).required().unique(),
sender_wallet: Joi.alternatives().try(
Joi.string(),
).required(),
Expand Down Expand Up @@ -269,10 +269,10 @@ transferRouter.get("/",
.valid(...Object.values(Transfer.STATE)),
wallet: Joi.alternatives().try(
Joi.string(),
Joi.number().min(4).max(32)
Joi.string().uuid(),
),
limit: Joi.number().required(),
start: Joi.number().min(1).max(10000).integer()
limit: Joi.number().integer().min(1).max(2000).required(),
start: Joi.number().integer().min(1).default(1)
})
);
const {state, wallet, limit, start} = req.query;
Expand Down Expand Up @@ -336,8 +336,8 @@ transferRouter.get('/:transfer_id/tokens',
Joi.assert(
req.query,
Joi.object({
limit: Joi.number().required(),
start: Joi.number().min(1).max(10000).integer(),
limit: Joi.number().integer().min(1).max(2000).required(),
start: Joi.number().integer().min(1).default(1),
})
);
const {limit, start} = req.query;
Expand Down
2 changes: 1 addition & 1 deletion server/routes/transferRouter.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ describe("transferRouter", () => {
const res = await request(app)
.post('/')
.send({
tokens: ['1'],
tokens: [tokenId],
sender_wallet: 'wallet1',
receiver_wallet: 'wallet2',
});
Expand Down
21 changes: 11 additions & 10 deletions server/routes/trustRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ trustRouter.get('/',
state: Joi.string(),
type: Joi.string(),
request_type: Joi.string(),
start: Joi.number(),
limit: Joi.number().min(1).max(10000).integer(),
start: Joi.number().integer().min(1).default(1),
limit: Joi.number().integer().min(1).max(2000).required(),
})
)
Joi.assert(
res.locals,
Joi.object({
wallet_id: Joi.string().required()
wallet_id: Joi.string().uuid().required()
})
)
const {state, type, request_type, limit, start} = req.query;
Expand Down Expand Up @@ -84,12 +84,13 @@ trustRouter.post('/',
Joi.object({
trust_request_type: Joi.string().required().valid(...Object.keys(TrustRelationship.ENTITY_TRUST_REQUEST_TYPE)),
requestee_wallet: Joi.string().required(),
requester_wallet: Joi.string(),
})
);
Joi.assert(
res.locals,
Joi.object({
wallet_id: Joi.string().required()
wallet_id: Joi.string().uuid().required()
})
)

Expand Down Expand Up @@ -120,13 +121,13 @@ trustRouter.post('/:trustRelationshipId/accept',
Joi.assert(
res.locals,
Joi.object({
wallet_id: Joi.string().required()
wallet_id: Joi.string().uuid().required()
})
)
Joi.assert(
req.params,
Joi.object({
trustRelationshipId: Joi.string().required()
trustRelationshipId: Joi.string().uuid().required()
})
)
const trustRelationshipId = req.params.trustRelationshipId;
Expand All @@ -147,13 +148,13 @@ trustRouter.post('/:trustRelationshipId/decline',
Joi.assert(
res.locals,
Joi.object({
wallet_id: Joi.string().required()
wallet_id: Joi.string().uuid().required()
})
)
Joi.assert(
req.params,
Joi.object({
trustRelationshipId: Joi.string().required()
trustRelationshipId: Joi.string().uuid().required()
})
)
const trustRelationshipId = req.params.trustRelationshipId;
Expand All @@ -174,13 +175,13 @@ trustRouter.delete('/:trustRelationshipId',
Joi.assert(
res.locals,
Joi.object({
wallet_id: Joi.string().required()
wallet_id: Joi.string().uuid().required()
})
)
Joi.assert(
req.params,
Joi.object({
trustRelationshipId: Joi.string().required()
trustRelationshipId: Joi.string().uuid().required()
})
)
const trustRelationshipId = req.params.trustRelationshipId;
Expand Down
7 changes: 7 additions & 0 deletions server/routes/walletRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,13 @@ walletRouter.get(
helper.apiKeyHandler,
helper.verifyJWTHandler,
helper.handlerWrapper(async (req, res, next) => {
Joi.assert(
req.params,
Joi.object({
wallet_id: Joi.string().uuid().required(),
}),
);

const session = new Session();
const trustService = new TrustService(session);
const walletService = new WalletService(session);
Expand Down