-get-gcp-jwt: clean up references, use +ot

Moves =, closer to call sites so it's clearer what's coming from where.
Also uses +ot, allowing a less horrifying +sign-jwt. This also seems to
not jump back and forth between tapes and cords as much, for what that's
worth.

pkg/arvo/ted/get-gcp-jwt.hoon

@@ -17,11 +17,9 @@
 ::
 ::
 /-  spider, settings
-/+  jose, pkcs, strandio
+/+  jose, pkcs, primitive-rsa, strandio
 =,  strand=strand:spider
-=,  format
+=,  rsa=primitive-rsa
-=,  jose
-=,  pkcs
 ^-  thread:spider
 |^
 |=  *
@@ -62,7 +60,7 @@
   %.  dat
   ;:  cork
     to-wain:format
-    ring:de:pem:pkcs8
+    ring:de:pem:pkcs8:pkcs
     need
   ==
 ::  construct and return a self-signed JWT issued now, expiring in ~h1.
@@ -72,32 +70,29 @@
   |=  [=key:rsa kid=@t iss=@t scope=@t aud=@t iat=@da]
   ^-  @t
   =/  job=json
-    %^  sign:jws  key
+    =,  enjs:format
+    %^  sign:jws:jose  key
       ::  the JWT's "header"
-      %:  pairs:enjs
+      %:  pairs
         alg+s+'RS256'
         typ+s+'JWT'
         kid+s+kid
         ~
       ==
     ::  the JWT's "payload"
-    %:  pairs:enjs
+    %:  pairs
       iss+s+iss
       sub+s+iss                                 ::  per g.co, use iss for sub
       scope+s+scope
       aud+s+aud
-      iat+(sect:enjs iat)
+      iat+(sect iat)
-      exp+(sect:enjs (add iat ~h1))
+      exp+(sect (add iat ~h1))
       ~
     ==
-  ?>  ?=([%o *] job)
+  =/  [pod=@t pad=@t sig=@t]
-  =*  mep  p.job
+    =,  dejs:format
-  =+  :~  pod=(sa:dejs (~(got by mep) 'protected'))
+    ((ot 'protected'^so 'payload'^so 'signature'^so ~) job)
-          pad=(sa:dejs (~(got by mep) 'payload'))
+  (rap 3 (join '.' `(list @t)`~[pod pad sig]))
-          sig=(sa:dejs (~(got by mep) 'signature'))
-      ==
-  %-  crip                                      ::  XX
-  :(weld pod "." pad "." sig)
 ::  RPC to get a signed JWT. Probably only works with Google.
 ::  Described at:
 ::  https://developers.google.com/identity/protocols/oauth2/service-account
@@ -113,7 +108,7 @@
       ^=  body
       %-  some  %-  as-octt:mimes:html
       %-  en-json:html
-      %:  pairs:enjs
+      %:  pairs:enjs:format
         ['grant_type' s+'urn:ietf:params:oauth:grant-type:jwt-bearer']
         assertion+s+jot
         ~
@@ -128,7 +123,9 @@
   =/  jon=(unit json)  (de-json:html body)
   ?~  jon
     (strand-fail:strandio %bad-body ~[body])
-  ?.  ?=([%o [[%'id_token' %s @] ~ ~]] +.jon)
+  =*  job  u.jon
-    (strand-fail:strandio %bad-json ~[body])
+  %-  pure:m
-  (pure:m p.q.n.p.u.jon)
+  =,  dejs:format
+  %-  (ot 'id_token'^so ~)
+  job
 --