add admin to unscoped db path (#279)

* add admin to unscoped db path

* move to makeScopedEndpoint

* beta4

* fix tests

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fauna-shell",
   "description": "faunadb shell",
-  "version": "1.2.0-beta3",
+  "version": "1.2.0-beta4",
   "author": "Fauna",
   "bin": {
     "fauna": "./bin/run"

src/commands/shell.js

@@ -26,7 +26,10 @@ class ShellCommand extends EvalCommand {
     const { db_path } = this.args;
 
     this.connection = db_path
-      ? await this.ensureDbScopeClient({ scope: db_path, version: this.flags.version })
+      ? await this.ensureDbScopeClient({
+          scope: db_path,
+          version: this.flags.version,
+        })
       : await this.getClient({ version: this.flags.version });
     this.startShell();
   }
@@ -152,10 +155,7 @@ class ShellCommand extends EvalCommand {
 
 ShellCommand.description = `Start an interactive shell.`;
 
-ShellCommand.examples = [
-  "$ fauna shell",
-  "$ fauna shell my_db/nested_db"
-];
+ShellCommand.examples = ["$ fauna shell", "$ fauna shell my_db/nested_db"];
 
 ShellCommand.flags = {
   ...FaunaCommand.flags,

src/lib/config/root-config.ts

@@ -139,8 +139,14 @@ export class Endpoint {
     graphqlHost: string;
     graphqlPort: number;
   } {
-    const secret =
-      this.secret + (scope ? `:${scope}` : "") + (role ? `:${role}` : "");
+    let appendedRoleStr = "";
+    if (role) {
+      appendedRoleStr = `:${role}`;
+    } else if (scope) {
+      appendedRoleStr = ":admin";
+    }
+
+    const secret = this.secret + (scope ? `:${scope}` : "") + appendedRoleStr;
 
     return {
       secret,

test/lib/config.test.ts

@@ -156,7 +156,7 @@ describe("local config", () => {
         },
       })
     ).to.deep.contain({
-      secret: "fn555:foo",
+      secret: "fn555:foo:admin",
       url: "https://db.fauna.com",
     });
   });
@@ -185,7 +185,7 @@ describe("local config", () => {
         },
       })
     ).to.deep.contain({
-      secret: "fn555:my-db",
+      secret: "fn555:my-db:admin",
       url: "https://db.fauna.com",
     });
   });
@@ -223,7 +223,7 @@ describe("local config with flags", () => {
         },
       })
     ).to.deep.contain({
-      secret: "fn888:foo",
+      secret: "fn888:foo:admin",
       url: "http://localhost:10443",
     });
   });
@@ -263,7 +263,7 @@ describe("local config with flags", () => {
         },
       })
     ).to.deep.contain({
-      secret: "fn888:bar",
+      secret: "fn888:bar:admin",
       url: "http://localhost:10443",
     });
   });
@@ -308,7 +308,7 @@ describe("local config with flags", () => {
         },
       })
     ).to.deep.contain({
-      secret: "fn999:my-db-3",
+      secret: "fn999:my-db-3:admin",
       url: "http://somewhere-else:10443",
     });
   });
@@ -327,7 +327,7 @@ describe("local config with flags", () => {
         scope: "my-scope",
       })
     ).to.deep.contain({
-      secret: "fn1234:my-scope",
+      secret: "fn1234:my-scope:admin",
       url: "http://localhost:8443",
     });
   });
@@ -355,7 +355,7 @@ describe("local config with flags", () => {
         scope: "my-scope",
       })
     ).to.deep.contain({
-      secret: "fn1234:my-db/my-scope",
+      secret: "fn1234:my-db/my-scope:admin",
       url: "http://localhost:8443",
     });
   });