@learnpack/learnpack 5.0.332 → 5.0.334

package/lib/commands/publish.d.ts

@@ -2,7 +2,7 @@ import SessionCommand from "../utils/SessionCommand";
 export declare const handleAssetCreation: (sessionPayload: {
     token: string;
     rigobotToken: string;
-}, learnJson: any, selectedLang: string, learnpackDeployUrl: string, b64IndexReadme: string, all_translations?: string[]) => Promise<any>;
+}, learnJson: any, selectedLang: string, learnpackDeployUrl: string, b64IndexReadme: string, academyId: number | undefined, all_translations?: string[]) => Promise<any>;
 declare class BuildCommand extends SessionCommand {
     static description: string;
     static flags: {

package/lib/commands/publish.js

@@ -45,7 +45,7 @@ const getLocalizedValue = (translations, lang, fallbackLangs = ["en", "us"]) =>
     const first = firstKey ? translations[firstKey] : "";
     return typeof first === "string" ? first : "";
 };
-const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, learnpackDeployUrl, b64IndexReadme, all_translations = []) => {
+const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, learnpackDeployUrl, b64IndexReadme, academyId, all_translations = []) => {
     const category = "uncategorized";
     try {
         const user = await api_1.default.validateToken(sessionPayload.token);
@@ -56,17 +56,31 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
         }
         let slug = (0, creatorUtilities_1.slugify)(assetTitle).slice(0, 47);
         slug = `${slug}-${selectedLang}`;
-        const { exists } = await api_1.default.doesAssetExists(sessionPayload.token, slug);
+        const { exists, academyId: existingAcademyId } = await api_1.default.doesAssetExists(sessionPayload.token, slug);
+        // Compare academy IDs if asset exists and academyId is provided
+        if (exists &&
+            existingAcademyId !== undefined &&
+            academyId !== undefined &&
+            existingAcademyId !== academyId) {
+            console_1.default.warning(`Asset exists in academy ${existingAcademyId}, but attempting to publish to academy ${academyId}. ` +
+                `The asset will be updated in its current academy (${existingAcademyId}).`);
+        }
+        // const technologies: unknown[] = Array.isArray(learnJson?.technologies) ?
+        //   learnJson.technologies :
+        //   []
         if (!exists) {
             console_1.default.info("Asset does not exist in this academy, creating it");
-            const asset = await api_1.default.createAsset(sessionPayload.token, {
+            const assetPayload = {
                 slug: slug,
                 title: assetTitle,
                 lang: selectedLang,
                 graded: true,
                 description: assetDescription,
                 learnpack_deploy_url: learnpackDeployUrl,
-                technologies: learnJson.technologies.map((tech) => tech.toLowerCase().replace(/\s+/g, "-")),
+                // technologies: technologies.map((tech: unknown) =>
+                //   String(tech).toLowerCase().replace(/\s+/g, "-")
+                // ),
+                technologies: [],
                 url: learnpackDeployUrl,
                 category: category,
                 owner: user.id,
@@ -74,7 +88,11 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
                 preview: learnJson.preview,
                 readme_raw: b64IndexReadme,
                 all_translations,
-            });
+            };
+            if (academyId !== undefined) {
+                assetPayload.academy_id = academyId;
+            }
+            const asset = await api_1.default.createAsset(sessionPayload.token, assetPayload);
             try {
                 await api_1.default.updateRigoPackage(sessionPayload.rigobotToken.trim(), learnJson.slug, {
                     asset_id: asset.id,
@@ -108,7 +126,7 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
     }
     catch (error) {
         console_1.default.error("Error updating or creating asset:", error);
-        return null;
+        throw error;
     }
 };
 exports.handleAssetCreation = handleAssetCreation;
@@ -132,13 +150,19 @@ const createMultiLangAssetFromDisk = async (sessionPayload, learnJson, deployUrl
             indexReadmeString = "";
         }
         const b64IndexReadme = Buffer.from(indexReadmeString).toString("base64");
-        // eslint-disable-next-line no-await-in-loop
-        const asset = await (0, exports.handleAssetCreation)(sessionPayload, learnJson, lang, deployUrl, b64IndexReadme, all_translations);
-        if (!asset) {
-            console_1.default.debug("Could not create/update asset for lang", lang);
-            continue;
+        try {
+            // eslint-disable-next-line no-await-in-loop
+            const asset = await (0, exports.handleAssetCreation)(sessionPayload, learnJson, lang, deployUrl, b64IndexReadme, undefined, all_translations);
+            if (!asset) {
+                console_1.default.debug("Could not create/update asset for lang", lang);
+                continue;
+            }
+            all_translations.push(asset.slug);
+        }
+        catch (error) {
+            console_1.default.error("Error creating asset for language", lang, error);
+            // Continue with other languages
         }
-        all_translations.push(asset.slug);
     }
 };
 const runAudit = (strict) => {

package/lib/commands/serve.js

@@ -155,10 +155,12 @@ const cleanFormState = (formState) => {
 const cleanFormStateForSyllabus = (formState) => {
     return Object.assign(Object.assign({}, formState), { description: formState.description, technologies: formState.technologies, contentIndex: formState.contentIndex, purposse: undefined, duration: undefined, hasContentIndex: undefined, variables: undefined, currentStep: undefined, language: undefined, isCompleted: undefined });
 };
-const createMultiLangAsset = async (bucket, rigoToken, bcToken, courseSlug, courseJson, deployUrl) => {
+const createMultiLangAsset = async (bucket, rigoToken, bcToken, courseSlug, courseJson, deployUrl, academyId) => {
+    var _a;
     const availableLangs = Object.keys(courseJson.title);
     console.log("AVAILABLE LANGUAGES to upload asset", availableLangs);
     const all_translations = [];
+    const errors = [];
     for (const lang of availableLangs) {
         // eslint-disable-next-line no-await-in-loop
         const indexReadme = await bucket.file(`courses/${courseSlug}/README${(0, creatorUtilities_1.getReadmeExtension)(lang)}`);
@@ -174,14 +176,28 @@ const createMultiLangAsset = async (bucket, rigoToken, bcToken, courseSlug, cour
             indexReadmeString = "";
         }
         const b64IndexReadme = buffer_1.Buffer.from(indexReadmeString).toString("base64");
-        // eslint-disable-next-line no-await-in-loop
-        const asset = await (0, publish_1.handleAssetCreation)({ token: bcToken, rigobotToken: rigoToken.trim() }, courseJson, lang, deployUrl, b64IndexReadme, all_translations);
-        if (!asset) {
-            console.log("No se pudo crear el asset, saltando idioma", lang);
-            continue;
+        try {
+            // eslint-disable-next-line no-await-in-loop
+            const asset = await (0, publish_1.handleAssetCreation)({ token: bcToken, rigobotToken: rigoToken.trim() }, courseJson, lang, deployUrl, b64IndexReadme, academyId, all_translations);
+            if (!asset) {
+                errors.push({
+                    lang,
+                    error: { detail: "Failed to create asset", status_code: 500 },
+                });
+                console.log("No se pudo crear el asset, saltando idioma", lang);
+                continue;
+            }
+            all_translations.push(asset.slug);
+        }
+        catch (error) {
+            const errorData = error && typeof error === "object" && "response" in error ?
+                ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error :
+                error;
+            errors.push({ lang, error: errorData });
+            console.error(`Error creating asset for language ${lang}:`, error);
         }
-        all_translations.push(asset.slug);
     }
+    return { errors };
 };
 const lessonCleaner = (lesson) => {
     return Object.assign(Object.assign({}, lesson), { duration: undefined, generated: undefined, status: undefined, translations: undefined, uid: undefined, initialContent: undefined, locked: undefined });
@@ -2907,12 +2923,30 @@ class ServeCommand extends SessionCommand_1.default {
                 return res.status(500).json({ error: error.message });
             }
         });
+        app.get("/actions/academies", async (req, res) => {
+            try {
+                const bcToken = req.header("x-breathecode-token");
+                if (!bcToken) {
+                    return res
+                        .status(400)
+                        .json({
+                        error: "Authentication failed, missing breathecode token",
+                    });
+                }
+                const academies = await (0, api_1.listUserAcademies)(bcToken);
+                return res.json(academies);
+            }
+            catch (error) {
+                console.error("Error fetching academies:", error);
+                return res.status(500).json({ error: error.message });
+            }
+        });
         app.post("/actions/publish/:slug", async (req, res) => {
             try {
                 const { slug } = req.params;
                 const rigoToken = req.header("x-rigo-token");
                 const bcToken = req.header("x-breathecode-token");
-                // const { academyId, categoryId } = req.body
+                const { academyId } = req.body;
                 if (!rigoToken || !bcToken) {
                     return res
                         .status(400)
@@ -2998,10 +3032,13 @@ class ServeCommand extends SessionCommand_1.default {
                     const rigoRes = await axios_1.default.post(`${api_1.RIGOBOT_HOST}/v1/learnpack/upload`, form, {
                         headers: Object.assign(Object.assign({}, form.getHeaders()), { Authorization: "Token " + rigoToken.trim() }),
                     });
-                    await createMultiLangAsset(bucket, rigoToken, bcToken, slug, fullConfig.config, rigoRes.data.url);
+                    const assetResults = await createMultiLangAsset(bucket, rigoToken, bcToken, slug, fullConfig.config, rigoRes.data.url, academyId);
                     rimraf.sync(tmpRoot);
                     console.log("RigoRes", rigoRes.data);
-                    return res.json({ url: rigoRes.data.url });
+                    return res.json({
+                        url: rigoRes.data.url,
+                        errors: assetResults.errors,
+                    });
                 });
                 archive.on("error", err => {
                     console.error("ZIP Error:", err);

package/lib/utils/api.d.ts

@@ -26,6 +26,7 @@ type TAssetMissing = {
     preview: string;
     readme_raw: string;
     all_translations: string[];
+    academy_id?: number;
 };
 export declare const createAsset: (token: string, asset: TAssetMissing) => Promise<any>;
 export declare const doesAssetExists: (token: string, assetSlug: string) => Promise<{

package/lib/utils/api.js

@@ -358,10 +358,15 @@ const createAsset = async (token, asset) => {
         readme_raw: asset.readme_raw,
         all_translations: asset.all_translations,
     };
-    const url = `https://breathecode.herokuapp.com/v1/registry/asset/me`;
+    let url = `https://breathecode.herokuapp.com/v1/registry/asset/me`;
     const headers = {
         Authorization: `Token ${token}`,
     };
+    // Use academy-specific endpoint if academy_id is provided
+    if (asset.academy_id !== undefined) {
+        url = `https://breathecode.herokuapp.com/v1/registry/academy/asset`;
+        headers.Academy = String(asset.academy_id);
+    }
     try {
         const response = await axios_1.default.post(url, body, { headers });
         return response.data;
@@ -373,6 +378,7 @@ const createAsset = async (token, asset) => {
 };
 exports.createAsset = createAsset;
 const doesAssetExists = async (token, assetSlug) => {
+    var _a, _b, _c;
     const url = `https://breathecode.herokuapp.com/v1/registry/asset/${assetSlug}`;
     const headers = {
         Authorization: `Token ${token}`,
@@ -380,11 +386,12 @@ const doesAssetExists = async (token, assetSlug) => {
     try {
         const response = await axios_1.default.get(url, { headers });
         if (response.status === 200) {
-            return { exists: true };
+            const academyId = ((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.academy) === null || _b === void 0 ? void 0 : _b.id) || ((_c = response.data) === null || _c === void 0 ? void 0 : _c.academy_id);
+            return { exists: true, academyId };
         }
         return { exists: false };
     }
-    catch (_a) {
+    catch (_d) {
         // console.error("Failed to get asset:", error)
         return { exists: false };
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@learnpack/learnpack",
   "description": "Seamlessly build, sell and/or take interactive & auto-graded tutorials, start learning now or build a new tutorial to your audience.",
-  "version": "5.0.332",
+  "version": "5.0.334",
   "author": "Alejandro Sanchez @alesanchezr",
   "contributors": [
     {

package/src/commands/publish.ts

@@ -60,6 +60,7 @@ export const handleAssetCreation = async (
   selectedLang: string,
   learnpackDeployUrl: string,
   b64IndexReadme: string,
+  academyId: number | undefined,
   all_translations: string[] = []
 ) => {
   const category = "uncategorized"
@@ -82,20 +83,41 @@ export const handleAssetCreation = async (
     let slug = slugify(assetTitle).slice(0, 47)
     slug = `${slug}-${selectedLang}`
 
-    const { exists } = await api.doesAssetExists(sessionPayload.token, slug)
+    const { exists, academyId: existingAcademyId } = await api.doesAssetExists(
+      sessionPayload.token,
+      slug
+    )
+
+    // Compare academy IDs if asset exists and academyId is provided
+    if (
+      exists &&
+      existingAcademyId !== undefined &&
+      academyId !== undefined &&
+      existingAcademyId !== academyId
+    ) {
+      Console.warning(
+        `Asset exists in academy ${existingAcademyId}, but attempting to publish to academy ${academyId}. ` +
+          `The asset will be updated in its current academy (${existingAcademyId}).`
+      )
+    }
+
+    // const technologies: unknown[] = Array.isArray(learnJson?.technologies) ?
+    //   learnJson.technologies :
+    //   []
 
     if (!exists) {
       Console.info("Asset does not exist in this academy, creating it")
-      const asset = await api.createAsset(sessionPayload.token, {
+      const assetPayload: any = {
         slug: slug,
         title: assetTitle,
         lang: selectedLang,
         graded: true,
         description: assetDescription,
         learnpack_deploy_url: learnpackDeployUrl,
-        technologies: learnJson.technologies.map((tech: string) =>
-          tech.toLowerCase().replace(/\s+/g, "-")
-        ),
+        // technologies: technologies.map((tech: unknown) =>
+        //   String(tech).toLowerCase().replace(/\s+/g, "-")
+        // ),
+        technologies: [],
         url: learnpackDeployUrl,
         category: category,
         owner: user.id,
@@ -103,7 +125,12 @@ export const handleAssetCreation = async (
         preview: learnJson.preview,
         readme_raw: b64IndexReadme,
         all_translations,
-      })
+      }
+      if (academyId !== undefined) {
+        assetPayload.academy_id = academyId
+      }
+
+      const asset = await api.createAsset(sessionPayload.token, assetPayload)
       try {
         await api.updateRigoPackage(
           sessionPayload.rigobotToken.trim(),
@@ -145,7 +172,7 @@ export const handleAssetCreation = async (
     return asset
   } catch (error) {
     Console.error("Error updating or creating asset:", error)
-    return null
+    throw error
   }
 }
 
@@ -182,22 +209,28 @@ const createMultiLangAssetFromDisk = async (
 
     const b64IndexReadme = Buffer.from(indexReadmeString).toString("base64")
 
-    // eslint-disable-next-line no-await-in-loop
-    const asset = await handleAssetCreation(
-      sessionPayload,
-      learnJson,
-      lang,
-      deployUrl,
-      b64IndexReadme,
-      all_translations
-    )
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      const asset = await handleAssetCreation(
+        sessionPayload,
+        learnJson,
+        lang,
+        deployUrl,
+        b64IndexReadme,
+        undefined,
+        all_translations
+      )
 
-    if (!asset) {
-      Console.debug("Could not create/update asset for lang", lang)
-      continue
-    }
+      if (!asset) {
+        Console.debug("Could not create/update asset for lang", lang)
+        continue
+      }
 
-    all_translations.push(asset.slug)
+      all_translations.push(asset.slug)
+    } catch (error) {
+      Console.error("Error creating asset for language", lang, error)
+      // Continue with other languages
+    }
   }
 }
 

package/src/commands/serve.ts

@@ -49,7 +49,11 @@ import {
 // import { handleAssetCreation } from "./publish"
 import axios from "axios"
 import * as FormData from "form-data"
-import api, { RIGOBOT_HOST, RIGOBOT_REALTIME_HOST } from "../utils/api"
+import api, {
+  RIGOBOT_HOST,
+  RIGOBOT_REALTIME_HOST,
+  listUserAcademies,
+} from "../utils/api"
 import {
   createUploadMiddleware,
   minutesToISO8601Duration,
@@ -279,12 +283,14 @@ const createMultiLangAsset = async (
   bcToken: string,
   courseSlug: string,
   courseJson: any,
-  deployUrl: string
-) => {
+  deployUrl: string,
+  academyId?: number
+): Promise<{ errors: Array<{ lang: string; error: any }> }> => {
   const availableLangs = Object.keys(courseJson.title)
   console.log("AVAILABLE LANGUAGES to upload asset", availableLangs)
 
   const all_translations: string[] = []
+  const errors: Array<{ lang: string; error: any }> = []
 
   for (const lang of availableLangs) {
     // eslint-disable-next-line no-await-in-loop
@@ -304,23 +310,39 @@ const createMultiLangAsset = async (
 
     const b64IndexReadme = Buffer.from(indexReadmeString).toString("base64")
 
-    // eslint-disable-next-line no-await-in-loop
-    const asset = await handleAssetCreation(
-      { token: bcToken, rigobotToken: rigoToken.trim() },
-      courseJson,
-      lang,
-      deployUrl,
-      b64IndexReadme,
-      all_translations
-    )
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      const asset = await handleAssetCreation(
+        { token: bcToken, rigobotToken: rigoToken.trim() },
+        courseJson,
+        lang,
+        deployUrl,
+        b64IndexReadme,
+        academyId,
+        all_translations
+      )
 
-    if (!asset) {
-      console.log("No se pudo crear el asset, saltando idioma", lang)
-      continue
-    }
+      if (!asset) {
+        errors.push({
+          lang,
+          error: { detail: "Failed to create asset", status_code: 500 },
+        })
+        console.log("No se pudo crear el asset, saltando idioma", lang)
+        continue
+      }
 
-    all_translations.push(asset.slug)
+      all_translations.push(asset.slug)
+    } catch (error) {
+      const errorData =
+        error && typeof error === "object" && "response" in error ?
+          (error as any).response?.data || error :
+          error
+      errors.push({ lang, error: errorData })
+      console.error(`Error creating asset for language ${lang}:`, error)
+    }
   }
+
+  return { errors }
 }
 
 const lessonCleaner = (lesson: Lesson) => {
@@ -4233,12 +4255,32 @@ class ServeCommand extends SessionCommand {
       }
     )
 
+    app.get("/actions/academies", async (req, res) => {
+      try {
+        const bcToken = req.header("x-breathecode-token")
+
+        if (!bcToken) {
+          return res
+            .status(400)
+            .json({
+              error: "Authentication failed, missing breathecode token",
+            })
+        }
+
+        const academies = await listUserAcademies(bcToken)
+        return res.json(academies)
+      } catch (error) {
+        console.error("Error fetching academies:", error)
+        return res.status(500).json({ error: (error as Error).message })
+      }
+    })
+
     app.post("/actions/publish/:slug", async (req, res) => {
       try {
         const { slug } = req.params
         const rigoToken = req.header("x-rigo-token")
         const bcToken = req.header("x-breathecode-token")
-        // const { academyId, categoryId } = req.body
+        const { academyId } = req.body
 
         if (!rigoToken || !bcToken) {
           return res
@@ -4360,18 +4402,22 @@ class ServeCommand extends SessionCommand {
             }
           )
 
-          await createMultiLangAsset(
+          const assetResults = await createMultiLangAsset(
             bucket,
             rigoToken,
             bcToken,
             slug,
             fullConfig.config,
-            rigoRes.data.url
+            rigoRes.data.url,
+            academyId
           )
 
           rimraf.sync(tmpRoot)
           console.log("RigoRes", rigoRes.data)
-          return res.json({ url: rigoRes.data.url })
+          return res.json({
+            url: rigoRes.data.url,
+            errors: assetResults.errors,
+          })
         })
 
         archive.on("error", err => {

package/src/utils/api.ts

@@ -431,10 +431,11 @@ type TAssetMissing = {
   preview: string;
   readme_raw: string;
   all_translations: string[];
+  academy_id?: number;
 };
 
 export const createAsset = async (token: string, asset: TAssetMissing) => {
-  const body = {
+  const body: any = {
     slug: asset.slug,
     title: asset.title,
     lang: asset.lang,
@@ -462,11 +463,18 @@ export const createAsset = async (token: string, asset: TAssetMissing) => {
     readme_raw: asset.readme_raw,
     all_translations: asset.all_translations,
   }
-  const url = `https://breathecode.herokuapp.com/v1/registry/asset/me`
-  const headers = {
+
+  let url = `https://breathecode.herokuapp.com/v1/registry/asset/me`
+  const headers: any = {
     Authorization: `Token ${token}`,
   }
 
+  // Use academy-specific endpoint if academy_id is provided
+  if (asset.academy_id !== undefined) {
+    url = `https://breathecode.herokuapp.com/v1/registry/academy/asset`
+    headers.Academy = String(asset.academy_id)
+  }
+
   try {
     const response = await axios.post(url, body, { headers })
     return response.data
@@ -489,7 +497,8 @@ export const doesAssetExists = async (
   try {
     const response = await axios.get(url, { headers })
     if (response.status === 200) {
-      return { exists: true }
+      const academyId = response.data?.academy?.id || response.data?.academy_id
+      return { exists: true, academyId }
     }
 
     return { exists: false }