Update server.js

server.js

@@ -8,7 +8,6 @@ const cors = require('cors');
 const app = express();
 const upload = multer({ dest: 'uploads/' });
 
-// Cho phép CORS
 app.use(cors({ origin: '*', credentials: true, allowedHeaders: ['Content-Type', 'Authorization', 'x-refresh-token'] }));
 app.use(express.json());
 
@@ -16,19 +15,15 @@ const GOOGLE_CLIENT_ID = process.env.GOOGLE_CLIENT_ID;
 const GOOGLE_CLIENT_SECRET = process.env.GOOGLE_CLIENT_SECRET;
 const REDIRECT_URI = process.env.REDIRECT_URI;
 
-// Biến lưu token tạm thời (sẽ mất khi server restart)
 let adminRefreshToken = null;
 
 const oauth2Client = new google.auth.OAuth2(GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET, REDIRECT_URI);
 
-// Hàm lấy Access Token (Tự động khôi phục từ Header nếu biến local bị mất)
 async function getAccessToken(req) {
-    // 1. Nếu biến server null, thử lấy từ Header của request
     if (!adminRefreshToken && req && req.headers['x-refresh-token']) {
-        console.log('Server restart detected. Restoring session from client header...');
+        console.log('Restoring session from client header...');
         adminRefreshToken = req.headers['x-refresh-token'];
     }
-
     if (!adminRefreshToken) throw new Error('Chưa đăng nhập Admin (Session expired)');
     
     oauth2Client.setCredentials({ refresh_token: adminRefreshToken });
@@ -36,50 +31,59 @@ async function getAccessToken(req) {
     return credentials.access_token;
 }
 
+// Hàm Tìm hoặc Tạo Folder (Đã khôi phục)
+async function findOrCreateFolder(drive, name, parentId = 'root') {
+    const q = `mimeType='application/vnd.google-apps.folder' and name='${name}' and '${parentId}' in parents and trashed=false`;
+    const res = await drive.files.list({ q, fields: 'files(id, name)' });
+    
+    if (res.data.files.length > 0) return res.data.files[0];
+
+    const folder = await drive.files.create({
+        resource: { name, mimeType: 'application/vnd.google-apps.folder', parents: [parentId] },
+        fields: 'id, name'
+    });
+    return folder.data;
+}
+
 // 1. Login
 app.post('/api/oauth/token', async (req, res) => {
     try {
         const { code, redirect_uri } = req.body;
         const client = new google.auth.OAuth2(GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET, redirect_uri || REDIRECT_URI);
         const { tokens } = await client.getToken(code);
-        if (tokens.refresh_token) {
-            adminRefreshToken = tokens.refresh_token;
-        }
+        if (tokens.refresh_token) adminRefreshToken = tokens.refresh_token;
         res.json(tokens);
     } catch (error) {
         res.status(500).json({ error: error.message });
     }
 });
 
-// 2. Upload
+// 2. Upload (Đã sửa logic tạo thư mục lồng nhau)
 app.post('/api/upload', upload.array('files'), async (req, res) => {
     try {
-        // Truyền req vào để hàm getAccessToken tự tìm token trong header
-        await getAccessToken(req);
-        
+        await getAccessToken(req); // Khôi phục session
         const drive = google.drive({ version: 'v3', auth: oauth2Client });
-        const { docName } = req.body;
         
-        // Tạo Folder
-        const fileMetadata = {
-            name: `${docName} - ${Date.now()}`,
-            mimeType: 'application/vnd.google-apps.folder'
-        };
-        const folder = await drive.files.create({ resource: fileMetadata, fields: 'id' });
-        const folderId = folder.data.id;
+        const { docName, type, month } = req.body;
+        
+        // Tạo cấu trúc thư mục
+        const rootFolder = await findOrCreateFolder(drive, 'QLVB-DATA');
+        const typeFolder = await findOrCreateFolder(drive, type === 'incoming' ? 'VanBanDen' : 'VanBanDi', rootFolder.id);
+        const monthFolder = await findOrCreateFolder(drive, month || 'Khac', typeFolder.id);
+        const docFolder = await findOrCreateFolder(drive, `${docName} - ${Date.now()}`, monthFolder.id);
 
         const uploadedFiles = [];
         for (const file of req.files) {
             const media = { mimeType: file.mimetype, body: fs.createReadStream(file.path) };
             const driveFile = await drive.files.create({
-                resource: { name: file.originalname, parents: [folderId] },
+                resource: { name: file.originalname, parents: [docFolder.id] },
                 media: media,
                 fields: 'id, name, webViewLink, webContentLink'
             });
             uploadedFiles.push(driveFile.data);
             fs.unlinkSync(file.path);
         }
-        res.json({ folderId, files: uploadedFiles });
+        res.json({ folderId: docFolder.id, files: uploadedFiles });
     } catch (error) {
         console.error(error);
         res.status(500).json({ error: error.message });
@@ -89,8 +93,7 @@ app.post('/api/upload', upload.array('files'), async (req, res) => {
 // 3. Delete
 app.delete('/api/delete/:fileId', async (req, res) => {
     try {
-        await getAccessToken(req); // Truyền req để khôi phục token
-        
+        await getAccessToken(req);
         const drive = google.drive({ version: 'v3', auth: oauth2Client });
         await drive.files.delete({ fileId: req.params.fileId });
         res.json({ success: true });