Merge pull request #227 from tinacms/bug/219-adds-uriencoding-to-branch

fix: adds encodeURIComponent() to branch
tinacms · May 27, 2021 · aeedb6a · aeedb6a
2 parents 407922c + ead4cb5
commit aeedb6a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/tina-graphql-gateway/package.json b/packages/tina-graphql-gateway/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tina-graphql-gateway",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "main": "dist/index.js",
   "files": [
     "dist/*"

diff --git a/packages/tina-graphql-gateway/src/client/index.ts b/packages/tina-graphql-gateway/src/client/index.ts
@@ -55,10 +55,15 @@ export class Client {
 
   constructor({ tokenStorage = "MEMORY", ...options }: ServerOptions) {
     const _this = this;
+    /**
+     * Prevents a CORS-issue when the `branch` has slashes in it.
+     * https://github.com/tinacms/tina-graphql-gateway/issues/219
+     */
+    const encodedBranch = encodeURIComponent(options.branch);
     (this.contentApiUrl =
       options.customContentApiUrl ||
-      `${CONTENT_API_URL}/content/${options.organizationId}/${options.clientId}/github/${options.branch}`),
-      // `https://content.tinajs.dev/content/${options.organizationId}/${options.clientId}/github/${options.branch}`),
+      `${CONTENT_API_URL}/content/${options.organizationId}/${options.clientId}/github/${encodedBranch}`),
+      // `https://content.tinajs.dev/content/${options.organizationId}/${options.clientId}/github/${encodedBranch}`),
       (this.clientId = options.clientId);
     this.organizationId = options.organizationId;