convert slack to lib/oauth2

lib/oauth2.hoon

@@ -16,7 +16,7 @@
 ++  join  
   |=  [a=cord b=(list cord)]
   ?~  b  ''
-  (rap 3 |-([i.b ?~(t.b ~ ['.' $(b t.b)])]))
+  (rap 3 |-([i.b ?~(t.b ~ [a $(b t.b)])]))
 ::
 ++  bad-response  |=(a=@u ?:(=(2 (div a 100)) | ~&(bad-httr/a &)))
 ++  grab-json
@@ -36,7 +36,8 @@
 ::
 ::::
   ::
-|=  [dialog=[p=host q=path r=quay] code-exchange=path]    
+|=  [dialog=[p=host q=path r=quay] code-exchange=path]
+=+  state-usr=&
 |_  [(bale keys) scope=(list cord)]
 ++  client-id      cid:(decode-keys key)
 ++  client-secret  cis:(decode-keys key)
@@ -49,7 +50,7 @@
   :+  [& ~ p.dialog]  [~ q.dialog]
   %-  fass  
   %+  welp  r.dialog
-  :~  state/(pack usr /'')
+  :~  state/?.(state-usr '' (pack usr /''))
       client-id/client-id
       redirect-uri/redirect-uri
       scope/(join ' ' scope)
@@ -57,7 +58,8 @@
 ::
 ++  redirect-uri  
   %-    crip    %-  earn
-  [urb-hart `/~/ac/(join '.' (flop dom))/'_state' ~]
+  =+  usr-span=?:(state-usr '_state' (scot %ta usr))
+  [urb-hart `/~/ac/(join '.' (flop dom))/[usr-span] ~]
 ::
 ++  refresh-expiring
   |=  [[expires=@da refresh=token] otherwise=$+(hiss sec-move)]
@@ -106,8 +108,8 @@
 ++  refresh-token  'refresh_token'^so:jo
 ++  bak-parse-access
   |*  [done=* parse=(pole ,[span fist]:jo)]
-  |=  handle=$+([token _(need *(ot:jo parse))] _done)
-  |=  a=httr  ^-  [sec-move _done]
+  |=  handle=$+(_?~(parse *token [*token (need *(ot:jo parse))]) _done)
+  |=  a=httr  ^-  [sec-move _done] 
   :-  [%redo ~]
   ?:  (bad-response p.a)  done  ::  handle 4xx?
   (handle (grab-json a (ot:jo access-token parse)))

sec/com/facebook/graph.hoon

@@ -1,4 +1,4 @@
-/+  oauth2
+/+    oauth2
 ::
 ::::
   ::

sec/com/slack.hoon

@@ -1,70 +1,11 @@
-|%
-++  fass                                                ::  rewrite quay
-  |=  a=quay
-  %+  turn  a
-  |=  [p=@t q=@t]  ^+  +<
-  [(gsub '-' '_' p) q]
-::
-++  gsub                                                ::  replace chars
-  |=  [a=@t b=@t t=@t]
-  ^-  @t
-  ?~  t  t
-  %+  add  (lsh 3 1 $(t (rsh 3 1 t)))
-  =+  c=(mod t (bex 8))
-  ?:(=(a c) b c)
---
+/+    oauth2
 ::
 ::::
   ::
-|_  [(bale ,@t) token=@t]
-++  decode-key                        :: XX from bale w/ typed %jael
-  ((hard ,[client-id=@t client-secret=@t ~]) (lore key))
-::
-++  redirect-uri  (cat 3 'http://localhost:8443/~/ac/slack.com/' (scot %ta usr))
-++  aut
-  =+  key=decode-key :: XX
-  ^-  quay
-  %-  fass
-  :~  client-id/client-id.key
-      redirect-uri/redirect-uri
-      scope/'client admin'
-  ==
-::
-++  out
-  |=  a=hiss  ^-  sec-move
-  ?~  token
-    [%show [& ~ `/com/slack] `/oauth/authorize aut]
-  [%send %_(a r.p :_(r.p.a 'token'^token))]
-::
-::
-++  in
-  =+  key=decode-key :: XX
-  |=  a=quay  ^-  sec-move
-  =+  cod=~|(%no-code (~(got by (mo a)) %code))
-  =-  [%send [[& ~ `/com/slack] `/api/'oauth.access' -] %get ~ ~]
-  %-  fass
-  :~  code/cod
-      client-id/client-id.key
-      client-secret/client-secret.key
-      redirect-uri/redirect-uri
-  ==
-::
-::
-++  parse-bak
-  |=  [@u a=@t]
-  %.  a
-  ;~  biff
-    poja
-    =>  jo  %-  ot  :~
-      'access_token'^so
-    ==
-  ==
-::
-++  bak
-  |=  res=httr  ^-  [sec-move _+>]
-  =+  ~|  bad-json/r.res
-      ^-  token=@t
-      (need (parse-bak (need r.res)))
-  :-  [%redo ~]
-  +>.$(token token)
+=+  aut=(oauth2 [`/com/slack /oauth/authorize ~] /api/'oauth.access')
+|_  [(bale keys:oauth2) tok=token.aut]
+++  aut  ~(. ^aut(state-usr |) +<- /client/admin)
+++  out  (out-quay:aut 'token'^tok)
+++  in   in-code:aut
+++  bak  ((bak-parse-access:aut . ~) |=(tok=token:aut +>(tok tok)))
 --