musora-content-services 2.1.0 → 2.1.1

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.1.1](https://github.com/railroadmedia/musora-content-services/compare/v2.1.0...v2.1.1) (2025-03-26)
+
 ## [2.1.0](https://github.com/railroadmedia/musora-content-services/compare/v2.0.8...v2.1.0) (2025-03-26)
 
 

package/package.json

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

package/src/lib/httpHelper.js

@@ -0,0 +1,46 @@
+import { globalConfig } from '../services/config.js'
+
+export async function fetchJSONHandler(url, token, baseUrl, method = 'get', dataVersion = null, body = null) {
+  let headers = {
+    'Content-Type': 'application/json',
+    Accept: 'application/json',
+    'X-CSRF-TOKEN': token,
+  }
+
+  if (!globalConfig.isMA) {
+    const params = new URLSearchParams(window.location.search)
+    if (params.get('testNow')) {
+      headers['testNow'] = params.get('testNow')
+    }
+    if (params.get('timezone')) {
+      headers['M-Client-Timezone'] = params.get('timezone')
+    }
+  }
+
+  if (globalConfig.localTimezoneString) headers['M-Client-Timezone'] = globalConfig.localTimezoneString
+  if (dataVersion) headers['Data-Version'] = dataVersion
+  const options = {
+    method,
+    headers,
+  }
+  if (body) options.body = JSON.stringify(body)
+  if (token) options.headers['Authorization'] = `Bearer ${token}`
+  if (baseUrl && url.startsWith('/')) url = baseUrl + url
+  try {
+    const response = await fetch(url, options)
+    if (response.ok) {
+      const contentType = response.headers.get("content-type");
+      if (contentType && contentType.indexOf("application/json") !== -1) {
+        return await response.json()
+      } else {
+        return await response.text()
+      }
+    } else {
+      console.error(`Fetch error: ${method} ${url} ${response.status} ${response.statusText}`)
+      console.log(response)
+    }
+  } catch (error) {
+    console.error('Fetch error:', error)
+  }
+  return null
+}

package/src/services/railcontent.js

@@ -4,6 +4,7 @@
 import { contentStatusCompleted } from './contentProgress.js'
 
 import { globalConfig } from './config.js'
+import { fetchJSONHandler } from '../lib/httpHelper.js'
 
 /**
  * Exported functions that are excluded from index generation.
@@ -294,54 +295,6 @@ async function deleteDataHandler(url, data) {
   return fetchHandler(url, 'delete')
 }
 
-// TODO: this should be extracted to a utility file
-export async function fetchHandler(url, method = 'get', dataVersion = null, body = null) {
-  let headers = {
-    'Content-Type': 'application/json',
-    Accept: 'application/json',
-    'X-CSRF-TOKEN': globalConfig.railcontentConfig.token,
-  }
-
-  if (!globalConfig.isMA) {
-    const params = new URLSearchParams(window.location.search)
-    if (params.get('testNow')) {
-      headers['testNow'] = params.get('testNow')
-    }
-    if (params.get('timezone')) {
-      headers['M-Client-Timezone'] = params.get('timezone')
-    }
-  }
-
-  if (globalConfig.localTimezoneString) {
-    headers['M-Client-Timezone'] = globalConfig.localTimezoneString
-  }
-
-  if (globalConfig.railcontentConfig.authToken) {
-    headers['Authorization'] = `Bearer ${globalConfig.railcontentConfig.authToken}`
-  }
-
-  if (dataVersion) headers['Data-Version'] = dataVersion
-  const options = {
-    method,
-    headers,
-  }
-  if (body) {
-    options.body = JSON.stringify(body)
-  }
-  try {
-    const response = await fetchAbsolute(url, options)
-    if (response.ok) {
-      return await response.json()
-    } else {
-      console.error(`Fetch error: ${method} ${url} ${response.status} ${response.statusText}`)
-      console.log(response)
-    }
-  } catch (error) {
-    console.error('Fetch error:', error)
-  }
-  return null
-}
-
 export async function fetchUserLikes(currentVersion) {
   let url = `/api/content/v1/user/likes`
   return fetchDataHandler(url, currentVersion)
@@ -1223,15 +1176,12 @@ export async function editComment(commentId, comment) {
   return await patchDataHandler(url, data)
 }
 
-function fetchAbsolute(url, params) {
-  if (globalConfig.railcontentConfig.authToken) {
-    params.headers['Authorization'] = `Bearer ${globalConfig.railcontentConfig.authToken}`
-  }
-
-  if (globalConfig.railcontentConfig.baseUrl) {
-    if (url.startsWith('/')) {
-      return fetch(globalConfig.railcontentConfig.baseUrl + url, params)
-    }
-  }
-  return fetch(url, params)
+export async function fetchHandler(url, method = 'get', dataVersion = null, body = null) {
+  return fetchJSONHandler(
+    url,
+    globalConfig.railcontentConfig.token,
+    globalConfig.railcontentConfig.baseUrl,
+    method,
+    dataVersion,
+    body)
 }

package/src/services/recommendations.js

@@ -3,6 +3,7 @@
  */
 
 import { globalConfig } from './config.js'
+import { fetchJSONHandler} from '../lib/httpHelper.js'
 
 /**
  * Exported functions that are excluded from index generation.
@@ -129,44 +130,12 @@ export async function recommendations(brand, {
 }
 
 async function fetchHandler(url, method = 'get', body = null) {
-
-  let headers = {
-    'Content-Type': 'application/json',
-    Accept: 'application/json',
-    'X-CSRF-TOKEN': globalConfig.recommendationsConfig.token,
-  }
-
-  const options = {
+  return fetchJSONHandler(
+    url,
+    globalConfig.recommendationsConfig.token,
+    globalConfig.recommendationsConfig.baseUrl,
     method,
-    headers,
-  }
-
-  if (body) {
-    options.body = JSON.stringify(body)
-  }
-  try {
-    const response = await fetchAbsolute(url, options)
-    if (response.ok) {
-      return await response.json()
-    } else {
-      console.error(`Fetch error: ${method} ${url} ${response.status} ${response.statusText}`)
-      console.log(response)
-    }
-  } catch (error) {
-    console.error('Fetch error:', error)
-  }
-  return null
-}
-
-
-function fetchAbsolute(url, params) {
-  if (globalConfig.recommendationsConfig.token) {
-    params.headers['Authorization'] = `Bearer ${globalConfig.recommendationsConfig.token}`
-  }
-  if (globalConfig.recommendationsConfig.baseUrl) {
-    if (url.startsWith('/')) {
-      return fetch(globalConfig.recommendationsConfig.baseUrl + url, params)
-    }
-  }
-  return fetch(url, params)
+    null,
+    body
+    )
 }

package/src/services/user/management.js

@@ -0,0 +1,35 @@
+/**
+ * @module User-Management
+ */
+import { fetchHandler } from '../railcontent.js'
+
+
+
+/**
+ * Exported functions that are excluded from index generation.
+ *
+ * @type {string[]}
+ */
+const excludeFromGeneratedIndex = []
+
+const baseUrl = `/api/user-management-system`
+
+/**
+ * Block the provided user
+ * @param userId
+ * @returns {Promise<any|string|null>}
+ */
+export async function blockUser(userId) {
+  const url = `${baseUrl}/v1/block/${userId}`
+  return fetchHandler(url, 'post')
+}
+
+/**
+ * Unblock the provided user. Returns a 422 if the user wasn't blocked
+ * @param userId
+ * @returns {Promise<any|string|null>}
+ */
+export async function unblockUser(userId) {
+  const url = `${baseUrl}/v1/unblock/${userId}`
+  return fetchHandler(url, 'post')
+}