Update index.js

index.js

@@ -105,151 +105,8 @@ app.get('/proxy', async (req, res) => {
   }
 });
 
-// 1. Root route - redirect ke Spotify login
-app.get('/spotify', (req, res) => {
-  const FRONTEND_URI = getFrontendUri(req);
-  const REDIRECT_URI = `${FRONTEND_URI}/callback`;
-  
-  const scopes = [
-    'user-read-recently-played',
-    'user-read-playback-state',
-    'user-read-private',
-    'user-read-email'
-  ];
-  
-  const queryParams = querystring.stringify({
-    response_type: 'code',
-    client_id: CLIENT_ID,
-    scope: scopes.join(' '),
-    redirect_uri: REDIRECT_URI,
-    show_dialog: false,
-  });
-  
-  res.redirect(`https://accounts.spotify.com/authorize?${queryParams}`);
-});
-
-// 2. Callback route
-app.get('/callback', async (req, res) => {
-  const FRONTEND_URI = getFrontendUri(req);
-  const REDIRECT_URI = `${FRONTEND_URI}/callback`;
-  
-  const { code, error } = req.query;
-
-  if (error) {
-    console.error('Spotify Auth Error:', error);
-    return res.redirect(`${FRONTEND_URI}/error?message=${encodeURIComponent(error)}`);
-  }
-
-  try {
-    // Get tokens
-    const authResponse = await axios.post('https://accounts.spotify.com/api/token', 
-      querystring.stringify({
-        grant_type: 'authorization_code',
-        code,
-        redirect_uri: REDIRECT_URI,
-      }), {
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          'Authorization': 'Basic ' + Buffer.from(`${CLIENT_ID}:${CLIENT_SECRET}`).toString('base64'),
-        },
-      });
-
-    const { access_token, refresh_token, expires_in } = authResponse.data;
-    
-    // Get user data to store in session
-    const userData = await getUserData(access_token);
-    
-    // Store tokens and user data in cookies
-    res.cookie('spotify_access', access_token, {
-      httpOnly: true,
-      secure: process.env.NODE_ENV === 'production',
-      maxAge: expires_in * 1000
-    });
-    
-    res.cookie('spotify_refresh', refresh_token, {
-      httpOnly: true,
-      secure: process.env.NODE_ENV === 'production'
-    });
-    
-    res.cookie('spotify_user', JSON.stringify({
-      id: userData.id,
-      country: userData.country,
-      display_name: userData.display_name
-    }), {
-      secure: process.env.NODE_ENV === 'production'
-    });
-
-    // Redirect to recently played with user ID
-    res.redirect(`${FRONTEND_URI}/api/recently-played/json?user=${userData.id}`);
-  } catch (err) {
-    console.error('Callback Error:', err);
-    res.redirect(`${FRONTEND_URI}/error?message=${encodeURIComponent('Authentication failed')}`);
-  }
-});
-
-// 3. Recently Played JSON endpoint with market from user country
-app.get('/api/recently-played/json', async (req, res) => {
-  const FRONTEND_URI = getFrontendUri(req);
-  const accessToken = req.cookies.spotify_access;
-  const userData = req.cookies.spotify_user ? JSON.parse(req.cookies.spotify_user) : null;
-
-  if (!accessToken || !userData) {
-    return res.redirect('/');
-  }
-
-  try {
-    const limit = parseInt(req.query.limit) || 20;
-    const params = { limit };
-    
-    // Add market parameter from user's country if available
-    if (userData.country) {
-      params.market = userData.country;
-    }
-
-    const response = await axios.get('https://api.spotify.com/v1/me/player/recently-played', {
-      params,
-      headers: { 'Authorization': `Bearer ${accessToken}` },
-    });
-
-    const tracks = response.data.items.map(item => ({
-      played_at: item.played_at,
-      track: {
-        id: item.track.id,
-        name: item.track.name,
-        artists: item.track.artists.map(a => ({ id: a.id, name: a.name })),
-        album: {
-          id: item.track.album.id,
-          name: item.track.album.name,
-          images: item.track.album.images,
-          release_date: item.track.album.release_date
-        },
-        duration_ms: item.track.duration_ms,
-        preview_url: item.track.preview_url
-      }
-    }));
 
-    res.json({
-      status: 'success',
-      user: {
-        id: userData.id,
-        display_name: userData.display_name,
-        country: userData.country
-      },
-      data: tracks,
-      count: tracks.length
-    });
-  } catch (error) {
-    if (error.response?.status === 401) {
-      return res.redirect('/');
-    }
-    res.status(500).json({ 
-      error: 'Failed to fetch recently played tracks',
-      details: error.response?.data || error.message
-    });
-  }
-});
 
-// 4. Current Playback State endpoint
 async function refreshAccessToken(refreshToken) {
   const response = await axios.post('https://accounts.spotify.com/api/token', 
     querystring.stringify({
@@ -264,6 +121,7 @@ async function refreshAccessToken(refreshToken) {
   return response.data;
 }
 
+// 1. Current Playback Endpoint with User ID
 app.get('/api/current-playback', async (req, res) => {
   try {
     const userId = req.query.user;
@@ -373,50 +231,81 @@ app.get('/api/current-playback', async (req, res) => {
   }
 });
 
-// 5. User Profile endpoint
-app.get('/api/user-profile', async (req, res) => {
-  const accessToken = req.cookies.spotify_access;
-  const userData = req.cookies.spotify_user ? JSON.parse(req.cookies.spotify_user) : null;
+// 2. Login Endpoint
+app.get('/spotify', (req, res) => {
+  const FRONTEND_URI = getFrontendUri(req);
+  const REDIRECT_URI = `${FRONTEND_URI}/callback`;
+  
+  const scopes = [
+    'user-read-playback-state',
+    'user-read-currently-playing',
+    'user-read-private',
+    'user-read-email'
+  ];
+  
+  const queryParams = querystring.stringify({
+    response_type: 'code',
+    client_id: CLIENT_ID,
+    scope: scopes.join(' '),
+    redirect_uri: REDIRECT_URI,
+    show_dialog: true,
+  });
+  
+  res.redirect(`https://accounts.spotify.com/authorize?${queryParams}`);
+});
+
+// 3. Callback Endpoint
+app.get('/callback', async (req, res) => {
+  const FRONTEND_URI = getFrontendUri(req);
+  const REDIRECT_URI = `${FRONTEND_URI}/callback`;
+  
+  const { code, error } = req.query;
 
-  if (!accessToken || !userData) {
-    return res.status(401).json({ error: 'Not authenticated' });
+  if (error) {
+    return res.redirect(`${FRONTEND_URI}/error?message=${encodeURIComponent(error)}`);
   }
 
   try {
-    const response = await axios.get('https://api.spotify.com/v1/me', {
-      headers: { 'Authorization': `Bearer ${accessToken}` },
-    });
+    // Get tokens
+    const authResponse = await axios.post('https://accounts.spotify.com/api/token', 
+      querystring.stringify({
+        grant_type: 'authorization_code',
+        code,
+        redirect_uri: REDIRECT_URI,
+      }), {
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          'Authorization': 'Basic ' + Buffer.from(`${CLIENT_ID}:${CLIENT_SECRET}`).toString('base64'),
+        },
+      });
 
-    const profileData = {
-      id: response.data.id,
-      display_name: response.data.display_name,
-      email: response.data.email,
-      country: response.data.country,
-      followers: response.data.followers.total,
-      product: response.data.product,
-      images: response.data.images
+    const { access_token, refresh_token, expires_in } = authResponse.data;
+    
+    // Get user data
+    const userResponse = await axios.get('https://api.spotify.com/v1/me', {
+      headers: { 'Authorization': `Bearer ${access_token}` },
+    });
+    
+    // Store user session
+    const userId = userResponse.data.id;
+    userSessions[userId] = {
+      accessToken: access_token,
+      refreshToken: refresh_token,
+      expiresAt: Date.now() + expires_in * 1000,
+      display_name: userResponse.data.display_name,
+      country: userResponse.data.country,
+      email: userResponse.data.email
     };
 
-    res.json({
-      status: 'success',
-      data: profileData
-    });
-  } catch (error) {
-    if (error.response?.status === 401) {
-      return res.status(401).json({ error: 'Session expired' });
-    }
-    res.status(500).json({ 
-      error: 'Failed to fetch user profile',
-      details: error.response?.data || error.message
-    });
+    // Redirect to current playback with user ID
+    res.redirect(`${FRONTEND_URI}/api/current-playback?user=${userId}`);
+    
+  } catch (err) {
+    console.error('Callback error:', err);
+    res.redirect(`${FRONTEND_URI}/error?message=${encodeURIComponent('Authentication failed')}`);
   }
 });
 
-// Error handler
-app.use((err, req, res, next) => {
-  console.error('Server Error:', err);
-  res.status(500).json({ error: 'Internal server error' });
-});
 
 app.get('/pages', async (req, res) => {
   const targetUrl = req.query.url;