extensions now hosted on another domain

Author: Titanium2099

src/containers/extension-library.jsx

@@ -4,7 +4,8 @@ import React from 'react';
 import VM from 'scratch-vm';
 import {defineMessages, injectIntl, intlShape} from 'react-intl';
 import log from '../lib/log';
-const {API_HOST} = require('../lib/brand');
+// eslint-disable-next-line import/no-commonjs
+const {EXTENSION_HOST} = require('../lib/brand');
 
 import extensionLibraryContent, {
     galleryError,
@@ -43,7 +44,7 @@ const translateGalleryItem = (extension, locale) => ({
 let cachedGallery = null;
 
 const fetchLibrary = async () => {
-    const res = await fetch(API_HOST+'/extensions/extensions.json');
+    const res = await fetch(`${EXTENSION_HOST}/extensions.json`);
     if (!res.ok) {
         throw new Error(`HTTP status ${res.status}`);
     }
@@ -54,8 +55,8 @@ const fetchLibrary = async () => {
         description: extension.description,
         descriptionTranslations: extension.descriptionTranslations || {},
         extensionId: extension.id,
-        extensionURL: API_HOST+ `/extensions/extensions/${extension.slug}.js`,
-        iconURL: API_HOST +`/extensions/${extension.image || 'images/unknown.svg'}`,
+        extensionURL: `${EXTENSION_HOST}/extensions/${extension.slug}.js`,
+        iconURL: `${EXTENSION_HOST}/${extension.image || 'images/unknown.svg'}`,
         tags: ['tw'],
         credits: [
             ...(extension.original || []),
@@ -77,7 +78,8 @@ const fetchLibrary = async () => {
         }),
         docsURI: extension.docs ? `https://extensions.turbowarp.org/${extension.slug}` : null,
         samples: extension.samples ? extension.samples.map(sample => ({
-            href: `https://turbowarp.org/editor?project_url=https://extensions.turbowarp.org/samples/${encodeURIComponent(sample)}.sb3`, //force to go to turbowarp as parent doesn't nessarily support ?project_url
+            // force to go to turbowarp as parent doesn't nessarily support ?project_url
+            href: `https://turbowarp.org/editor?project_url=https://extensions.turbowarp.org/samples/${encodeURIComponent(sample)}.sb3`,
             text: sample
         })) : null,
         incompatibleWithScratch: !extension.scratchCompatible,

src/containers/tw-security-manager.jsx

@@ -29,6 +29,7 @@ const isTrustedExtension = url => (
     // Always trust our official extension repostiory.
     url.startsWith('https://extensions.turbowarp.org/') ||
     url.startsWith('https://blockcompiler.codetorch.net/') ||
+    url.startsWith('https://blockextensions.codetorch.net/') ||
     url.startsWith('https://codetorch.net/') ||
     url.startsWith(API_HOST) ||
     // For development.

src/lib/brand.js

@@ -4,7 +4,8 @@ module.exports = {
     APP_NAME: 'CodeTorch',
     APP_DOMAIN: 'http://localhost:8080',
     API_HOST: 'http://localhost:8000',
-    ASSET_HOST: 'https://localhost:8000',
+    ASSET_HOST: 'http://localhost:8000',
+    EXTENSION_HOST: 'http://localhost:8002',
     DEFAULT_CLOUD_HOST: 'ws://localhost:8001',
     enableGenerate: false
 };