fix accessKey support for block projects

Author: Titanium2099

src/lib/storage.js

@@ -13,6 +13,7 @@ class Storage extends ScratchStorage {
     constructor () {
         super();
         this.cacheDefaultProject();
+        this.accessKey = null;
     }
     addOfficialScratchWebStores () {
         this.addWebStore(
@@ -84,7 +85,8 @@ class Storage extends ScratchStorage {
                     window.removeEventListener('message', handleMessage);
                     resolve({
                         token: event.data.token,
-                        username: event.data.username || ''
+                        username: event.data.username || '',
+                        accessKey: event.data.accessKey || null
                     });
                 }
             }
@@ -94,6 +96,7 @@ class Storage extends ScratchStorage {
 
         this.projectToken = creds.token;
         this.username = creds.username;
+        this.accessKey = creds.accessKey;
         // eslint-disable-next-line require-atomic-updates
         window.CollaborationUsername = creds?.username;
         return creds;
@@ -105,9 +108,21 @@ class Storage extends ScratchStorage {
         return this.projectToken;
     }
     getProjectGetConfig (projectAsset) {
-        const path = `${this.projectHost}/${projectAsset.assetId}`;
+        let path = `${this.projectHost}/${projectAsset.assetId}`;
+        const params = [];
+
+        // Scratch tokens
         if (this.scratchProjectToken) {
-            return `${path}?token=${this.scratchProjectToken}`;
+            params.push(`token=${this.scratchProjectToken}`);
+        }
+
+        // CodeTorch Access Keys (Unlisted projects)
+        if (this.accessKey) {
+            params.push(`access_key=${this.accessKey}`);
+        }
+
+        if (params.length > 0) {
+            path += `?${params.join('&')}`;
         }
         return path;
     }

src/lib/tw-project-meta-fetcher-hoc.jsx

@@ -20,6 +20,7 @@ let activeFetchMetadataPromise = null;
 
 export const fetchProjectMeta = async (projectId, isScratch) => {
     const authToken = await storage.getProjectToken();
+    const accessKey = storage.accessKey;
     let urls = [
         `${API_HOST}/v1/projects/blocks/${projectId}/meta`,
         `${API_HOST}/v1/projects/blocks/${projectId}/meta`
@@ -29,6 +30,8 @@ export const fetchProjectMeta = async (projectId, isScratch) => {
             `${ASSET_HOST}/scratch_project_meta/${projectId}`,
             `${ASSET_HOST}/scratch_project_meta/${projectId}`
         ];
+    } else if (accessKey) {
+        urls = urls.map(url => `${url}?access_key=${accessKey}`);
     }
     let firstError;
     for (const url of urls) {