Skip to content
Snippets Groups Projects
Commit 1ff1cf89 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Fix unit test 'Identities collision'

[fix] BMA: parse query param "?pubkey" like "?pubkey=true"
parent cb5903da
No related branches found
No related tags found
1 merge request!1422Optimize response time of `/wot/requirements/:search`
Pipeline #31792 passed
......@@ -133,7 +133,7 @@ export class WOTBinding extends AbstractController {
async certifiersOf(req: any): Promise<HttpCertifications> {
const search = await ParametersService.getSearchP(req);
let idty: FullIindexEntry;
if (req.query.pubkey) {
if (ParametersService.getIsPubkey(req)) {
idty = (await this.server.dal.getWrittenIdtyByPubkeyForHashingAndIsMember(
search
)) as FullIindexEntry;
......@@ -188,7 +188,7 @@ export class WOTBinding extends AbstractController {
async requirements(req: any): Promise<HttpRequirements> {
const search = await ParametersService.getSearchP(req);
let identities: any = [];
if (req.query.pubkey) {
if (ParametersService.getIsPubkey(req)) {
if (!BMAConstants.PUBLIC_KEY.test(search)) {
throw BMAConstants.ERRORS.NO_IDTY_MATCHING_PUB_OR_UID;
}
......@@ -245,7 +245,7 @@ export class WOTBinding extends AbstractController {
async certifiedBy(req: any): Promise<HttpCertifications> {
const search = await ParametersService.getSearchP(req);
let idty: FullIindexEntry;
if (req.query.pubkey) {
if (ParametersService.getIsPubkey(req)) {
idty = (await this.server.dal.getWrittenIdtyByPubkeyForHashingAndIsMember(
search
)) as FullIindexEntry;
......
......@@ -96,6 +96,16 @@ export class ParametersService {
callback(null, matches[0]);
};
static getIsPubkey(req: any): boolean {
const value = req.query.pubkey;
return (
value !== null &&
value !== undefined &&
value !== "false" &&
value !== false
);
}
static getPubkeyP(req: any) {
return Q.nbind(ParametersService.getPubkey, this)(req);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment