musora-content-services 2.106.1 → 2.107.2

package/.claude/settings.local.json

@@ -0,0 +1,19 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(find:*)",
+      "Bash(docker exec:*)",
+      "Bash(npm test:*)",
+      "WebSearch",
+      "WebFetch(domain:watermelondb.dev)",
+      "WebFetch(domain:github.com)",
+      "Bash(git checkout:*)",
+      "Bash(npm run doc:*)",
+      "Bash(cat:*)",
+      "Bash(tr:*)",
+      "Bash(npm run build-index:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 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.107.2](https://github.com/railroadmedia/musora-content-services/compare/v2.107.1...v2.107.2) (2025-12-19)
+
+### [2.107.1](https://github.com/railroadmedia/musora-content-services/compare/v2.107.0...v2.107.1) (2025-12-19)
+
+## [2.107.0](https://github.com/railroadmedia/musora-content-services/compare/v2.105.0...v2.107.0) (2025-12-19)
+
+
+### Features
+
+* Add some validators prior to writing to watermelon ([#663](https://github.com/railroadmedia/musora-content-services/issues/663)) ([9eeedac](https://github.com/railroadmedia/musora-content-services/commit/9eeedac5a3cf8b4eedd091fcb8252ffd5bae6c85))
+
+
+### Bug Fixes
+
+* 401 authentication errors for mobile app by reading token lazily from globalConfig at request time instead of at HttpClient instantiation ([99204b3](https://github.com/railroadmedia/musora-content-services/commit/99204b317c806ef8bec6f0846059c82fc7f3b585))
+* Restricted access in recent activities ([7013794](https://github.com/railroadmedia/musora-content-services/commit/7013794f235f350eb30833bf0680bb7bb851af10))
+
 ### [2.106.1](https://github.com/railroadmedia/musora-content-services/compare/v2.106.0...v2.106.1) (2025-12-18)
 
 ## [2.106.0](https://github.com/railroadmedia/musora-content-services/compare/v2.105.0...v2.106.0) (2025-12-18)

package/package.json

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

package/src/index.d.ts

@@ -396,9 +396,8 @@ import {
 } from './services/user/profile.js';
 
 import {
-	getAuthKey,
+	generateAuthSessionUrl,
 	login,
-	loginWithAuthKey,
 	logout
 } from './services/user/sessions.js';
 
@@ -580,13 +579,13 @@ declare module 'musora-content-services' {
 		fetchUserPractices,
 		findIncompleteLesson,
 		followThread,
+		generateAuthSessionUrl,
 		getActiveDiscussions,
 		getActivePath,
 		getAllCompleted,
 		getAllCompletedByIds,
 		getAllStarted,
 		getAllStartedOrCompleted,
-		getAuthKey,
 		getAwardStatistics,
 		getCompletedAwards,
 		getContentAwards,
@@ -650,7 +649,6 @@ declare module 'musora-content-services' {
 		likePost,
 		lockThread,
 		login,
-		loginWithAuthKey,
 		logout,
 		mapContentToParent,
 		markAllNotificationsAsRead,

package/src/index.js

@@ -400,9 +400,8 @@ import {
 } from './services/user/profile.js';
 
 import {
-	getAuthKey,
+	generateAuthSessionUrl,
 	login,
-	loginWithAuthKey,
 	logout
 } from './services/user/sessions.js';
 
@@ -579,13 +578,13 @@ export {
 	fetchUserPractices,
 	findIncompleteLesson,
 	followThread,
+	generateAuthSessionUrl,
 	getActiveDiscussions,
 	getActivePath,
 	getAllCompleted,
 	getAllCompletedByIds,
 	getAllStarted,
 	getAllStartedOrCompleted,
-	getAuthKey,
 	getAwardStatistics,
 	getCompletedAwards,
 	getContentAwards,
@@ -649,7 +648,6 @@ export {
 	likePost,
 	lockThread,
 	login,
-	loginWithAuthKey,
 	logout,
 	mapContentToParent,
 	markAllNotificationsAsRead,

package/src/infrastructure/http/HttpClient.ts

@@ -74,9 +74,10 @@ export class HttpClient {
       headers['Data-Version'] = dataVersion
     }
 
-    // Add auth token if available
-    if (this.token) {
-      headers['Authorization'] = `Bearer ${this.token}`
+    // Add auth token if available (check both instance token and global config)
+    const token = this.token || globalConfig?.sessionConfig?.token || null
+    if (token) {
+      headers['Authorization'] = `Bearer ${token}`
     }
 
     return headers

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

@@ -1,7 +1,7 @@
 /**
  * @module GuidedCourses
  */
-import { GET, POST } from '../../infrastructure/http/HttpClient.js'
+import { GET, POST } from '../../infrastructure/http/HttpClient.ts'
 import { contentStatusStarted, getProgressState } from '../contentProgress.js'
 import './playlists-types.js'
 

package/src/services/content-org/learning-paths.ts

@@ -2,7 +2,7 @@
  * @module LearningPaths
  */
 
-import { GET, POST } from '../../infrastructure/http/HttpClient.js'
+import { GET, POST } from '../../infrastructure/http/HttpClient.ts'
 import { fetchByRailContentId, fetchByRailContentIds, fetchMethodV2Structure } from '../sanity.js'
 import { addContextToLearningPaths } from '../contentAggregator.js'
 import {

package/src/services/content-org/playlists.js

@@ -1,7 +1,7 @@
 /**
  * @module Playlists
  */
-import { GET, POST, PUT, DELETE } from '../../infrastructure/http/HttpClient.js'
+import { GET, POST, PUT, DELETE } from '../../infrastructure/http/HttpClient.ts'
 import { getNavigateToForPlaylists } from '../contentAggregator.js'
 import './playlists-types.js'
 

package/src/services/recommendations.js

@@ -3,7 +3,7 @@
  */
 
 import { globalConfig } from './config.js'
-import { GET, HttpClient } from '../infrastructure/http/HttpClient.js'
+import { GET, HttpClient } from '../infrastructure/http/HttpClient.ts'
 
 /**
  * Exported functions that are excluded from index generation.

package/src/services/sanity.js

@@ -24,7 +24,7 @@ import {
 } from '../contentTypeConfig.js'
 import { fetchSimilarItems } from './recommendations.js'
 import { processMetadata } from '../contentMetaData.js'
-import { GET } from '../infrastructure/http/HttpClient.js'
+import { GET } from '../infrastructure/http/HttpClient.ts'
 
 import { globalConfig } from './config.js'
 
@@ -457,7 +457,8 @@ export async function fetchByRailContentIds(
   ids,
   contentType = undefined,
   brand = undefined,
-  includePermissionsAndStatusFilter = false
+  includePermissionsAndStatusFilter = false,
+  filterOptions = {}
 ) {
   if (!ids?.length) {
     return []
@@ -471,7 +472,7 @@ export async function fetchByRailContentIds(
   const fields = await getFieldsForContentTypeWithFilteredChildren(contentType, true)
   const baseFilter = `railcontent_id in [${idsString}]${brandFilter}`
   const finalFilter = includePermissionsAndStatusFilter
-    ? await new FilterBuilder(baseFilter).buildFilter()
+    ? await new FilterBuilder(baseFilter, filterOptions).buildFilter()
     : baseFilter
   const query = `*[
     ${finalFilter}
@@ -509,7 +510,6 @@ export async function fetchByRailContentIds(
 
   // Sort results to match the order of the input IDs
   const sortedResults = results?.sort(sortFuction) ?? null
-
   return sortedResults
 }
 

package/src/services/user/chat.js

@@ -1,4 +1,4 @@
-import { GET } from '../../infrastructure/http/HttpClient.js'
+import { GET } from '../../infrastructure/http/HttpClient.ts'
 
 /**
  * @module UserChat

package/src/services/user/interests.js

@@ -2,7 +2,7 @@
  * @module Interests
  */
 import { globalConfig } from '../config.js'
-import { GET, POST, DELETE } from '../../infrastructure/http/HttpClient.js'
+import { GET, POST, DELETE } from '../../infrastructure/http/HttpClient.ts'
 import './types.js'
 
 const baseUrl = `/api/user-management-system`

package/src/services/user/management.js

@@ -1,7 +1,7 @@
 /**
  * @module UserManagement
  */
-import { GET, POST, PUT, DELETE } from '../../infrastructure/http/HttpClient.js'
+import { GET, POST, PUT, DELETE } from '../../infrastructure/http/HttpClient.ts'
 import { globalConfig } from '../config.js'
 import './types.js'
 

package/src/services/user/notifications.js

@@ -1,7 +1,7 @@
 /**
  * @module UserNotifications
  */
-import { GET, PUT, DELETE } from '../../infrastructure/http/HttpClient.js'
+import { GET, PUT, DELETE } from '../../infrastructure/http/HttpClient.ts'
 import  eventsAPI from '../eventsAPI.js'
 import './types.js'
 import {globalConfig} from "../config";

package/src/services/user/profile.js

@@ -2,7 +2,7 @@
  * @module UserProfile
  */
 import { globalConfig } from '../config.js'
-import { GET, DELETE } from '../../infrastructure/http/HttpClient.js'
+import { GET, DELETE } from '../../infrastructure/http/HttpClient.ts'
 import { calculateLongestStreaks } from '../userActivity.js'
 import './types.js'
 

package/src/services/user/sessions.js

@@ -98,50 +98,42 @@ export async function logout() {
 }
 
 /**
- * @param {string|null} brand - Optional brand parameter (drumeo, pianote, guitareo, singeo)
- * @returns {Promise<{data: string}>} Temporary auth key valid for 5 minutes
+ * @param {number} userId
+ * @param {string} redirectTo
+ * @returns {Promise<string>}
  *
  * @example
- * getAuthKey('drumeo')
- *   .then(response => {
- *     const authKey = response.data
- *     const webViewUrl = `https://app.musora.com/page?user_id=${userId}&auth_key=${authKey}`
- *   })
- *   .catch(error => console.error(error));
+ * const authUrl = await generateAuthSessionUrl(592656, 'https://app.musora.com/drumeo')
  */
-export async function getAuthKey(brand = null) {
+export async function generateAuthSessionUrl(userId, redirectTo) {
   const baseUrl = `${globalConfig.baseUrl}/api/user-management-system`
-  const url = brand ? `${baseUrl}/v1/auth-key?brand=${brand}` : `${baseUrl}/v1/auth-key`
 
-  const response = await fetch(url, {
+  const headers = {
+    'Content-Type': 'application/json',
+  }
+
+  if (globalConfig.isMA) {
+    headers.Authorization = `Bearer ${globalConfig.sessionConfig.authToken}`
+  }
+
+  const response = await fetch(`${baseUrl}/v1/auth-key`, {
     method: 'GET',
-    headers: {
-      Authorization: `Bearer 503154|sArOCAtYT3ejVnCdoZTj8ocEfQbfDWi5GTTtooQ107d93d29`,
-      'Content-Type': 'application/json',
-    },
+    headers,
+    credentials: globalConfig.isMA ? undefined : 'include',
   })
 
   if (!response.ok) {
-    throw new Error(`Failed to get auth key: ${response.status}`)
+    throw new Error(`Failed to generate auth key: ${response.status}`)
   }
 
-  return response.json()
-}
+  const authKeyResponse = await response.json()
+  const authKey = authKeyResponse.data || authKeyResponse.auth_key
 
-export async function loginWithAuthKey(userId, authKey, deviceName, deviceToken, platform) {
-  const baseUrl = `${globalConfig.baseUrl}/api/user-management-system`
-  return fetch(`${baseUrl}/v1/sessions/auth-key`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      Authorization: null,
-    },
-    body: JSON.stringify({
-      user_id: userId,
-      auth_key: authKey,
-      device_name: deviceName,
-      device_token: deviceToken,
-      platform: platform,
-    }),
+  const params = new URLSearchParams({
+    user_id: userId.toString(),
+    auth_key: authKey,
+    redirect_to: redirectTo,
   })
+
+  return `${baseUrl}/v1/sessions/auth-key?${params.toString()}`
 }

package/src/services/user/types.js

@@ -107,6 +107,12 @@
  * @property {User} user
  */
 
+/**
+ * @typedef {Object} AuthKeyResponse
+ * @property {number} user_id
+ * @property {string} auth_key
+ */
+
 /**
  * @typedef {Object} UserPermissions
  *

package/src/services/userActivity.js

@@ -8,7 +8,7 @@ import {
   fetchUserPracticeNotes,
   fetchRecentUserActivities,
 } from './railcontent'
-import { GET, POST, PUT, DELETE } from '../infrastructure/http/HttpClient.js'
+import { GET, POST, PUT, DELETE } from '../infrastructure/http/HttpClient.ts'
 import { DataContext, UserActivityVersionKey } from './dataContext.js'
 import {
   fetchByRailContentId,
@@ -539,14 +539,26 @@ export async function getPracticeNotes(date) {
 export async function getRecentActivity({ page = 1, limit = 5, tabName = null } = {}) {
   const recentActivityData = await fetchRecentUserActivities({ page, limit, tabName })
   const contentIds = recentActivityData.data.map((p) => p.contentId).filter((id) => id !== null)
-  const contents = await addContextToContent(fetchByRailContentIds, contentIds, {
-    addNavigateTo: true,
-    addNextLesson: true,
-  })
+
+  const contents = await addContextToContent(
+    fetchByRailContentIds,
+    contentIds,
+    'progress-tracker',
+    undefined,
+    true,
+    { bypassPermissions: true },
+    {
+      addNavigateTo: true,
+      addNextLesson: true,
+    }
+  )
+
   recentActivityData.data = recentActivityData.data.map((practice) => {
     const content = contents?.find((c) => c.id === practice.contentId) || {}
     return {
       ...practice,
+      thumbnail: content.thumbnail,
+      title: content.title,
       parent_id: content.parent_id || null,
       navigateTo: content.navigateTo,
     }
@@ -796,10 +808,18 @@ export async function calculateLongestStreaks(userId = globalConfig.sessionConfi
 
 async function formatPracticeMeta(practices = []) {
   const contentIds = practices.map((p) => p.content_id).filter((id) => id !== null)
-  const contents = await addContextToContent(fetchByRailContentIds, contentIds, {
-    addNavigateTo: true,
-    addNextLesson: true,
-  })
+  const contents = await addContextToContent(
+    fetchByRailContentIds,
+    contentIds,
+    'progress-tracker',
+    undefined,
+    true,
+    { bypassPermissions: true },
+    {
+      addNavigateTo: true,
+      addNextLesson: true,
+    }
+  )
 
   return practices.map((practice) => {
     const content =
@@ -1111,7 +1131,6 @@ async function processContentItem(content) {
       ctaText = 'Revisit Show'
     }
   }
-  console.log('Progress Timestamp', content.progressTimestamp)
   return {
     id: content.id,
     progressType: 'content',