mbkbucket 4.0.0 → 4.0.1

package/lib/src/config/validation.js

@@ -1,86 +1,86 @@
-const TRUE_VALUES = new Set(['true', 't', '1', 'yes', 'y', 'on']);
-const FALSE_VALUES = new Set(['false', 'f', '0', 'no', 'n', 'off']);
-const REQUIRED_S3_FIELDS = ['BUCKET_NAME', 'ACCESS_KEY_ID', 'SECRET_ACCESS_KEY', 'ENDPOINT'];
-
-export function normalizeBooleanLike(value) {
-  if (typeof value === 'boolean') return value;
-  if (typeof value === 'string') {
-    const norm = value.trim().toLowerCase();
-    if (TRUE_VALUES.has(norm)) return true;
-    if (FALSE_VALUES.has(norm)) return false;
-  }
-  return value;
-}
-
-export function parseAndValidateMbkbucketVar(rawValue) {
-  let parsed;
-  try {
-    parsed = rawValue ? JSON.parse(rawValue) : {};
-  } catch {
-    throw new Error('Invalid JSON in process.env.mbkbucketVar');
-  }
-
-  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-    throw new Error('mbkbucketVar must be a valid object');
-  }
-
-  const defaults = { p_view_inline: true, publiView_enabled: false };
-  for (const [key, defaultVal] of Object.entries(defaults)) {
-    const val = parsed[key];
-    if (val === undefined || (typeof val === 'string' && val.trim() === '')) {
-      parsed[key] = defaultVal;
-    }
-  }
-
-  parsed.p_view_inline = normalizeBooleanLike(parsed.p_view_inline);
-  parsed.publiView_enabled = normalizeBooleanLike(parsed.publiView_enabled);
-
-  const errors = [];
-  if (typeof parsed.p_view_inline !== 'boolean') errors.push('mbkbucketVar.p_view_inline must be a boolean if provided');
-  if (typeof parsed.publiView_enabled !== 'boolean') errors.push('mbkbucketVar.publiView_enabled must be a boolean if provided');
-  if (errors.length) throw new Error(errors.join(' | '));
-
-  return parsed;
-}
-
-export function parseAndValidateBucketConnection(rawValue) {
-  if (!rawValue) return null;
-
-  let parsed;
-  try {
-    parsed = JSON.parse(rawValue);
-  } catch {
-    throw new Error('BucketConnection is not valid JSON');
-  }
-
-  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed) || !Object.keys(parsed).length) {
-    throw new Error('BucketConnection must be a non-empty object');
-  }
-
-  for (const [bucketName, config] of Object.entries(parsed)) {
-    if (!config || typeof config !== 'object' || Array.isArray(config)) {
-      throw new Error(`Bucket '${bucketName}' configuration must be an object, not a string. Remove quotes around the inner JSON object.`);
-    }
-
-    const providerType = String(config.type || config.provider || '').toLowerCase();
-
-    if (providerType === 'gdrive' || providerType === 'google-drive' || providerType === 'googledrive') {
-      const hasOAuth = Boolean(config.client_id && config.client_secret && (config.refresh_token || config.access_token || config.code));
-      const hasServiceAccount = Boolean((config.client_email || config.service_account_email) && (config.private_key || config.service_account_key));
-      const hasAccessTokenOnly = Boolean(config.access_token);
-      const hasServiceAccountKeyObj = Boolean(config.service_account && typeof config.service_account === 'object');
-
-      if (!hasOAuth && !hasServiceAccount && !hasAccessTokenOnly && !hasServiceAccountKeyObj) {
-        throw new Error(`Google Drive connection '${bucketName}' requires OAuth credentials (client_id, client_secret, refresh_token) or Service Account credentials (client_email, private_key).`);
-      }
-    } else {
-      // Default is S3-compatible provider
-      const missingFields = REQUIRED_S3_FIELDS.filter(field => !config[field]);
-      if (missingFields.length) {
-        throw new Error(`Bucket '${bucketName}' is missing required fields: ${missingFields.join(', ')}`);
-      }
-    }
-  }
-
-  return parsed;
-}
+const TRUE_VALUES = new Set(['true', 't', '1', 'yes', 'y', 'on']);
+const FALSE_VALUES = new Set(['false', 'f', '0', 'no', 'n', 'off']);
+const REQUIRED_S3_FIELDS = ['BUCKET_NAME', 'ACCESS_KEY_ID', 'SECRET_ACCESS_KEY', 'ENDPOINT'];
+
+export function normalizeBooleanLike(value) {
+  if (typeof value === 'boolean') return value;
+  if (typeof value === 'string') {
+    const norm = value.trim().toLowerCase();
+    if (TRUE_VALUES.has(norm)) return true;
+    if (FALSE_VALUES.has(norm)) return false;
+  }
+  return value;
+}
+
+export function parseAndValidateMbkbucketVar(rawValue) {
+  let parsed;
+  try {
+    parsed = rawValue ? JSON.parse(rawValue) : {};
+  } catch {
+    throw new Error('Invalid JSON in process.env.mbkbucketVar');
+  }
+
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    throw new Error('mbkbucketVar must be a valid object');
+  }
+
+  const defaults = { p_view_inline: true, publiView_enabled: false };
+  for (const [key, defaultVal] of Object.entries(defaults)) {
+    const val = parsed[key];
+    if (val === undefined || (typeof val === 'string' && val.trim() === '')) {
+      parsed[key] = defaultVal;
+    }
+  }
+
+  parsed.p_view_inline = normalizeBooleanLike(parsed.p_view_inline);
+  parsed.publiView_enabled = normalizeBooleanLike(parsed.publiView_enabled);
+
+  const errors = [];
+  if (typeof parsed.p_view_inline !== 'boolean') errors.push('mbkbucketVar.p_view_inline must be a boolean if provided');
+  if (typeof parsed.publiView_enabled !== 'boolean') errors.push('mbkbucketVar.publiView_enabled must be a boolean if provided');
+  if (errors.length) throw new Error(errors.join(' | '));
+
+  return parsed;
+}
+
+export function parseAndValidateBucketConnection(rawValue) {
+  if (!rawValue) return null;
+
+  let parsed;
+  try {
+    parsed = JSON.parse(rawValue);
+  } catch {
+    throw new Error('BucketConnection is not valid JSON');
+  }
+
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed) || !Object.keys(parsed).length) {
+    throw new Error('BucketConnection must be a non-empty object');
+  }
+
+  for (const [bucketName, config] of Object.entries(parsed)) {
+    if (!config || typeof config !== 'object' || Array.isArray(config)) {
+      throw new Error(`Bucket '${bucketName}' configuration must be an object, not a string. Remove quotes around the inner JSON object.`);
+    }
+
+    const providerType = String(config.type || config.provider || '').toLowerCase();
+
+    if (providerType === 'gdrive' || providerType === 'google-drive' || providerType === 'googledrive') {
+      const hasOAuth = Boolean(config.client_id && config.client_secret && (config.refresh_token || config.access_token || config.code));
+      const hasServiceAccount = Boolean((config.client_email || config.service_account_email) && (config.private_key || config.service_account_key));
+      const hasAccessTokenOnly = Boolean(config.access_token);
+      const hasServiceAccountKeyObj = Boolean(config.service_account && typeof config.service_account === 'object');
+
+      if (!hasOAuth && !hasServiceAccount && !hasAccessTokenOnly && !hasServiceAccountKeyObj) {
+        throw new Error(`Google Drive connection '${bucketName}' requires OAuth credentials (client_id, client_secret, refresh_token) or Service Account credentials (client_email, private_key).`);
+      }
+    } else {
+      // Default is S3-compatible provider
+      const missingFields = REQUIRED_S3_FIELDS.filter(field => !config[field]);
+      if (missingFields.length) {
+        throw new Error(`Bucket '${bucketName}' is missing required fields: ${missingFields.join(', ')}`);
+      }
+    }
+  }
+
+  return parsed;
+}