Merge pull request #290 from frostyfrog/feature/revocation-support

Feature/revocation support

Author: dbluhm

src/renderer/components/CredentialIssuance/CredDefList.vue

@@ -63,6 +63,12 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="Revocable?" :label-width="formLabelWidth">
+          <el-checkbox id="support_revocation" v-model="createForm.support_revocation" />
+        </el-form-item>
+        <el-form-item label="Revocation Registry Size" :label-width="formLabelWidth">
+          <el-input-number id="revocation_registry_size" v-model="createForm.revocation_registry_size" :disabled="!createForm.support_revocation" min=4 max=32769 />
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="deactivate()">Cancel</el-button>
@@ -111,10 +117,12 @@ export default {
       expanded_items:[],
       createFormActive: false,
       createForm: {
-        schema_id: ''
+        schema_id: '',
+        support_revocation: false,
+        revocation_registry_size: 100
       },
       retrieve_cred_def_id: '',
-      formLabelWidth: '100px'
+      formLabelWidth: '95px'
     }
   },
   created: async function() {
@@ -126,10 +134,16 @@ export default {
       let query_msg = {
         "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-credential-definitions/0.1/send-credential-definition",
         "schema_id": this.createForm.schema_id,
+        "support_revocation": this.createForm.support_revocation,
       };
+      if (this.createForm.support_revocation) {
+        query_msg["revocation_registry_size"] = this.createForm.revocation_registry_size;
+      }
       this.send_message(query_msg);
       this.createFormActive = false;
       this.createForm.schema_id = '';
+      this.createForm.support_revocation = false;
+      this.createForm.revocation_registry_size = 100;
     },
     get_cred_def: function() {
       let query_msg = {
@@ -147,6 +161,8 @@ export default {
     deactivate: function() {
       this.createFormActive = false;
       this.createForm.schema_id = '';
+      this.createForm.support_revocation = false;
+      this.createForm.revocation_registry_size = 100;
     },
   }
 }

src/renderer/components/CredentialIssuance/IssuedCredList.vue

@@ -39,10 +39,21 @@
               </vue-json-pretty>
             </div>
             <el-button v-on:click="collapse_expanded(issued_credential)">^</el-button>
+            <el-button v-on:click="activateRevokeForm(issued_credential)">Revoke</el-button>
           </el-row>
         </el-collapse-item>
       </ul>
     </el-collapse>
+    <el-dialog title="Revoke Credential" :visible.sync="revokeFormActive" @close="deActivateRevokeForm()">
+      <el-descriptions :title.sync="revokeForm.title" border=true column=1>
+        <el-descriptions-item label="Exchange ID">{{revokeForm.credential_exchange_id}}</el-descriptions-item>
+        <el-descriptions-item label="Creation Date">{{revokeForm.created_at}}</el-descriptions-item>
+      </el-descriptions>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="deActivateRevokeForm()">Cancel</el-button>
+        <el-button :disabled="!revokeForm.credential_exchange_id" type="primary" @click="revoke">Confirm</el-button>
+      </span>
+    </el-dialog>
     <el-dialog title="Issue Credential" :visible.sync="issueFormActive" @close="deActivateForm()">
       <el-form :model="issueForm">
         <el-form-item label="Connection:" :label-width="formLabelWidth">
@@ -132,8 +143,15 @@ export default {
         comment: '',
         attributes: []
       },
+      revokeFormActive: false,
+      revokeForm: {
+        title: '',
+        credential_exchange_id: null,
+        created_at: null
+      },
       retrieve_cred_def_id: '',
-      formLabelWidth: '200px'
+      formLabelWidth: '200px',
+      revokeFormLabelWidth: '100px'
     }
   },
   computed: {
@@ -154,6 +172,22 @@ export default {
         item => item != creddef.credential_exchange_id
       );
     },
+    activateRevokeForm: function(cred) {
+      this.revokeFormActive = true;
+      this.revokeForm = {
+        title: `Are you sure that you want to revoke "${this.credential_title(cred)}"?`,
+        credential_exchange_id: cred.credential_exchange_id,
+        created_at: cred.created_at
+      }
+    },
+    deActivateRevokeForm: function() {
+      this.revokeFormActive = false;
+      this.revokeForm = {
+        title: '',
+        credential_exchange_id: null,
+        created_at: null
+      }
+    },
     deActivateForm: function() {
       this.issueFormActive = false;
       this.issueForm = {
@@ -163,6 +197,19 @@ export default {
         attributes: []
       };
     },
+    revoke: function() {
+      let values = {
+        credential_exchange_id: this.revokeForm.credential_exchange_id,
+      }
+      this.revokeForm = {
+        title: '',
+        credential_exchange_id: null,
+        created_at: null
+      }
+
+      this.$emit('revoke', values);
+      this.revokeFormActive = false;
+    },
     issue: function() {
       let values = {
         connection_id: this.issueForm.connection_id,

src/renderer/components/CredentialIssuance/index.vue

@@ -19,6 +19,7 @@
       v-bind:connections="active_connections"
       v-bind:cred_defs="issuer_cred_defs"
       @issue="issue_credential"
+      @revoke="revoke_credential"
       @issue-cred-refresh="fetch_issued_credentials">
     </issued-cred-list>
   </el-row>
@@ -163,6 +164,13 @@ export default {
       };
       this.send_message(query_msg);
     },
+    revoke_credential: function(form) {
+      let query_msg = {
+        "@type": "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-issuer/0.1/revoke-credential",
+        "credential_exchange_id": form.credential_exchange_id,
+      };
+      this.send_message(query_msg);
+    },
   }
 }
 </script>

src/renderer/components/Verifications/Verification.vue

@@ -74,6 +74,10 @@
             type="textarea"></el-input>
         </el-form-item>
 
+        <el-form-item label="Exclude Revoked:">
+          <el-checkbox v-model="requestForm.non_revoked" />
+        </el-form-item>
+
         <!-- Dynamic Attributes -->
         <el-form-item
           v-for="(attribute, index) in requestForm.attributes"
@@ -221,6 +225,7 @@ export default {
         connection_id: '', // Who
         comment: '', // Optional comment
         name: '',
+        non_revoked: false,
         attributes: [
           // Key: (can be whatever) property name,
           // {
@@ -309,6 +314,9 @@ export default {
         predicates: this.requestForm.predicates
       }
       this.requestFormActive = false;
+      if (this.requestForm.non_revoked) {
+        values.non_revoked = true;
+      }
 
       this.requestForm.connection_id = '';
       this.requestForm.name = '';

src/renderer/components/Verifications/index.vue

@@ -96,6 +96,9 @@ export default {
             if (attribute.restrictions.cred_def) {
               transmuted_attr.restrictions[0].cred_def_id = attribute.restrictions.cred_def.cred_def_id;
             }
+            if (attribute.restrictions.trusted_issuer) {
+              transmuted_attr.restrictions[0].issuer_did = attribute.restrictions.trusted_issuer;
+            }
             acc[attribute.name] = transmuted_attr;
             return acc;
           }, {}),
@@ -112,11 +115,17 @@ export default {
             if (predicate.restrictions.cred_def) {
               transmuted_pred.restrictions[0].cred_def_id = predicate.restrictions.cred_def.cred_def_id;
             }
+            if (predicate.restrictions.trusted_issuer) {
+              transmuted_pred.restrictions[0].issuer_did = predicate.restrictions.trusted_issuer;
+            }
             acc[predicate.name] = transmuted_pred;
             return acc;
           }, {}),
         },
       };
+      if (form.non_revoked) {
+        query_msg.proof_request.non_revoked = {"to": new Date().getTime()};
+      }
       this.send_message(query_msg);
     },
   },