musora-content-services 2.36.2 → 2.36.4

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.36.4](https://github.com/railroadmedia/musora-content-services/compare/v2.36.3...v2.36.4) (2025-09-10)
+
+### [2.36.3](https://github.com/railroadmedia/musora-content-services/compare/v2.36.2...v2.36.3) (2025-09-09)
+
 ### [2.36.2](https://github.com/railroadmedia/musora-content-services/compare/v2.36.1...v2.36.2) (2025-09-09)
 
 ### [2.36.1](https://github.com/railroadmedia/musora-content-services/compare/v2.36.0...v2.36.1) (2025-09-09)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.36.2",
+  "version": "2.36.4",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",

package/src/index.d.ts

@@ -10,7 +10,6 @@ import {
 	fetchEnrollmentPageMetadata,
 	guidedCourses,
 	pinGuidedCourse,
-	pinnedGuidedCourses,
 	unEnrollUserInGuidedCourse,
 	unPinGuidedCourse
 } from './services/content-org/guided-courses.ts';
@@ -59,6 +58,7 @@ import {
 import {
 	contentStatusCompleted,
 	contentStatusReset,
+	contentStatusStartedForGuidedCourseEnrollment,
 	getAllCompleted,
 	getAllStarted,
 	getAllStartedOrCompleted,
@@ -149,6 +149,7 @@ import {
 	postContentLiked,
 	postContentReset,
 	postContentRestore,
+	postContentStartForGC,
 	postContentUnliked,
 	postPlaylistContentEngaged,
 	postRecordWatchSession,
@@ -338,6 +339,7 @@ declare module 'musora-content-services' {
 		confirmEmailChange,
 		contentStatusCompleted,
 		contentStatusReset,
+		contentStatusStartedForGuidedCourseEnrollment,
 		convertToTimeZone,
 		createComment,
 		createPlaylist,
@@ -508,11 +510,11 @@ declare module 'musora-content-services' {
 		pauseLiveEventPolling,
 		pinGuidedCourse,
 		pinProgressRow,
-		pinnedGuidedCourses,
 		postContentComplete,
 		postContentLiked,
 		postContentReset,
 		postContentRestore,
+		postContentStartForGC,
 		postContentUnliked,
 		postPlaylistContentEngaged,
 		postRecordWatchSession,

package/src/index.js

@@ -10,7 +10,6 @@ import {
 	fetchEnrollmentPageMetadata,
 	guidedCourses,
 	pinGuidedCourse,
-	pinnedGuidedCourses,
 	unEnrollUserInGuidedCourse,
 	unPinGuidedCourse
 } from './services/content-org/guided-courses.ts';
@@ -59,6 +58,7 @@ import {
 import {
 	contentStatusCompleted,
 	contentStatusReset,
+	contentStatusStartedForGuidedCourseEnrollment,
 	getAllCompleted,
 	getAllStarted,
 	getAllStartedOrCompleted,
@@ -149,6 +149,7 @@ import {
 	postContentLiked,
 	postContentReset,
 	postContentRestore,
+	postContentStartForGC,
 	postContentUnliked,
 	postPlaylistContentEngaged,
 	postRecordWatchSession,
@@ -337,6 +338,7 @@ export {
 	confirmEmailChange,
 	contentStatusCompleted,
 	contentStatusReset,
+	contentStatusStartedForGuidedCourseEnrollment,
 	convertToTimeZone,
 	createComment,
 	createPlaylist,
@@ -507,11 +509,11 @@ export {
 	pauseLiveEventPolling,
 	pinGuidedCourse,
 	pinProgressRow,
-	pinnedGuidedCourses,
 	postContentComplete,
 	postContentLiked,
 	postContentReset,
 	postContentRestore,
+	postContentStartForGC,
 	postContentUnliked,
 	postPlaylistContentEngaged,
 	postRecordWatchSession,

package/src/lib/httpHelper.js

@@ -12,6 +12,7 @@ export async function fetchJSONHandler(
     'Content-Type': 'application/json',
     Accept: 'application/json',
     'X-CSRF-TOKEN': token,
+    credentials: 'include',
   }
 
   if (body) {

package/src/services/content-org/guided-courses.ts

@@ -39,8 +39,3 @@ export async function guidedCourses() {
   const url: string = `${BASE_PATH}/v1/user/guided-courses/`
   return await fetchHandler(url, 'GET')
 }
-
-export async function pinnedGuidedCourses(brand) {
-  const url: string = `${BASE_PATH}/v1/user/guided-courses/pinned?brand=${brand}`
-  return await fetchHandler(url, 'GET')
-}

package/src/services/contentAggregator.js

@@ -93,7 +93,6 @@ export async function addContextToContent(dataPromise, ...dataArgs)
     addNextLesson ? getNextLesson(items) : Promise.resolve(null),
     addNavigateTo ? getNavigateTo(items) : Promise.resolve(null),
   ])
-  if (addNextLesson) console.log('AddNextLesson is depreciated in favour of addNavigateTo')
 
   const addContext = async (item) => ({
     ...item,

package/src/services/contentProgress.js

@@ -2,6 +2,7 @@ import {
   fetchContentProgress,
   postContentComplete,
   postContentReset,
+  postContentStartForGC,
   postRecordWatchSession,
 } from './railcontent.js'
 import { DataContext, ContentProgressVersionKey } from './dataContext.js'
@@ -359,6 +360,19 @@ export async function contentStatusCompleted(contentId) {
     }
   )
 }
+export async function contentStatusStartedForGuidedCourseEnrollment(contentId) {
+  const response = await postContentStartForGC(contentId);
+
+  return await dataContext.update(
+    async function (localContext) {
+      let hierarchy = await fetchHierarchy(contentId)
+      startStatusInLocalContext(localContext, contentId, hierarchy)
+    },
+    async function () {
+      return response
+    }
+  )
+}
 
 function saveContentProgress(localContext, contentId, progress, currentSeconds, hierarchy) {
   if (progress === 100) {
@@ -395,6 +409,22 @@ function completeStatusInLocalContext(localContext, contentId, hierarchy) {
   bubbleProgress(hierarchy, contentId, localContext)
 }
 
+function startStatusInLocalContext(localContext, contentId, hierarchy) {
+  let data = localContext.data[contentId] ?? {}
+  data[DATA_KEY_PROGRESS] = 0
+  data[DATA_KEY_STATUS] = STATE_STARTED
+  data[DATA_KEY_LAST_UPDATED_TIME] = Math.round(new Date().getTime() / 1000)
+  localContext.data[contentId] = data
+
+  if (!hierarchy) return
+  let children = hierarchy.children[contentId] ?? []
+  for (let i = 0; i < children.length; i++) {
+    let childId = children[i]
+    startStatusInLocalContext(localContext, childId, hierarchy)
+  }
+  bubbleProgress(hierarchy, contentId, localContext)
+}
+
 function getChildrenToDepth(parentId, hierarchy, depth = 1) {
   let childIds = hierarchy.children[parentId] ?? []
   let allChildrenIds = childIds

package/src/services/railcontent.js

@@ -388,6 +388,16 @@ export async function postContentComplete(contentId) {
   return postDataHandler(url)
 }
 
+/**
+ * start a Guided Course content's progress for a given user
+ * @param contentId
+ * @returns {Promise<any|string|null>}
+ */
+export async function postContentStartForGC(contentId) {
+  let url = `/api/content/v1/user/progress/start`
+  return postDataHandler(url, { contentId })
+}
+
 /**
  * resets the user's progress on a content
  * @param contentId

package/src/services/sanity.js

@@ -1834,9 +1834,6 @@ export async function fetchSanity(
     }
     const result = await response.json()
     if (result.result) {
-      if (globalConfig.sanityConfig.debug) {
-        console.log('fetchSanity Results:', result)
-      }
       let results = isList ? result.result : result.result[0]
       if (!results) {
         throw new Error('No results found')

package/src/services/user/sessions.js

@@ -45,6 +45,21 @@ export async function login(email, password, deviceName, deviceToken, platform)
   })
 }
 
+export async function loginWithProvider(provider, token) {
+  const baseUrl = `${globalConfig.baseUrl}/api/user-management-system`
+  return fetch(`${baseUrl}/v1/sessions`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Client-Platform': 'mobile',
+      Authorization: null,
+    },
+    body: JSON.stringify({
+      provider: provider,
+      token: token,
+    }),
+  });
+}
 /**
  * Logs the user out of the current session.
  *

package/src/services/userActivity.js

@@ -13,7 +13,7 @@ import {
 import { DataContext, UserActivityVersionKey } from './dataContext.js'
 import { fetchByRailContentId, fetchByRailContentIds, fetchShows } from './sanity'
 import { fetchPlaylist, fetchUserPlaylists } from './content-org/playlists'
-import {guidedCourses, pinnedGuidedCourses} from './content-org/guided-courses'
+import {guidedCourses} from './content-org/guided-courses'
 import {
   getMonday,
   getWeekNumber,
@@ -950,7 +950,6 @@ async function extractPinnedItemsAndSortAllItems(
   userPinnedItem,
   contentsMap,
   eligiblePlaylistItems,
-  pinnedGuidedCourse,
   limit
 ) {
   let pinnedItem = await popPinnedItemFromContentsOrPlaylistMap(
@@ -959,22 +958,8 @@ async function extractPinnedItemsAndSortAllItems(
     eligiblePlaylistItems
   )
 
-  const guidedCourseID = pinnedGuidedCourse?.content_id
   let combined = []
-  if (pinnedGuidedCourse) {
-    const guidedCourseContent =
-      contentsMap.get(guidedCourseID) ??
-      (await addContextToContent(fetchByRailContentId, guidedCourseID, 'guided-course', {
-        addNextLesson: true,
-        addNavigateTo: true,
-        addProgressStatus: true,
-        addProgressPercentage: true,
-        addProgressTimestamp: true,
-      }))
-    contentsMap = popContentAndRemoveChildrenFromContentsMap(guidedCourseContent, contentsMap)
-    guidedCourseContent.pinned = true
-    combined.push(guidedCourseContent)
-  }
+
   if (pinnedItem) {
     pinnedItem.pinned = true
     combined.push(pinnedItem)
@@ -1052,20 +1037,15 @@ function generateContentsMap(contents, playlistsContents) {
 export async function getProgressRows({ brand = null, limit = 8 } = {}) {
   // TODO slice progress to a reasonable number, say 100
 
-  const [recentPlaylists, progressContents, allPinnedGuidedCourse, userPinnedItem, enrolledGuidedCourses] =
+  const [recentPlaylists, progressContents, userPinnedItem, enrolledGuidedCourses] =
     await Promise.all([
       fetchUserPlaylists(brand, { sort: '-last_progress', limit: limit }),
       getAllStartedOrCompleted({ onlyIds: false, brand: brand }),
-      pinnedGuidedCourses(brand),
       getUserPinnedItem(brand),
       guidedCourses()
     ])
 
   const enrolledGuidedCoursesIds = enrolledGuidedCourses.map(course => String(course.content_id));
-
-  const mergedGuidedCourses = 1 //get all cuigded courses, incl no progress.
-  let pinnedGuidedCourse = allPinnedGuidedCourse?.[0] ?? null
-
   const playlists = recentPlaylists?.data || []
   const eligiblePlaylistItems = await getEligiblePlaylistItems(playlists)
   const playlistEngagedOnContents = eligiblePlaylistItems.map(
@@ -1079,8 +1059,6 @@ export async function getProgressRows({ brand = null, limit = 8 } = {}) {
   if (userPinnedItem?.progressType === 'content') {
     nonPlaylistContentIds.push(userPinnedItem.id)
   }
-console.log("nonPlaylistContentIds",nonPlaylistContentIds)
-
 
   const [playlistsContents, contents] = await Promise.all([
     playlistEngagedOnContents ? addContextToContent(fetchByRailContentIds, playlistEngagedOnContents, 'progress-tracker', {
@@ -1103,7 +1081,6 @@ console.log("nonPlaylistContentIds",nonPlaylistContentIds)
     userPinnedItem,
     contentsMap,
     eligiblePlaylistItems,
-    pinnedGuidedCourse,
     limit
   )
   const results = await Promise.all(
@@ -1361,8 +1338,10 @@ export function findIncompleteLesson(progressOnItems, currentContentId, contentT
 
 async function popPinnedItemFromContentsOrPlaylistMap(pinned, contentsMap, playlistItems) {
   if (!pinned) return null
-  const { id, progressType, pinnedAt } = pinned
+  const { id, pinnedAt } = pinned
   let item = null
+  const progressType = pinned.progressType ?? pinned.type;
+
   if (progressType === 'content') {
     const pinnedId = parseInt(id)
     if (contentsMap.has(pinnedId)) {
@@ -1399,15 +1378,19 @@ async function popPinnedItemFromContentsOrPlaylistMap(pinned, contentsMap, playl
 }
 
 function popContentAndRemoveChildrenFromContentsMap(content, contentsMap) {
-  const children = content.children.map((child) => child.id)
-  if (contentsMap.has(content.id)) {
-    contentsMap.delete(content.id)
-  }
-  children.forEach((child) => {
-    if (contentsMap.has(child)) {
-      contentsMap.delete(child)
+  if (!content.children || content.children.length === 0){
+    console.warn(`content ${content.id} has no children`, content);
+  } else {
+    const children = content.children.map((child) => child.id)
+    if (contentsMap.has(content.id)) {
+      contentsMap.delete(content.id)
     }
-  })
+    children.forEach((child) => {
+      if (contentsMap.has(child)) {
+        contentsMap.delete(child)
+      }
+    })
+  }
   return contentsMap
 }
 
@@ -1427,7 +1410,7 @@ function popContentAndRemoveChildrenFromContentsMap(content, contentsMap) {
 export async function pinProgressRow(brand, id, progressType) {
   const url = `/api/user-management-system/v1/progress/pin?brand=${brand}&id=${id}&progressType=${progressType}`
   const response = await fetchHandler(url, 'PUT', null)
-  if (response && !response.error && response['action'] === 'update_user_pin') {
+  if (response && !response.error) {
     await updateUserPinnedProgressRow(brand, {
       id,
       progressType,