From f8089284624a712977fcf4b09390b942312c8b2a Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Tue, 27 Feb 2018 13:30:06 +0100
Subject: [PATCH] [fix] critical: a revoked member should not try to be revoked
again
---
app/lib/dal/fileDAL.ts | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/app/lib/dal/fileDAL.ts b/app/lib/dal/fileDAL.ts
index a74e9de3c..5d5ca4367 100644
--- a/app/lib/dal/fileDAL.ts
+++ b/app/lib/dal/fileDAL.ts
@@ -314,12 +314,24 @@ export class FileDAL {
}
}
- getWrittenIdtyByPubkey(pubkey:string) {
- return this.iindexDAL.getFromPubkey(pubkey)
+ async getWrittenIdtyByPubkey(pubkey:string) {
+ const idty = await this.iindexDAL.getFromPubkey(pubkey)
+ if (!idty) {
+ return null;
+ }
+ const membership = await this.mindexDAL.getReducedMS(pubkey)
+ idty.revoked_on = membership.revoked_on
+ return idty;
}
- getWrittenIdtyByUID(uid:string) {
- return this.iindexDAL.getFromUID(uid)
+ async getWrittenIdtyByUID(uid:string) {
+ const idty = await this.iindexDAL.getFromUID(uid)
+ if (!idty) {
+ return null;
+ }
+ const membership = await this.mindexDAL.getReducedMS(idty.pub)
+ idty.revoked_on = membership.revoked_on
+ return idty;
}
async fillInMembershipsOfIdentity(queryPromise:Promise<DBIdentity>) {
--
GitLab