From 5a7c0b1181f2a4f1ba8ae4a46f210e8869ddc7c8 Mon Sep 17 00:00:00 2001
From: Isaac Visintainer <isaac.visintainer@gmail.com>
Date: Thu, 5 Dec 2019 15:45:30 -0800
Subject: [PATCH] permission-group-hook: fixed permission associate flow

---
 pkg/arvo/app/group-hook.hoon            |  4 +-
 pkg/arvo/app/permission-group-hook.hoon | 51 +++++++++++++++++--------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/pkg/arvo/app/group-hook.hoon b/pkg/arvo/app/group-hook.hoon
index 739039e0c..44389af59 100644
--- a/pkg/arvo/app/group-hook.hoon
+++ b/pkg/arvo/app/group-hook.hoon
@@ -56,7 +56,7 @@
     =/  scry-path=^path
       :(welp /=group-store/(scot %da now.bowl) t.path /noun)
     =/  grp=(unit group)
-      .^((unit group) %mx scry-path)
+      .^((unit group) %gx scry-path)
     ?~  grp
       (on-watch:def path)
     :_  this
@@ -207,7 +207,7 @@
 ++  group-scry
   |=  pax=path
   ^-  (unit group)
-  .^((unit group) %mx ;:(weld /=group-store/(scot %da now.bol) pax /noun))
+  .^((unit group) %gx ;:(weld /=group-store/(scot %da now.bol) pax /noun))
 ::
 ++  update-subscribers
   |=  [pax=path diff=group-update]
diff --git a/pkg/arvo/app/permission-group-hook.hoon b/pkg/arvo/app/permission-group-hook.hoon
index b815f5ef4..6b63942cc 100644
--- a/pkg/arvo/app/permission-group-hook.hoon
+++ b/pkg/arvo/app/permission-group-hook.hoon
@@ -112,20 +112,17 @@
   =/  perm-paths=(set path)
     (~(run in associate) head)
   ?~  perms
-    :-  [(watch-group group)]~
-    state(relation (~(put by relation) group perm-paths))
+    :_  state(relation (~(put by relation) group perm-paths))
+    (snoc (recreate-permissions perm-paths associate) (watch-group group))
   ::
+  =/  grp  (group-scry group)
   =.  u.perms  (~(uni in u.perms) perm-paths)
   :_  state(relation (~(put by relation) group u.perms))
   %+  weld
-    %+  turn  ~(tap in perm-paths)
-    |=  =path
-    (permission-poke path [%delete path])
-  %+  turn  ~(tap in associate)
-  |=  [=path =kind]
-  =|  pem=permission
-  =.  kind.pem  kind
-  (permission-poke path [%create path pem])
+    (recreate-permissions perm-paths associate)
+  ?~  grp
+    ~
+  (add-members group u.grp u.perms)
 ::
 ++  handle-dissociate
   |=  [group=path remove=(set permission-path)]
@@ -152,13 +149,9 @@
   ::
       %path
     ::  set all permissions paths
-    =/  perms  (~(get by relation) pax.diff)
-    ?~  perms
-      [~ state]
+    =/  perms  (~(got by relation) pax.diff)
     :_  state
-    %+  turn  ~(tap in u.perms)
-    |=  =path
-    (permission-poke path [%add path members.diff])
+    (add-members pax.diff members.diff perms)
   ::
       %add
     ::  set all permissions paths
@@ -204,6 +197,32 @@
       [%permission-action !>(action)]
   ==
 ::
+++  group-scry
+  |=  pax=path
+  ^-  (unit group)
+  .^((unit group) %gx ;:(weld /=group-store/(scot %da now.bowl) pax /noun))
+::
+++  add-members
+  |=  [pax=path mem=(set ship) perms=(set path)]
+  ^-  (list card)
+  %+  turn  ~(tap in perms)
+  |=  =path
+  (permission-poke path [%add path mem])
+::
+++  recreate-permissions
+  |=  [perm-paths=(set path) associate=(set [permission-path kind])]
+  ^-  (list card)
+  %+  weld
+    %+  turn  ~(tap in perm-paths)
+    |=  =path
+    (permission-poke path [%delete path])
+  %+  turn  ~(tap in associate)
+  |=  [=path =kind]
+  =|  pem=permission
+  =.  kind.pem  kind
+  (permission-poke path [%create path pem])
+::
+::
 ++  watch-group
   |=  =group-path
   ^-  card