@liveblocks/core 1.2.2-comments5 → 1.2.2-comments6

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.2.2-comments5";
+var PKG_VERSION = "1.2.2-comments6";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -1331,27 +1331,25 @@ function createAuthManager(authOptions) {
     }
     if (authentication.type === "custom") {
       const response = await authentication.callback(roomId);
-      if (!response || typeof response !== "object") {
-        throw new Error(
-          'We expect the authentication callback to return a token, but it does not. Hint: the return value should look like: { token: "..." }'
-        );
-      }
-      if (typeof response.token === "string") {
-        return parseAuthToken(response.token);
-      } else if (typeof response.error === "string") {
-        const reason = `Authentication failed: ${"reason" in response && typeof response.reason === "string" ? response.reason : "Forbidden"}`;
-        if (response.error === "forbidden") {
-          throw new StopRetrying(reason);
-        } else {
-          throw new Error(reason);
+      if (response && typeof response === "object") {
+        if (typeof response.token === "string") {
+          return parseAuthToken(response.token);
+        } else if (typeof response.error === "string") {
+          const reason = `Authentication failed: ${"reason" in response && typeof response.reason === "string" ? response.reason : "Forbidden"}`;
+          if (response.error === "forbidden") {
+            throw new StopRetrying(reason);
+          } else {
+            throw new Error(reason);
+          }
         }
-      } else {
-        throw new Error(
-          'We expect the authentication callback to return a token, but it does not. Hint: the return value should look like: { token: "..." }'
-        );
       }
+      throw new Error(
+        'Your authentication callback function should return a token, but it did not. Hint: the return value should look like: { token: "..." }'
+      );
     }
-    throw new Error("Invalid Liveblocks client options");
+    throw new Error(
+      "Unexpected authentication type. Must be private or custom."
+    );
   }
   async function getAuthValue(requestedScope, roomId) {
     if (authentication.type === "public") {
@@ -1385,13 +1383,13 @@ function prepareAuthentication(authOptions) {
   const { publicApiKey, authEndpoint } = authOptions;
   if (authEndpoint !== void 0 && publicApiKey !== void 0) {
     throw new Error(
-      "You cannot use both publicApiKey and authEndpoint. Please use either publicApiKey or authEndpoint, but not both. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClient"
+      "You cannot simultaneously use `publicApiKey` and `authEndpoint` options. Please pick one and leave the other option unspecified. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClient"
     );
   }
   if (typeof publicApiKey === "string") {
     if (publicApiKey.startsWith("sk_")) {
       throw new Error(
-        "Invalid publicApiKey. You are using the secret key which is not supported. Please use the public key instead. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClientPublicKey"
+        "Invalid `publicApiKey` option. The value you passed is a secret key, which should not be used from the client. Please only ever pass a public key here. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClientPublicKey"
       );
     } else if (!publicApiKey.startsWith("pk_")) {
       throw new Error(
@@ -1415,11 +1413,11 @@ function prepareAuthentication(authOptions) {
     };
   } else if (authEndpoint !== void 0) {
     throw new Error(
-      "authEndpoint must be a string or a function. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClientAuthEndpoint"
+      "The `authEndpoint` option must be a string or a function. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClientAuthEndpoint"
     );
   }
   throw new Error(
-    "Invalid Liveblocks client options. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClient"
+    "Invalid Liveblocks client options. Please provide either a `publicApiKey` or `authEndpoint` option. They cannot both be empty. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClient"
   );
 }
 async function fetchAuthEndpoint(fetch2, endpoint, body) {