Fix uploads

uellenberg · uellenberg · commit 3ff92f748814 · 2022-07-11T15:20:09.000-07:00
diff --git a/src/upload/index.ts b/src/upload/index.ts
@@ -10,10 +10,11 @@ export async function upload(manifest: string, key: string): Promise<void> {
     const state = {
         itemCount: 0,
         idsMap: {},
+        key,
     };
 
     // Open the initial manifest.
-    await readManifest(state, null, null, manifest, key);
+    await readManifest(state, null, null, manifest);
 
     // Now, we should clean up websockets. If all websockets are closed, we can safely exit
     // the program, otherwise we should wait 30 seconds, then force close them and force exit after 5 seconds.
@@ -44,6 +45,10 @@ export interface State {
      * A map from friendly names to IDs.
      */
     idsMap: Record<string, string>;
+    /**
+     * Is the API key to use while uploading.
+     */
+    key: string;
 }
 
 /**
diff --git a/src/upload/lesson.ts b/src/upload/lesson.ts
@@ -22,7 +22,6 @@ export const websockets: WebSocket[] = [];
  * @param spec {string | null} - is the specification of the lesson.
  * @param templateDir {string | null} - is the directory that contains template files for this lesson.
  * @param dir {string} - is the directory that this manifest is contained in.
- * @param key {string} - is the API key used to upload items.
  */
 export async function handleLesson(
     state: State,
@@ -31,14 +30,13 @@ export async function handleLesson(
     spec: string | null,
     templateDir: string | null,
     dir: string,
-    key: string,
 ): Promise<void> {
     // We need to first figure out what the ID of this lesson is.
     // If it doesn't exist, we'll just set it to null.
     const actualID: string | null = await axios
         .get("https://cratecode.com/internal/api/id/" + id, {
             headers: {
-                authorization: key,
+                authorization: state.key,
             },
         })
         .then((res) => res.data.id)
@@ -55,7 +53,7 @@ export async function handleLesson(
         ? await axios
               .get("https://cratecode.com/internal/api/lesson/" + actualID, {
                   headers: {
-                      authorization: key,
+                      authorization: state.key,
                   },
               })
               .then((res) => res.data.project)
@@ -69,7 +67,7 @@ export async function handleLesson(
                 {},
                 {
                     headers: {
-                        authorization: key,
+                        authorization: state.key,
                     },
                 },
             )
@@ -93,7 +91,7 @@ export async function handleLesson(
             },
             {
                 headers: {
-                    authorization: key,
+                    authorization: state.key,
                 },
             },
         )
@@ -117,7 +115,7 @@ export async function handleLesson(
             {
                 headers: {
                     ...configForm.getHeaders(),
-                    authorization: key,
+                    authorization: state.key,
                 },
             },
         );
@@ -138,7 +136,7 @@ export async function handleLesson(
             {
                 headers: {
                     ...videoForm.getHeaders(),
-                    authorization: key,
+                    authorization: state.key,
                 },
             },
         );
@@ -182,7 +180,7 @@ export async function handleLesson(
     const token = await axios
         .get("https://cratecode.com/internal/api/token/" + project, {
             headers: {
-                authorization: key,
+                authorization: state.key,
             },
         })
         .then((res) => res.data.token);
diff --git a/src/upload/manifest.ts b/src/upload/manifest.ts
@@ -10,14 +10,12 @@ import { handleLesson } from "./lesson";
  * @param parent {string | null} - is the manifest that referenced this manifest.
  * @param templates {string | null} - is the path to the templates.
  * @param manifest {string} - is the manifest to read.
- * @param key {string} - is the API key used to upload items.
  */
 export async function readManifest(
     state: State,
     parent: string | null,
     templates: string | null,
     manifest: string,
-    key: string,
 ): Promise<void> {
     try {
         const data = JSON.parse(await fs.promises.readFile(manifest, "utf-8"));
@@ -48,7 +46,6 @@ export async function readManifest(
                     manifest,
                     templates,
                     Path.join(newBase, item, "manifest.json"),
-                    key,
                 );
             }
         }
@@ -71,7 +68,7 @@ export async function readManifest(
                 if (typeof lessons !== "object" || Array.isArray(lessons))
                     throw new Error("lessons must be an object!");
 
-                await handleUnit(state, id, name, lessons, key);
+                await handleUnit(state, id, name, lessons);
                 break;
             }
             case "lesson": {
@@ -102,7 +99,6 @@ export async function readManifest(
                     spec,
                     extends1 ? Path.join(templates, extends1) : null,
                     Path.dirname(manifest),
-                    key,
                 );
                 break;
             }
diff --git a/src/upload/unit.ts b/src/upload/unit.ts
@@ -7,7 +7,6 @@ import { delay, State } from "./index";
  * @param id {string} - is the friendly name of the unit.
  * @param name {string} - is the display name of the unit.
  * @param lessons {Record<string, object>} - is the lessons map for the unit.
- * @param key {string} - is the API key used to upload items.
  */
 export async function handleUnit(
     state: State,
@@ -17,14 +16,13 @@ export async function handleUnit(
         string,
         { next: string[]; previous: string[]; requireAll?: boolean }
     >,
-    key: string,
 ): Promise<void> {
     // First, we need to figure out what the actual ID of our unit is.
     // If there isn't one, we'll just set it to null.
     const actualID: string | null = await axios
         .get("https://cratecode.com/internal/api/id/" + id, {
             headers: {
-                authorization: key,
+                authorization: state.key,
             },
         })
         .then((res) => res.data.id)
@@ -41,13 +39,13 @@ export async function handleUnit(
         { next: string[]; previous: string[]; requireAll: boolean }
     > = {};
 
-    for (const key in lessons) {
+    for (const lessonID in lessons) {
         // Map the key.
-        const newKey = await mapID(key, state, key);
+        const newKey = await mapID(lessonID, state);
 
         // Map next and previous.
-        const next = lessons[key].next ?? [];
-        const previous = lessons[key].previous ?? [];
+        const next = lessons[lessonID].next ?? [];
+        const previous = lessons[lessonID].previous ?? [];
 
         if (typeof next !== "object" || !Array.isArray(next))
             throw new Error("next must be a string array!");
@@ -58,17 +56,17 @@ export async function handleUnit(
         const newPrevious: string[] = [];
 
         for (const item of next) {
-            newNext.push(await mapID(item, state, key));
+            newNext.push(await mapID(item, state));
         }
 
         for (const item of previous) {
-            newPrevious.push(await mapID(item, state, key));
+            newPrevious.push(await mapID(item, state));
         }
 
         map[newKey] = {
             next: newNext,
             previous: newPrevious,
-            requireAll: Boolean(lessons[key].requireAll),
+            requireAll: Boolean(lessons[lessonID].requireAll),
         };
     }
 
@@ -83,7 +81,7 @@ export async function handleUnit(
         },
         {
             headers: {
-                authorization: key,
+                authorization: state.key,
             },
         },
     );
@@ -92,17 +90,16 @@ export async function handleUnit(
 
 /**
  * Maps a friendly name or ID to an ID.
- * @param id {string} - is
- * @param state
- * @param key
+ * @param id {string} - is the ID or friendly name to lookup.
+ * @param state {State} - is the application's state.
  */
-async function mapID(id: string, state: State, key: string): Promise<string> {
+async function mapID(id: string, state: State): Promise<string> {
     const newKey =
         state.idsMap[id] ||
         (await axios
             .get("https://cratecode.com/internal/api/id/" + id, {
                 headers: {
-                    authorization: key,
+                    authorization: state.key,
                 },
             })
             .then((res) => {
