Credentials Middleware tests

src/lib/account.mjs

@@ -26,7 +26,6 @@ export async function makeAccountRequest({
   const baseUrl = process.env.FAUNA_ACCOUNT_URL ?? "https://account.fauna.com";
   const paramsString = params ? `?${new URLSearchParams(params)}` : "";
   let fullUrl;
-
   try {
     fullUrl = new URL(`/api/v1${path}${paramsString}`, baseUrl).href;
   } catch (e) {
@@ -68,8 +67,9 @@ export async function makeAccountRequest({
  * @returns
  */
 async function parseResponse(response, shouldThrow) {
-  const responseType = response.headers.get("content-type");
-  const responseIsJSON = responseType?.includes("application/json");
+  const responseType =
+    response?.headers?.get("content-type") || "application/json";
+  const responseIsJSON = responseType.includes("application/json");
   if (response.status >= 400 && shouldThrow) {
     let message = `Failed to make request to Fauna account API [${response.status}]`;
     if (responseIsJSON) {
@@ -79,7 +79,6 @@ async function parseResponse(response, shouldThrow) {
     }
     switch (response.status) {
       case 401:
-        // TODO: try and refresh creds and then redo the call, if not then throw.
         throw new InvalidCredsError(message);
       case 403:
         throw new UnauthorizedError(message);

src/lib/auth/accountKeys.mjs

@@ -79,11 +79,11 @@
    * refreshes it and returns it.
    * @returns {string} - The account key
    */
-  async getOrRereshKey() {
+  async getOrRefreshKey() {
     if (this.keySource === "credentials-file") {
       const key = this.keyStore.get();
       // TODO: track ttl for account and refresh keys
-      if (!key || (key.expiresAt && key.expiresAt < Date.now())) {
+      if (!key) {
         this.logger.debug(
           "Found account key, but it is expired. Refreshing...",
           "creds",

src/lib/auth/databaseKeys.mjs

@@ -123,10 +123,10 @@ export class DatabaseKeys {
       ttl: new Date(expiration).toISOString(),
     });
     this.keyStore.save(this.keyName, {
-      secret: newSecret.secret,
+      secret: newSecret?.secret,
       expiresAt: expiration,
     });
-    this.key = newSecret.secret;
-    return newSecret.secret;
+    this.key = newSecret?.secret;
+    return newSecret?.secret;
   }
 }

src/lib/command-helpers.mjs

@@ -52,6 +52,11 @@ const COMMON_QUERY_OPTIONS = {
     required: false,
     group: "API:",
   },
+  accountKey: {
+    type: "string",
+    description: "The account key to use when calling Fauna",
+    required: false,
+  },
   database: {
     alias: "d",
     type: "string",

src/lib/fauna-account-client.mjs

@@ -26,7 +26,8 @@
             );
             await this.accountKeys.onInvalidCreds();
             // onInvalidCreds will refresh the account key
-            return await original(await this.getRequestArgs(args));
+            const updatedArgs = await this.getRequestArgs(args);
+            result = await original(updatedArgs);
           } catch (e) {
             if (e instanceof InvalidCredsError) {
               logger.debug(
@@ -49,7 +50,7 @@
   // By the time we are inside the retryableAccountRequest,
   //  the account key will have been refreshed. Use the latest value
   async getRequestArgs(args) {
-    const updatedKey = await this.accountKeys.getOrRereshKey();
+    const updatedKey = await this.accountKeys.getOrRefreshKey();
     return {
       ...args,
       secret: updatedKey,
@@ -129,7 +130,7 @@
    * @throws {Error} - Throws an error if there is an issue during session retrieval.
    */
 
   // TODO: get/set expiration details
   static async getSession(accessToken) {
     const makeAccountRequest = container.resolve("makeAccountRequest");
     try {
@@ -146,7 +147,7 @@
     }
   }
 
   // TODO: get/set expiration details
   /**
    * Uses refreshToken to get a new accountKey and refreshToken.
    * @param {*} refreshToken