mbkbucket 4.0.0 → 4.1.0

package/lib/src/controllers/dashboard.controller.js

@@ -1,69 +1,69 @@
-import fs from "fs";
-import path from "path";
-import { resolveStorageName, getAvailableStorageNames, getStorageProvider, getStorageConfig } from "../services/storage.service.js";
-import { storageManager } from "../core/storage/storage-manager.js";
-import { renderPage, mbkautheVar } from "mbkauthe";
-import { commonHandlebarsHelpers } from "../utils/helpers.js";
-import { mbkbucketVar } from "../config/index.js";
-
-/**
- * Render the main storage/bucket dashboard page.
- */
-export function renderBucketDashboard(req, res) {
-  const allBuckets = getAvailableStorageNames();
-  const configuredDefaultBucket = mbkautheVar?.bucket;
-  const isPortal = mbkautheVar?.APP_NAME === "portal";
-  const bucketfilePath = isPortal ? "bucketportal.hbs" : "bucket.hbs";
-
-  const mainLayoutPath = path.resolve(process.cwd(), "views", "layouts", "main");
-  const hasMainLayout = fs.existsSync(`${mainLayoutPath}.hbs`) || fs.existsSync(mainLayoutPath);
-  const portalLayout = (isPortal && hasMainLayout) && mainLayoutPath;
-
-  let selectedBucket;
-  let error = req.query.error;
-  let providerType = 's3';
-  let providerCapabilities = {};
-
-  try {
-    selectedBucket = resolveStorageName(req.query.bucket);
-    const provider = getStorageProvider(selectedBucket);
-    providerType = provider.type;
-    providerCapabilities = provider.capabilities;
-  } catch (err) {
-    selectedBucket = mbkautheVar?.bucket;
-    error ||= err.message;
-  }
-
-  const bucketOptions = allBuckets.map(name => {
-    let type = 's3';
-    try {
-      const cfg = getStorageConfig(name);
-      type = storageManager.inferProviderType(cfg);
-    } catch {}
-    return {
-      name,
-      type,
-      isSelected: name === selectedBucket,
-      isDefault: name === configuredDefaultBucket
-    };
-  });
-
-  const publicViewEnabled = Boolean(mbkbucketVar?.publiView_enabled);
-
-  renderPage(req, res, bucketfilePath, Boolean(portalLayout), {
-    page: "Admin Bucket",
-    helpers: commonHandlebarsHelpers,
-    layout: portalLayout || false,
-    bucketvar: selectedBucket,
-    selectedBucket,
-    bucketOptions,
-    providerType,
-    providerCapabilities,
-    APP_NAME: mbkautheVar?.APP_NAME,
-    publicViewEnabled,
-    publiViewEnabled: publicViewEnabled,
-    message: req.query.message,
-    error,
-    availableBuckets: allBuckets
-  });
-}
+import fs from "fs";
+import path from "path";
+import { resolveStorageName, getAvailableStorageNames, getStorageProvider, getStorageConfig } from "../services/storage.service.js";
+import { storageManager } from "../core/storage/storage-manager.js";
+import { renderPage, mbkautheVar } from "mbkauthe";
+import { commonHandlebarsHelpers } from "../utils/helpers.js";
+import { mbkbucketVar } from "../config/index.js";
+
+/**
+ * Render the main storage/bucket dashboard page.
+ */
+export function renderBucketDashboard(req, res) {
+  const allBuckets = getAvailableStorageNames();
+  const configuredDefaultBucket = mbkautheVar?.bucket;
+  const isPortal = mbkautheVar?.APP_NAME === "portal";
+  const bucketfilePath = isPortal ? "bucketportal.hbs" : "bucket.hbs";
+
+  const mainLayoutPath = path.resolve(process.cwd(), "views", "layouts", "main");
+  const hasMainLayout = fs.existsSync(`${mainLayoutPath}.hbs`) || fs.existsSync(mainLayoutPath);
+  const portalLayout = (isPortal && hasMainLayout) && mainLayoutPath;
+
+  let selectedBucket;
+  let error = req.query.error;
+  let providerType = 's3';
+  let providerCapabilities = {};
+
+  try {
+    selectedBucket = resolveStorageName(req.query.bucket);
+    const provider = getStorageProvider(selectedBucket);
+    providerType = provider.type;
+    providerCapabilities = provider.capabilities;
+  } catch (err) {
+    selectedBucket = mbkautheVar?.bucket;
+    error ||= err.message;
+  }
+
+  const bucketOptions = allBuckets.map(name => {
+    let type = 's3';
+    try {
+      const cfg = getStorageConfig(name);
+      type = storageManager.inferProviderType(cfg);
+    } catch {}
+    return {
+      name,
+      type,
+      isSelected: name === selectedBucket,
+      isDefault: name === configuredDefaultBucket
+    };
+  });
+
+  const publicViewEnabled = Boolean(mbkbucketVar?.publiView_enabled);
+
+  renderPage(req, res, bucketfilePath, Boolean(portalLayout), {
+    page: "Admin Bucket",
+    helpers: commonHandlebarsHelpers,
+    layout: portalLayout || false,
+    bucketvar: selectedBucket,
+    selectedBucket,
+    bucketOptions,
+    providerType,
+    providerCapabilities,
+    APP_NAME: mbkautheVar?.APP_NAME,
+    publicViewEnabled,
+    publiViewEnabled: publicViewEnabled,
+    message: req.query.message,
+    error,
+    availableBuckets: allBuckets
+  });
+}

package/lib/src/controllers/info.controller.js

@@ -3,7 +3,7 @@ import { packageJson, getLatestVersion, appVersion, mbkbucketVar } from "../conf
 import { getAvailableBucketNames, getStorageProvider } from "../services/storage.service.js";
 import { storageManager } from "../core/storage/storage-manager.js";
 
-async function getInfoData() {
+async function getInfoData(requestedBucket) {
   let latestVersion = 'unknown';
   try {
     latestVersion = (await getLatestVersion()) || 'unknown';
@@ -12,16 +12,21 @@ async function getInfoData() {
   }
 
   const buckets = getAvailableBucketNames();
-  const defaultBucket = storageManager.getDefaultConnectionName() || (buckets[0] ?? '');
+  let defaultBucket = requestedBucket;
+  if (!defaultBucket || !buckets.includes(defaultBucket)) {
+    defaultBucket = storageManager.getDefaultConnectionName() || (buckets[0] ?? '');
+  }
+
   let providerType = 'S3';
+  let capabilities = {};
   if (defaultBucket) {
     try {
       const provider = getStorageProvider(defaultBucket);
       providerType = (provider?.type || 's3').toUpperCase();
+      capabilities = provider?.capabilities?.toJSON ? provider.capabilities.toJSON() : (provider?.capabilities || {});
     } catch {}
   }
 
-  // Safe subset only - strictly prevent leaking passwords, DB connection strings, OAuth secrets, or storage credentials
   const safeMbkautheVar = {
     APP_NAME: mbkautheVar?.APP_NAME || mbkautheVar?.app_name || "mbkbucket",
   };
@@ -41,24 +46,19 @@ async function getInfoData() {
     mbkbucketVar: safeMbkbucketVar,
     defaultBucket,
     configuredBucketsCount: buckets.length,
-    providerType
+    providerType,
+    capabilities
   };
 }
 
-/**
- * Render the mbkbucket info page (Handlebars).
- */
 export async function infoPage(req, res) {
   renderPage(req, res, "mbkbucket_info.hbs", false, {
     pageTitle: "MBKBucket Information",
     ogUrl: "/mbkbucket/info",
-    ...(await getInfoData())
+    ...(await getInfoData(req.query?.bucket))
   });
 }
 
-/**
- * Return bucket info as JSON.
- */
-export async function infoJson(_req, res) {
-  res.json(await getInfoData());
+export async function infoJson(req, res) {
+  res.json(await getInfoData(req.query?.bucket));
 }