Refactor: change token generation to name the user

1 files changed, 3 insertions, 5 deletions

diff --git a/yarns/900-remote.yarn b/yarns/900-remote.yarn
index 2d013a6..2875d27 100644
--- a/yarns/900-remote.yarn
+++ b/yarns/900-remote.yarn
@@ -25,7 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     vars['private_key_file'] = os.environ['ICK_PRIVATE_KEY']
     assertTrue(os.path.exists(vars['private_key_file']))
 
-    IMPLEMENTS GIVEN an access token for scopes (.+)
+    IMPLEMENTS GIVEN an access token for (\S+) with scopes (.+)
+    user = get_next_match()
     scopes = get_next_match()
     key = open(vars['private_key_file']).read()
     argv = [
@@ -33,13 +34,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         scopes,
     ]
     token = cliapp.runcmd(argv, feed_stdin=key)
-    write('token.jwt', token)
+    store_token(user, token)
     vars['issuer'] = 'localhost'
     vars['audience'] = 'localhost'
 
-    IMPLEMENTS GIVEN an access token for (\S+) with scopes (.+)
-    assert 0
-
 ## Controller configuration
 
     IMPLEMENTS GIVEN controller config uses (\S+) at the state directory