musora-content-services 2.107.1 → 2.107.3

package/src/services/user/onboarding.ts

@@ -1,8 +1,7 @@
 /**
  * @module Onboarding
  */
-import { HttpClient } from '../../infrastructure/http/HttpClient'
-import { Brands } from '../../lib/brands'
+import { GET, POST, PUT } from '../../infrastructure/http/HttpClient'
 import { globalConfig } from '../config.js'
 
 export interface OnboardingSteps {
@@ -55,8 +54,7 @@ export async function startOnboarding({
   steps = {},
   marketingOptIn = false,
 }: StartOnboardingParams): Promise<Onboarding> {
-  const httpClient = new HttpClient(globalConfig.baseUrl)
-  return httpClient.post<Onboarding>(`/api/user-management-system/v1/onboardings`, {
+  return POST(`/api/user-management-system/v1/onboardings`, {
     email,
     brand,
     flow,
@@ -91,8 +89,7 @@ export async function updateOnboarding({
   is_completed = false,
   marketingOptIn = false,
 }: UpdateOnboardingParams): Promise<Onboarding> {
-  const httpClient = new HttpClient(globalConfig.baseUrl)
-  return httpClient.put<Onboarding>(`/api/user-management-system/v1/onboardings/${id}`, {
+  return PUT(`/api/user-management-system/v1/onboardings/${id}`, {
     email,
     brand,
     flow,
@@ -111,8 +108,7 @@ export async function updateOnboarding({
  * @throws {HttpError} - If the HTTP request fails.
  */
 export async function userOnboardingForBrand(brand: string): Promise<Onboarding> {
-  const httpClient = new HttpClient(globalConfig.baseUrl)
-  return httpClient.get<Onboarding>(
+  return GET(
     `/api/user-management-system/v1/users/${globalConfig.sessionConfig.userId}/onboardings/brand/${encodeURIComponent(brand)}`
   )
 }
@@ -132,126 +128,20 @@ export interface OnboardingRecommendedContent {
   }
 }
 
-const recommendedContentCache: { [brand: string]: OnboardingRecommendedContent } = {
-  drumeo: {
-    id: 415737,
-    title: 'The Power Of Your Left Hand (Beginner)',
-    difficulty: 'Beginner',
-    lesson_count: 12,
-    skill_count: 1,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'Start your drumming journey with essential techniques and rhythms to get you playing quickly.',
-    video: {
-      external_id: '1002267396',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/250467786.m3u8?s=52dc97fc96fe903d80bf71bc1b1709cc444db407&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  },
-  pianote: {
-    id: 412405,
-    title: 'Getting Started On The Piano',
-    difficulty: 'Beginner',
-    lesson_count: 4,
-    skill_count: 3,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'The goal of this course is to introduce you to the keys, and get you playing a song as fast as possible. ',
-    video: {
-      external_id: '1001267395',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/1001267395.m3u8?s=8f8d8a8a762f688058e6e6fd6704c402baf1b797&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  },
-  guitareo: {
-    id: 191346,
-    title: 'Understanding Your Instrument',
-    difficulty: 'Beginner',
-    lesson_count: 6,
-    skill_count: 5,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'New to the acoustic guitar? Then this Course is for you! Learn everything you need to get started on the acoustic guitar, and start playing music as fast as possible!',
-    video: {
-      external_id: '1003267397',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/166972298.m3u8?s=a93bfe96a4ce9ac5a4eba3441838847ef2eafc9b&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  },
-  singeo: {
-    id: 415737,
-    title: 'Sound Like A Star — Mastering Iconic Pop Voices',
-    difficulty: 'Beginner',
-    lesson_count: 5,
-    skill_count: 4,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'Welcome to the Singing Starter Kit! This course will teach you everything you need to know to sound better when you sing! You will learn how your unique voice works so that you can develop vocal strength, accurate pitch, and find confidence singing your favorite songs. You can sing, and the Singing Starter Kit is the perfect way to start your singing journey.',
-    video: {
-      external_id: '1004267398',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/1040159819.m3u8?s=f238ad1a650fb30a49c36d61996c982f06ffffb1&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  },
-  playbass: {
-    id: 191346,
-    title: 'Understanding Your Instrument',
-    difficulty: 'Beginner',
-    lesson_count: 6,
-    skill_count: 5,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'New to the acoustic guitar? Then this Course is for you! Learn everything you need to get started on the acoustic guitar, and start playing music as fast as possible!',
-    video: {
-      external_id: '1003267397',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/166972298.m3u8?s=a93bfe96a4ce9ac5a4eba3441838847ef2eafc9b&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  },
+export interface OnboardingRecommendationResponse {
+  recommendation: OnboardingRecommendedContent
+  user_onboarding: Onboarding
 }
 
 /**
  * Fetches recommended content for onboarding based on the specified brand.
  *
- * @param {string} email - The user's email address.
- * @param {Brands} brand - The brand identifier.
- * @returns {Promise<OnboardingRecommendedContent>} - A promise that resolves with the recommended content.
+ * @param {number} onboardingId - The ID of the onboarding process.
+ * @returns {Promise<OnboardingRecommendationResponse>} - A promise that resolves with the recommended content.
  * @throws {HttpError} - If the HTTP request fails.
  */
 export async function getOnboardingRecommendedContent(
-  email: string,
-  brand: Brands
-): Promise<OnboardingRecommendedContent> {
-  // TODO: Replace with real API call when available
-  if (recommendedContentCache[brand]) {
-    return recommendedContentCache[brand]
-  }
-
-  return {
-    id: 412405,
-    title: 'Getting Started On The Piano',
-    difficulty: 'Beginner',
-    lesson_count: 4,
-    skill_count: 3,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'The goal of this course is to introduce you to the keys, and get you playing a song as fast as possible. ',
-    video: {
-      external_id: '1001267395',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/1001267395.m3u8?s=8f8d8a8a762f688058e6e6fd6704c402baf1b797&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  }
+  onboardingId: number
+): Promise<OnboardingRecommendationResponse> {
+  return POST(`/api/user-management-system/v1/onboardings/${onboardingId}/recommendation`, {})
 }

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/.claude/settings.local.json

@@ -1,16 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Read(//app/musora-platform-backend/**)",
-      "Read(//app/musora-platform-frontend/**)",
-      "Bash(find:*)",
-      "Bash(sed:*)",
-      "Read(//app/**)",
-      "Bash(cat:*)",
-      "Bash(docker exec:*)",
-      "Bash(npm config:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

package/.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

package/check_content.js

@@ -1,30 +0,0 @@
-const { initializeService } = require('./src/services/config.js');
-const { fetchByRailContentIds } = require('./src/services/sanity.js');
-require('dotenv/config');
-
-async function checkContent() {
-  initializeService({
-    sanityConfig: {
-      token: process.env.SANITY_TOKEN,
-      projectId: process.env.SANITY_PROJECT_ID,
-      dataset: process.env.SANITY_DATASET,
-      version: process.env.SANITY_VERSION || '2021-06-07',
-    },
-    railcontentConfig: {
-      token: process.env.RAILCONTENT_TOKEN,
-      userId: process.env.RAILCONTENT_USER_ID,
-      baseUrl: process.env.RAILCONTENT_BASE_URL,
-      authToken: process.env.RAILCONTENT_AUTH_TOKEN,
-    },
-    baseUrl: process.env.RAILCONTENT_BASE_URL,
-    localStorage: null,
-    isMA: false,
-  });
-
-  console.log('Checking railcontent_id: 421814');
-  const contents = await fetchByRailContentIds([421814]);
-  console.log('Results:', JSON.stringify(contents, null, 2));
-  console.log('Found:', contents.length, 'items');
-}
-
-checkContent().catch(console.error);

package/check_content.mjs

@@ -1,32 +0,0 @@
-import { initializeService } from './src/services/config.js';
-import { fetchByRailContentIds } from './src/services/sanity.js';
-import dotenv from 'dotenv';
-
-dotenv.config();
-
-async function checkContent() {
-  initializeService({
-    sanityConfig: {
-      token: process.env.SANITY_TOKEN,
-      projectId: process.env.SANITY_PROJECT_ID,
-      dataset: process.env.SANITY_DATASET,
-      version: process.env.SANITY_VERSION || '2021-06-07',
-    },
-    railcontentConfig: {
-      token: process.env.RAILCONTENT_TOKEN,
-      userId: process.env.RAILCONTENT_USER_ID,
-      baseUrl: process.env.RAILCONTENT_BASE_URL,
-      authToken: process.env.RAILCONTENT_AUTH_TOKEN,
-    },
-    baseUrl: process.env.RAILCONTENT_BASE_URL,
-    localStorage: null,
-    isMA: false,
-  });
-
-  console.log('Checking railcontent_id: 421814');
-  const contents = await fetchByRailContentIds([421814]);
-  console.log('Results:', JSON.stringify(contents, null, 2));
-  console.log('Found:', contents.length, 'items');
-}
-
-checkContent().catch(console.error);

package/test/reporting.test.js

@@ -1,132 +0,0 @@
-/**
- * Tests for Reporting Service
- *
- * Note: These tests use mocked HTTP calls. For integration tests,
- * ensure the backend API is running at the configured baseUrl.
- */
-
-import { initializeTestService } from './initializeTests.js'
-import {
-  reportContent,
-  reportForumPost,
-  submitReport
-} from '../src/services/reporting/reporting.ts'
-
-// Mock HttpClient to avoid actual API calls in tests
-jest.mock('../src/infrastructure/http/HttpClient', () => {
-  return {
-    HttpClient: jest.fn().mockImplementation(() => ({
-      post: jest.fn().mockResolvedValue({
-        report_id: 12345,
-        message: 'Report submitted successfully',
-        is_duplicate: false
-      })
-    }))
-  }
-})
-
-describe('Reporting Service', () => {
-  beforeEach(() => {
-    initializeTestService()
-  })
-
-  describe('reportContent', () => {
-    test('should submit a content report with video_not_working category', async () => {
-      const result = await reportContent({
-        contentId: 123,
-        category: 'video_not_working',
-        description: 'Video freezes at 2:30'
-      })
-
-      expect(result).toBeDefined()
-      expect(result.report_id).toBe(12345)
-      expect(result.message).toBe('Report submitted successfully')
-      expect(result.is_duplicate).toBe(false)
-    })
-
-    test('should submit a content report without description', async () => {
-      const result = await reportContent({
-        contentId: 456,
-        category: 'incorrect_content'
-      })
-
-      expect(result).toBeDefined()
-      expect(result.report_id).toBeDefined()
-    })
-
-    test('should submit a content report with other category and description', async () => {
-      const result = await reportContent({
-        contentId: 789,
-        category: 'other',
-        description: 'Audio quality is very poor'
-      })
-
-      expect(result).toBeDefined()
-      expect(result.report_id).toBeDefined()
-      expect(result.message).toBeDefined()
-    })
-  })
-
-  describe('reportForumPost', () => {
-    test('should submit a forum post report with required brand', async () => {
-      const result = await reportForumPost({
-        postId: 555,
-        brand: 'drumeo',
-        category: 'spam'
-      })
-
-      expect(result).toBeDefined()
-      expect(result.report_id).toBeDefined()
-    })
-
-    test('should submit a forum post report with description', async () => {
-      const result = await reportForumPost({
-        postId: 666,
-        brand: 'pianote',
-        category: 'harassment',
-        description: 'User is harassing other members'
-      })
-
-      expect(result).toBeDefined()
-      expect(result.report_id).toBeDefined()
-      expect(result.message).toBeDefined()
-    })
-  })
-
-  describe('submitReport', () => {
-    test('should submit a generic report for content', async () => {
-      const result = await submitReport({
-        reportableType: 'content',
-        reportableId: 999,
-        category: 'technical_issue',
-        description: 'Page not loading'
-      })
-
-      expect(result).toBeDefined()
-      expect(result.report_id).toBeDefined()
-    })
-
-    test('should submit a generic report for playlist', async () => {
-      const result = await submitReport({
-        reportableType: 'playlist',
-        reportableId: 777,
-        category: 'incorrect_content'
-      })
-
-      expect(result).toBeDefined()
-      expect(result.report_id).toBeDefined()
-    })
-
-    test('should submit a generic report for comment', async () => {
-      const result = await submitReport({
-        reportableType: 'comment',
-        reportableId: 888,
-        category: 'inappropriate',
-        description: 'Comment contains offensive language'
-      })
-
-      expect(result).toBeDefined()
-      expect(result.report_id).toBeDefined()
-    })
-  })
-})