refactor: quote compat into the demo client

KILTprotocol · Feb 26, 2020 · 364c4f7 · 364c4f7
1 parent 988c853
commit 364c4f7
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 47 deletions.
diff --git a/src/components/CTypePresentation/CTypePresentation.tsx b/src/components/CTypePresentation/CTypePresentation.tsx
@@ -162,7 +162,7 @@ class CTypePresentation extends React.Component<Props, State> {
         callback: () => {
           PersistentStore.store.dispatch(
             UiState.Store.updateCurrentTaskAction({
-              objective: sdk.MessageBodyType.REQUEST_LEGITIMATIONS,
+              objective: sdk.MessageBodyType.REQUEST_TERMS,
               props: {
                 cTypeHash,
               } as RequestLegitimationsProps,
@@ -186,7 +186,7 @@ class CTypePresentation extends React.Component<Props, State> {
         callback: () => {
           PersistentStore.store.dispatch(
             UiState.Store.updateCurrentTaskAction({
-              objective: sdk.MessageBodyType.SUBMIT_LEGITIMATIONS,
+              objective: sdk.MessageBodyType.SUBMIT_TERMS,
               props: {
                 claim: { cTypeHash },
               } as SubmitLegitimationsProps,

diff --git a/src/components/ContactPresentation/ContactPresentation.tsx b/src/components/ContactPresentation/ContactPresentation.tsx
@@ -164,7 +164,7 @@ class ContactPresentation extends React.Component<Props, State> {
       callback: () => {
         PersistentStore.store.dispatch(
           UiState.Store.updateCurrentTaskAction({
-            objective: sdk.MessageBodyType.REQUEST_LEGITIMATIONS,
+            objective: sdk.MessageBodyType.REQUEST_TERMS,
             props: {
               receiverAddresses: [address],
             } as RequestLegitimationsProps,
@@ -192,7 +192,7 @@ class ContactPresentation extends React.Component<Props, State> {
       callback: () => {
         PersistentStore.store.dispatch(
           UiState.Store.updateCurrentTaskAction({
-            objective: sdk.MessageBodyType.SUBMIT_LEGITIMATIONS,
+            objective: sdk.MessageBodyType.SUBMIT_TERMS,
             props: {
               receiverAddresses: [address],
             } as SubmitLegitimationsProps,

diff --git a/src/components/CtypeEditor/CtypeEditor.tsx b/src/components/CtypeEditor/CtypeEditor.tsx
@@ -1,4 +1,4 @@
-import { CTypeInputModel } from '@kiltprotocol/sdk-js'
+import { CTypeInputModel } from '../../utils/CtypeUtils/CtypeInputSchema'
 import * as React from 'react'
 
 import * as common from 'schema-based-json-editor'

diff --git a/src/components/DevTools/DevTools.attestations.tsx b/src/components/DevTools/DevTools.attestations.tsx
@@ -250,9 +250,9 @@ class BsAttestation {
     }
 
     // send request for legitimation from claimer to attester
-    const requestAcceptDelegation: sdk.IRequestLegitimations = {
+    const requestAcceptDelegation: sdk.IRequestTerms = {
       content: partialClaim,
-      type: sdk.MessageBodyType.REQUEST_LEGITIMATIONS,
+      type: sdk.MessageBodyType.REQUEST_TERMS,
     }
     await MessageRepository.singleSend(
       requestAcceptDelegation,
@@ -261,13 +261,13 @@ class BsAttestation {
     )
 
     // send legitimations from attester to claimer
-    const submitLegitimations: sdk.ISubmitLegitimations = {
+    const submitLegitimations: sdk.ISubmitTerms = {
       content: {
         claim: partialClaim,
-        delegationId: attestedClaim.request.delegationId,
+        delegationId: attestedClaim.request.delegationId || undefined,
         legitimations: attestedClaim.request.legitimations,
       },
-      type: sdk.MessageBodyType.SUBMIT_LEGITIMATIONS,
+      type: sdk.MessageBodyType.SUBMIT_TERMS,
     }
     await MessageRepository.singleSend(
       submitLegitimations,
@@ -277,7 +277,7 @@ class BsAttestation {
 
     // send signed legitmations from claimer to attester
     const requestAttestationForClaim: sdk.IRequestAttestationForClaim = {
-      content: requestForAttestation,
+      content: { requestForAttestation },
       type: sdk.MessageBodyType.REQUEST_ATTESTATION_FOR_CLAIM,
     }
     await MessageRepository.singleSend(

diff --git a/src/components/DevTools/data/cTypes.json b/src/components/DevTools/data/cTypes.json
@@ -1,8 +1,9 @@
 {
   "DRIVERS_LICENSE": {
     "schema": {
-      "$id": "DriversLicense",
+      "$id": "kilt:ctype:0x1",
       "$schema": "http://kilt-protocol.org/draft-01/ctype#",
+      "title": "DriversLicense",
       "properties": {
         "name": {
           "type": "string"
@@ -38,8 +39,9 @@
   },
   "IS_OFFICIAL": {
     "schema": {
-      "$id": "IsOfficial",
+      "$id": "kilt:ctype:0x2",
       "$schema": "http://kilt-protocol.org/draft-01/ctype#",
+      "title": "Official ID",
       "properties": {},
       "type": "object"
     },

diff --git a/src/components/MessageDetailView/MessageDetailView.tsx b/src/components/MessageDetailView/MessageDetailView.tsx
@@ -106,18 +106,18 @@ class MessageDetailView extends React.Component<Props, State> {
       | undefined = this.getMessageBodyType(message)
 
     switch (messageBodyType) {
-      case sdk.MessageBodyType.REQUEST_LEGITIMATIONS: {
+      case sdk.MessageBodyType.REQUEST_TERMS: {
         const { showTask } = this.state
 
         return (
           <>
             <ClaimDetailView
-              claim={(message.body as sdk.IRequestLegitimations).content}
+              claim={(message.body as sdk.IRequestTerms).content}
             />
             {showTask ? (
               <SubmitLegitimations
                 receiverAddresses={[message.senderAddress]}
-                claim={(message.body as sdk.IRequestLegitimations).content}
+                claim={(message.body as sdk.IRequestTerms).content}
                 onCancel={this.handleCancel}
                 onFinished={this.handleDelete}
               />
@@ -131,15 +131,15 @@ class MessageDetailView extends React.Component<Props, State> {
           </>
         )
       }
-      case sdk.MessageBodyType.SUBMIT_LEGITIMATIONS: {
+      case sdk.MessageBodyType.SUBMIT_TERMS: {
         return (
           <RequestAttestation
-            claim={(message.body as sdk.ISubmitLegitimations).content.claim}
+            claim={(message.body as sdk.ISubmitTerms).content.claim}
             legitimations={
-              (message.body as sdk.ISubmitLegitimations).content.legitimations
+              (message.body as sdk.ISubmitTerms).content.legitimations
             }
             delegationId={
-              (message.body as sdk.ISubmitLegitimations).content.delegationId
+              (message.body as sdk.ISubmitTerms).content.delegationId || null
             }
             receiverAddresses={[message.senderAddress]}
             onCancel={this.handleCancel}
@@ -152,7 +152,7 @@ class MessageDetailView extends React.Component<Props, State> {
           <AttestClaim
             claimerAddresses={[message.senderAddress]}
             requestForAttestation={
-              (message.body as sdk.IRequestAttestationForClaim).content
+              (message.body as sdk.IRequestAttestationForClaim).content.requestForAttestation
             }
             onCancel={this.handleCancel}
             onFinished={this.handleDelete}

diff --git a/src/containers/ClaimView/ClaimView.tsx b/src/containers/ClaimView/ClaimView.tsx
@@ -145,7 +145,7 @@ class ClaimView extends React.Component<Props, State> {
   private requestLegitimation(claimEntry: Claims.Entry) {
     PersistentStore.store.dispatch(
       UiState.Store.updateCurrentTaskAction({
-        objective: sdk.MessageBodyType.REQUEST_LEGITIMATIONS,
+        objective: sdk.MessageBodyType.REQUEST_TERMS,
         props: {
           cTypeHash: claimEntry.claim.cTypeHash,
           preSelectedClaimEntries: [claimEntry],

diff --git a/src/containers/Tasks/Tasks.tsx b/src/containers/Tasks/Tasks.tsx
@@ -37,11 +37,11 @@ export type TaskProps =
       props: undefined
     }
   | {
-      objective: sdk.MessageBodyType.REQUEST_LEGITIMATIONS
+      objective: sdk.MessageBodyType.REQUEST_TERMS
       props: RequestLegitimationsProps
     }
   | {
-      objective: sdk.MessageBodyType.SUBMIT_LEGITIMATIONS
+      objective: sdk.MessageBodyType.SUBMIT_TERMS
       props: SubmitLegitimationsProps
     }
   | {
@@ -120,7 +120,7 @@ class Tasks extends React.Component<Props, State> {
     )
 
     switch (currentTask.objective) {
-      case sdk.MessageBodyType.REQUEST_LEGITIMATIONS: {
+      case sdk.MessageBodyType.REQUEST_TERMS: {
         const props = currentTask.props
         const cTypeHash =
           selectedCTypes && selectedCTypes[0]
@@ -145,7 +145,7 @@ class Tasks extends React.Component<Props, State> {
           props.receiverAddresses
         )
       }
-      case sdk.MessageBodyType.SUBMIT_LEGITIMATIONS: {
+      case sdk.MessageBodyType.SUBMIT_TERMS: {
         const props = currentTask.props
         const cTypeHash = props.claim ? props.claim.cTypeHash : undefined
         return this.getModal(

diff --git a/src/services/AttestationWorkflow.ts b/src/services/AttestationWorkflow.ts
@@ -2,7 +2,7 @@ import * as sdk from '@kiltprotocol/sdk-js'
 import {
   IPartialClaim,
   IRequestAttestationForClaim,
-  IRequestLegitimations,
+  IRequestTerms,
   ISubmitAttestationForClaim,
   MessageBodyType,
 } from '@kiltprotocol/sdk-js'
@@ -31,8 +31,8 @@ class AttestationWorkflow {
       (claim: IPartialClaim) =>
         ({
           content: claim,
-          type: MessageBodyType.REQUEST_LEGITIMATIONS,
-        } as IRequestLegitimations)
+          type: MessageBodyType.REQUEST_TERMS,
+        } as IRequestTerms)
     )
 
     return MessageRepository.multiSendToAddresses(
@@ -57,9 +57,9 @@ class AttestationWorkflow {
     receiverAddresses: Array<Contact['publicIdentity']['address']>,
     delegation?: MyDelegation
   ): Promise<void> {
-    const messageBody: sdk.ISubmitLegitimations = {
-      content: { claim, legitimations, delegationId: null },
-      type: sdk.MessageBodyType.SUBMIT_LEGITIMATIONS,
+    const messageBody: sdk.ISubmitTerms = {
+      content: { claim, legitimations, delegationId: undefined },
+      type: sdk.MessageBodyType.SUBMIT_TERMS,
     }
 
     if (delegation) {
@@ -113,7 +113,7 @@ class AttestationWorkflow {
       delegationId
     )
     const messageBody = {
-      content: requestForAttestation,
+      content: { requestForAttestation },
       type: MessageBodyType.REQUEST_ATTESTATION_FOR_CLAIM,
     } as IRequestAttestationForClaim
 

diff --git a/src/services/MessageRepository.tsx b/src/services/MessageRepository.tsx
@@ -230,21 +230,17 @@ class MessageRepository {
     const { type } = body
 
     switch (type) {
-      case sdk.MessageBodyType.REQUEST_LEGITIMATIONS:
-        return [(message.body as sdk.IRequestLegitimations).content.cTypeHash]
-      case sdk.MessageBodyType.SUBMIT_LEGITIMATIONS:
-        return [
-          (message.body as sdk.ISubmitLegitimations).content.claim.cTypeHash,
-        ]
-      case sdk.MessageBodyType.REJECT_LEGITIMATIONS:
-        return [
-          (message.body as sdk.IRejectLegitimations).content.claim.cTypeHash,
-        ]
+      case sdk.MessageBodyType.REQUEST_TERMS:
+        return [(message.body as sdk.IRequestTerms).content.cTypeHash]
+      case sdk.MessageBodyType.SUBMIT_TERMS:
+        return [(message.body as sdk.ISubmitTerms).content.claim.cTypeHash]
+      case sdk.MessageBodyType.REJECT_TERMS:
+        return [(message.body as sdk.IRejectTerms).content.claim.cTypeHash]
 
       case sdk.MessageBodyType.REQUEST_ATTESTATION_FOR_CLAIM:
         return [
-          (message.body as sdk.IRequestAttestationForClaim).content.claim
-            .cTypeHash,
+          (message.body as sdk.IRequestAttestationForClaim).content
+            .requestForAttestation.claim.cTypeHash,
         ]
       case sdk.MessageBodyType.SUBMIT_ATTESTATION_FOR_CLAIM:
         return [

diff --git a/src/utils/CtypeUtils/CtypeUtils.ts b/src/utils/CtypeUtils/CtypeUtils.ts
@@ -22,8 +22,9 @@ export const fromInputModel = (ctypeInput: ICTypeInput): ICTypeWithMetadata => {
     throw new Error('CType input does not correspond to input model schema')
   }
   const schema: sdk.ICType['schema'] = {
-    $id: ctypeInput.$id,
-    $schema: sdk.CTypeModel.properties.$schema.default,
+    $id: 'kilt:ctype:0x1',
+    $schema: CTypeInputModel.properties.$schema.default,
+    title: ctypeInput.$id,
     properties: {},
     type: 'object',
   }