Fix: entity-type identifier validation

- Ensure claims contain only correct and necessary giver and recipient identifiers, as per Endorser.ch documentation

src/components/GiftedDialog.vue

@@ -80,16 +80,29 @@
                 stepType === 'recipient' ||
                 (stepType === 'giver' && isFromProjectView)
               "
-              class="cursor-pointer"
+              :class="{
+                'cursor-pointer': !wouldCreateConflict(activeDid),
+                'cursor-not-allowed opacity-50': wouldCreateConflict(activeDid)
+              }"
               @click="
-                stepType === 'recipient'
+                !wouldCreateConflict(activeDid) &&
+                (stepType === 'recipient'
                   ? selectRecipient({ did: activeDid, name: 'You' })
-                  : selectGiver({ did: activeDid, name: 'You' })
+                  : selectGiver({ did: activeDid, name: 'You' }))
               "
             >
-              <font-awesome icon="hand" class="text-blue-500 text-5xl mb-1" />
+              <font-awesome 
+                :class="{
+                  'text-blue-500 text-5xl mb-1': !wouldCreateConflict(activeDid),
+                  'text-slate-400 text-5xl mb-1': wouldCreateConflict(activeDid)
+                }" 
+                icon="hand" 
+              />
               <h3
-                class="text-xs text-blue-500 font-medium text-ellipsis whitespace-nowrap overflow-hidden"
+                :class="{
+                  'text-xs text-blue-500 font-medium text-ellipsis whitespace-nowrap overflow-hidden': !wouldCreateConflict(activeDid),
+                  'text-xs text-slate-400 font-medium text-ellipsis whitespace-nowrap overflow-hidden': wouldCreateConflict(activeDid)
+                }"
               >
                 You
               </h3>
@@ -119,11 +132,15 @@
             <li
               v-for="contact in allContacts.slice(0, 10)"
               :key="contact.did"
-              class="cursor-pointer"
+              :class="{
+                'cursor-pointer': !wouldCreateConflict(contact.did),
+                'cursor-not-allowed opacity-50': wouldCreateConflict(contact.did)
+              }"
               @click="
-                stepType === 'recipient'
+                !wouldCreateConflict(contact.did) &&
+                (stepType === 'recipient'
                   ? selectRecipient(contact)
-                  : selectGiver(contact)
+                  : selectGiver(contact))
               "
             >
               <div class="relative w-fit mx-auto">
@@ -141,7 +158,10 @@
                 </div>
               </div>
               <h3
-                class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
+                :class="{
+                  'text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden': !wouldCreateConflict(contact.did),
+                  'text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden text-slate-400': wouldCreateConflict(contact.did)
+                }"
               >
                 {{ contact.name || contact.did }}
               </h3>
@@ -397,21 +417,7 @@
         <router-link
           :to="{
             name: 'gifted-details',
-            query: {
-              amountInput,
-              description,
-              giverDid: showProjects ? undefined : giver?.did,
-              giverName: giver?.name,
-              offerId,
-              fulfillsProjectId:
-                showProjects && isFromProjectView
-                  ? giver?.handleId
-                  : toProjectId,
-              providerProjectId: showProjects ? giver?.handleId : fromProjectId,
-              recipientDid: receiver?.did,
-              recipientName: receiver?.name,
-              unitCode,
-            },
+            query: giftedDetailsQuery,
           }"
           class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg mb-4"
         >
@@ -425,9 +431,22 @@
             @click="explainData()"
           />
         </p>
+        
+        <!-- Conflict warning -->
+        <div v-if="hasPersonConflict" class="mb-4 p-3 bg-red-50 border border-red-200 rounded-md">
+          <p class="text-red-700 text-sm text-center">
+            <font-awesome icon="exclamation-triangle" class="fa-fw mr-1" />
+            Cannot record: Same person selected as both giver and recipient
+          </p>
+        </div>
+        
         <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
           <button
-            class="block w-full text-center text-md uppercase font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg"
+            :disabled="hasPersonConflict"
+            :class="{
+              'block w-full text-center text-md uppercase font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg': !hasPersonConflict,
+              'block w-full text-center text-md uppercase font-bold bg-gradient-to-b from-slate-300 to-slate-500 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-slate-400 px-1.5 py-2 rounded-lg cursor-not-allowed': hasPersonConflict
+            }"
             @click="confirm"
           >
             Sign &amp; Send
@@ -525,6 +544,39 @@ export default class GiftedDialog extends Vue {
     return result;
   }
 
+  // Computed property to check if current selection would create a conflict
+  get hasPersonConflict() {
+    // Only check for conflicts when both entities are persons
+    if (this.giverEntityType !== "person" || this.recipientEntityType !== "person") {
+      return false;
+    }
+    
+    // Check if giver and recipient are the same person
+    if (this.giver?.did && this.receiver?.did && this.giver.did === this.receiver.did) {
+      return true;
+    }
+    
+    return false;
+  }
+
+  // Computed property to check if a contact would create a conflict when selected
+  wouldCreateConflict(contactDid: string) {
+    // Only check for conflicts when both entities are persons
+    if (this.giverEntityType !== "person" || this.recipientEntityType !== "person") {
+      return false;
+    }
+    
+    if (this.stepType === "giver") {
+      // If selecting as giver, check if it conflicts with current recipient
+      return this.receiver?.did === contactDid;
+    } else if (this.stepType === "recipient") {
+      // If selecting as recipient, check if it conflicts with current giver
+      return this.giver?.did === contactDid;
+    }
+    
+    return false;
+  }
+
   stepType = "giver";
   giverEntityType = "person" as "person" | "project";
   recipientEntityType = "person" as "person" | "project";
@@ -705,6 +757,20 @@ export default class GiftedDialog extends Vue {
       );
       return;
     }
+    
+    // Check for person conflict
+    if (this.hasPersonConflict) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You cannot select the same person as both giver and recipient.",
+        },
+        3000,
+      );
+      return;
+    }
 
     this.close();
     this.$notify(
@@ -744,24 +810,46 @@ export default class GiftedDialog extends Vue {
     unitCode: string = "HUR",
   ) {
     try {
+      // Determine the correct parameters based on entity types
+      let fromDid: string | undefined;
+      let toDid: string | undefined;
+      let fulfillsProjectHandleId: string | undefined;
+      let providerPlanHandleId: string | undefined;
+
+      if (this.giverEntityType === "project" && this.recipientEntityType === "person") {
+        // Project-to-person gift
+        fromDid = undefined; // No person giver
+        toDid = recipientDid as string; // Person recipient
+        fulfillsProjectHandleId = undefined; // No project recipient
+        providerPlanHandleId = this.giver?.handleId; // Project giver
+      } else if (this.giverEntityType === "person" && this.recipientEntityType === "project") {
+        // Person-to-project gift
+        fromDid = giverDid as string; // Person giver
+        toDid = undefined; // No person recipient
+        fulfillsProjectHandleId = this.toProjectId; // Project recipient
+        providerPlanHandleId = undefined; // No project giver
+      } else {
+        // Person-to-person gift
+        fromDid = giverDid as string;
+        toDid = recipientDid as string;
+        fulfillsProjectHandleId = undefined;
+        providerPlanHandleId = undefined;
+      }
+
       const result = await createAndSubmitGive(
         this.axios,
         this.apiServer,
         this.activeDid,
-        this.showProjects ? undefined : (giverDid as string),
-        this.showProjects && this.isFromProjectView
-          ? this.giver?.handleId
-          : (recipientDid as string),
+        fromDid,
+        toDid,
         description,
         amount,
         unitCode,
-        this.showProjects && this.isFromProjectView
-          ? this.giver?.handleId
-          : this.toProjectId,
+        fulfillsProjectHandleId,
         this.offerId,
         false,
         undefined,
-        this.showProjects ? this.giver?.handleId : undefined,
+        providerPlanHandleId,
       );
 
       if (!result.success) {
@@ -923,6 +1011,26 @@ export default class GiftedDialog extends Vue {
     };
     this.currentStep = 2;
   }
+
+  // Computed property for the query parameters
+  get giftedDetailsQuery() {
+    return {
+      amountInput: this.amountInput,
+      description: this.description,
+      giverDid: this.giverEntityType === "person" ? this.giver?.did : undefined,
+      giverName: this.giver?.name,
+      offerId: this.offerId,
+      fulfillsProjectId: this.giverEntityType === "person" && this.recipientEntityType === "project"
+        ? this.toProjectId
+        : undefined,
+      providerProjectId: this.giverEntityType === "project" && this.recipientEntityType === "person"
+        ? this.giver?.handleId
+        : this.fromProjectId,
+      recipientDid: this.receiver?.did,
+      recipientName: this.receiver?.name,
+      unitCode: this.unitCode,
+    };
+  }
 }
 </script>