making sure keychain delete sync records are accurate as far as WHO triggered the action

Author: orthecreedence

models/boards.lisp

@@ -493,7 +493,8 @@
                                            "board"
                                            board-id
                                            "unshare"
-                                           :rel-ids (list persona-user-id))))
+                                           :rel-ids (list persona-user-id)
+                                           :no-auto-add-user t)))
     (r:disconnect sock)
     (concatenate 'vector sync-ids share-sync-ids)))
 
@@ -508,7 +509,7 @@
              (alet* ((sync-ids (do-delete-board-persona-link user-id board-id to-persona-id)))
                (if delete-keychain-entries
                    (alet* ((to-user-id (gethash "user_id" to-persona))
-                           (keychain-sync (delete-keychain-tree to-user-id board-id)))
+                           (keychain-sync (delete-keychain-tree user-id to-user-id board-id)))
                      (concatenate 'vector sync-ids keychain-sync))
                    sync-ids))))
       ;; user must have at least read-only access to board to be considered for

models/keychain.lisp

@@ -128,7 +128,7 @@
               (r:disconnect sock)
               (finish future (length entries))))))))
 
-(adefun delete-keychain-tree (user-id board-id)
+(adefun delete-keychain-tree (from-user-id user-id board-id)
   "Grab a board's tree data (board, child boards, all notes contained therein)
    and for each item we no longer have at least read access to, remove that
    item's keychain entry (if it exists)."
@@ -159,7 +159,12 @@
                          (map 'list (lambda (k) (gethash "id" k)) keychain-entries)))))
             (nil (r:run sock query))
             (sync-records (map 'vector
-                               (lambda (ke) (make-sync-record user-id "keychain" (gethash "id" ke) "delete"))
+                               (lambda (ke) (make-sync-record from-user-id
+                                                              "keychain"
+                                                              (gethash "id" ke)
+                                                              "delete"
+                                                              :rel-ids (list user-id)
+                                                              :no-auto-add-user t))
                                keychain-entries))
             (nil (insert-sync-records sync-records)))
       ;; return the sync id(s)