fix(REACH-374): fetch embed by embedID

Typeform · May 31, 2023 · 6ca4b64 · 6ca4b64
1 parent 248bd13
commit 6ca4b64
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/packages/demo-html/public/single-embed-code.html b/packages/demo-html/public/single-embed-code.html
@@ -27,7 +27,7 @@
   </head>
   <body>
     <div class="element">I have z-index 10k</div>
-    <div id="wrapper" data-tf-live="HLjqXS5W-embed-id"></div>
+    <div id="wrapper" data-tf-live="embed-id"></div>
     <script src="./lib/embed.js"></script>
   </body>
 </html>
diff --git a/packages/embed/e2e/spec/functional/single-embed-code.cy.ts b/packages/embed/e2e/spec/functional/single-embed-code.cy.ts
@@ -1,7 +1,7 @@
 describe('Single Embed Code', () => {
   describe(`Should load`, () => {
     before(() => {
-      cy.intercept('https://api.typeform.com/single-embed/HLjqXS5W-embed-id', {
+      cy.intercept('https://api.typeform.com/single-embed/embed-id', {
         statusCode: 200,
         body: {
           html: `<div

diff --git a/packages/embed/src/initializers/initialize-single-embeds.ts b/packages/embed/src/initializers/initialize-single-embeds.ts
@@ -7,19 +7,12 @@ export const initializeSingleEmbeds = async (forceReload: boolean) => {
   for (let index = 0; index < embedTypeElements.length; index += 1) {
     const element = embedTypeElements.item(index)
     if (forceReload || element.dataset.tfLoaded !== 'true') {
-      const code = element.getAttribute(SINGLE_EMBED_ATTRIBUTE)
-      if (!code) {
-        throw new Error(`Invalid ${SINGLE_EMBED_ATTRIBUTE}=${code} for embed #${index}`)
+      const embedId = element.getAttribute(SINGLE_EMBED_ATTRIBUTE)
+      if (!embedId) {
+        throw new Error(`Invalid ${SINGLE_EMBED_ATTRIBUTE}=${embedId} for embed #${index}`)
       }
 
-      const separatorPosition = code.indexOf('-')
-      const formId = code.substring(0, separatorPosition)
-      const embedId = code.substring(separatorPosition + 1)
-      if (formId === '' || embedId === '') {
-        throw new Error(`Invalid ${SINGLE_EMBED_ATTRIBUTE}=${code} for embed #${index}`)
-      }
-
-      const { html } = await fetchSingleEmbed(formId, embedId)
+      const { html } = await fetchSingleEmbed(embedId)
       element.innerHTML = html
       element.dataset.tfLoaded = 'true'
     }

diff --git a/packages/embed/src/single-embed/fetch-single-embed.ts b/packages/embed/src/single-embed/fetch-single-embed.ts
@@ -1,8 +1,8 @@
-export const fetchSingleEmbed = async (formId: string, embedId: string) => {
-  const response = await fetch(`https://api.typeform.com/single-embed/${formId}-${embedId}`)
+export const fetchSingleEmbed = async (embedId: string) => {
+  const response = await fetch(`https://api.typeform.com/single-embed/${embedId}`)
 
   if (!response.ok) {
-    throw new Error(`Cannot fetch embed ${embedId} for form ${formId}`)
+    throw new Error(`Cannot fetch embed ${embedId}`)
   }
 
   return await response.json()