fix: make generateAccessToken URL-safe by default

Agoric · Sep 13, 2020 · 722f811 · 722f811
1 parent 20c1f27
commit 722f811
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/packages/agoric-cli/lib/open.js b/packages/agoric-cli/lib/open.js
@@ -5,15 +5,20 @@ import path from 'path';
 
 import { openSwingStore } from '@agoric/swing-store-simple';
 
-// From https://stackoverflow.com/a/43866992/14073862
+// Adapted from https://stackoverflow.com/a/43866992/14073862
 export function generateAccessToken({
-  stringBase = 'base64',
+  stringBase = 'base64url',
   byteLength = 48,
 } = {}) {
   return new Promise((resolve, reject) =>
     crypto.randomBytes(byteLength, (err, buffer) => {
       if (err) {
         reject(err);
+      } else if (stringBase === 'base64url') {
+        // Convert to url-safe base64.
+        const base64 = buffer.toString('base64');
+        const base64url = base64.replace(/\+/g, '-').replace(/\//g, '_');
+        resolve(base64url);
       } else {
         resolve(buffer.toString(stringBase));
       }

diff --git a/packages/cosmic-swingset/lib/ag-solo/access-token.js b/packages/cosmic-swingset/lib/ag-solo/access-token.js
@@ -4,15 +4,20 @@ import path from 'path';
 
 import { openSwingStore } from '@agoric/swing-store-simple';
 
-// From https://stackoverflow.com/a/43866992/14073862
+// Adapted from https://stackoverflow.com/a/43866992/14073862
 export function generateAccessToken({
-  stringBase = 'base64',
+  stringBase = 'base64url',
   byteLength = 48,
 } = {}) {
   return new Promise((resolve, reject) =>
     crypto.randomBytes(byteLength, (err, buffer) => {
       if (err) {
         reject(err);
+      } else if (stringBase === 'base64url') {
+        // Convert to url-safe base64.
+        const base64 = buffer.toString('base64');
+        const base64url = base64.replace(/\+/g, '-').replace(/\//g, '_');
+        resolve(base64url);
       } else {
         resolve(buffer.toString(stringBase));
       }