@learnpack/learnpack 5.0.344 → 5.0.347

package/src/utils/api.ts

@@ -353,20 +353,15 @@ export interface TAcademy {
   timezone: string;
 }
 
-const neededPermissions = [
-  "add_asset",
-  "change_asset",
-  "view_asset",
-  "delete_asset",
-]
+const CRUD_ASSET_CAPABILITY_URL = `${HOST}/v1/auth/user/me/capability/crud_asset`
 
 export const listUserAcademies = async (
   breathecodeToken: string
 ): Promise<TAcademy[]> => {
-  const url = "https://breathecode.herokuapp.com/v1/auth/user/me"
+  const meUrl = `${HOST}/v1/auth/user/me`
 
   try {
-    const response = await axios.get(url, {
+    const response = await axios.get(meUrl, {
       headers: {
         Authorization: `Token ${breathecodeToken}`,
       },
@@ -376,27 +371,47 @@ export const listUserAcademies = async (
 
     const academiesMap = new Map<number, TAcademy>()
 
+    if (!Array.isArray(data.roles)) {
+      return []
+    }
+
     for (const role of data.roles) {
       const academy = role.academy
+      if (!academy) continue
       if (!academiesMap.has(academy.id)) {
         academiesMap.set(academy.id, academy)
       }
     }
 
-    const permissions = new Set(data.permissions.map((p: any) => p.codename))
+    const academies = [...academiesMap.values()]
 
-    // Validate if the user has ALL the needed permissions
-    const hasAllPermissions = neededPermissions.every(permission =>
-      permissions.has(permission)
-    )
+    const allowed = await Promise.all(
+      academies.map(async academy => {
+        const capResponse = await axios.get(CRUD_ASSET_CAPABILITY_URL, {
+          headers: {
+            Authorization: `Token ${breathecodeToken}`,
+            Academy: academy.id,
+          },
+          validateStatus: () => true,
+        })
+
+        if (capResponse.status === 200) {
+          return academy
+        }
 
-    if (!hasAllPermissions) {
-      // The user does not have all the needed permissions
+        if (capResponse.status !== 403) {
+          console.warn(
+            `listUserAcademies: unexpected status ${capResponse.status} for academy ${academy.id}`
+          )
+        }
 
-      return []
-    }
+        return null
+      })
+    )
 
-    return [...academiesMap.values()]
+    const filtered = allowed.filter((a): a is TAcademy => a !== null)
+    filtered.sort((a, b) => a.name.localeCompare(b.name))
+    return filtered
   } catch (error) {
     console.error("Failed to fetch user academies:", error)
     return []
@@ -417,6 +432,42 @@ export const validateToken = async (token: string) => {
   }
 }
 
+/** keep in sync with ide/src/components/Creator/PublishButton.tsx AssetSyncError */
+export type AssetSyncError =
+  | { kind: "lang_error"; lang: string; error: { detail: string } }
+  | { kind: "package_error"; error: { detail: string } };
+
+function parseLearnpackPackageId(raw: unknown): number | null {
+  if (raw === undefined || raw === null) return null
+  const n = typeof raw === "number" ? raw : Number(raw)
+  if (!Number.isFinite(n) || !Number.isInteger(n)) return null
+  return n
+}
+
+/**
+ * GET Rigobot package by slug after a successful upload. Does not throw.
+ * @param rigoToken Rigobot API token (Bearer-style `Token` header value).
+ * @param courseSlug Learnpack package slug used in the Rigobot URL path.
+ * @returns Resolved numeric package id from Rigobot, or `null` if the request fails, the id is missing, or it is not a finite integer.
+ */
+export async function resolveLearnpackPackageId(
+  rigoToken: string,
+  courseSlug: string
+): Promise<number | null> {
+  if (!rigoToken?.trim() || !courseSlug) return null
+  const url = `${RIGOBOT_HOST}/v1/learnpack/package/${encodeURIComponent(
+    courseSlug
+  )}/`
+  try {
+    const response = await axios.get<{ id?: unknown }>(url, {
+      headers: { Authorization: `Token ${rigoToken.trim()}` },
+    })
+    return parseLearnpackPackageId(response.data?.id)
+  } catch {
+    return null
+  }
+}
+
 type TAssetMissing = {
   slug: string;
   title: string;
@@ -433,6 +484,7 @@ type TAssetMissing = {
   readme_raw: string;
   all_translations: string[];
   academy_id?: number;
+  learnpack_id: number;
 };
 
 export const createAsset = async (token: string, asset: TAssetMissing) => {
@@ -460,6 +512,7 @@ export const createAsset = async (token: string, asset: TAssetMissing) => {
     intro_video_url: null,
     translations: [asset.lang],
     learnpack_deploy_url: asset.learnpack_deploy_url,
+    learnpack_id: asset.learnpack_id,
     technologies: asset.technologies,
     readme_raw: asset.readme_raw,
     all_translations: asset.all_translations,
@@ -476,6 +529,15 @@ export const createAsset = async (token: string, asset: TAssetMissing) => {
     headers.Academy = String(asset.academy_id)
   }
 
+  console.log(
+    "[BC] POST",
+    url,
+    "| academy_id:",
+    asset.academy_id ?? "none",
+    "| slug:",
+    asset.slug
+  )
+
   try {
     const response = await axios.post(url, body, { headers })
     return response.data
@@ -512,14 +574,19 @@ export const doesAssetExists = async (
 const updateAsset = async (
   token: string,
   assetSlug: string,
-  asset: Partial<TAssetMissing>
+  asset: Partial<TAssetMissing> & { learnpack_id: number }
 ) => {
   const url = `https://breathecode.herokuapp.com/v1/registry/asset/me/${assetSlug}`
   const headers = {
     Authorization: `Token ${token}`,
   }
+
+  const body = { ...asset, learnpack_id: asset.learnpack_id }
+
+  console.log("[BC] PUT", url, "| academy_id:", asset.academy_id ?? "none")
+
   try {
-    const response = await axios.put(url, asset, { headers })
+    const response = await axios.put(url, body, { headers })
     return response.data
   } catch (error: any) {
     console.error("Failed to update asset:", error)
@@ -593,7 +660,11 @@ type TTechnology = {
 
 let technologiesCache: TTechnology[] = []
 
-/** Strip .env comments (e.g. "token # comment") so the token is sent without spaces. */
+/**
+ * Strip .env comments (e.g. "token # comment") so the token is sent without spaces.
+ * @param token - Raw token value from env, possibly with trailing comment.
+ * @returns Trimmed token with inline `#` comments removed, or empty string if missing.
+ */
 function sanitizeToken(token: string | undefined): string {
   if (!token) return ""
   const trimmed = token.trim()
@@ -677,6 +748,7 @@ export default {
   createAsset,
   doesAssetExists,
   updateAsset,
+  resolveLearnpackPackageId,
   getCategories,
   updateRigoPackage,
   createRigoPackage,