next-tinacms-dos 1.1.1 → 1.1.2

package/README.md

@@ -6,12 +6,12 @@ Manage **Digital Ocean Space media assets** in TinaCMS.
 
 ### With Yarn
 ```bash
-yarn add next-tinacms-dos
+yarn add next-tinacms-dos @tinacms/auth
 ```
 
 ### With NPM
 ```bash
-npm install next-tinacms-dos
+npm install next-tinacms-dos @tinacms/auth
 ```
 
 ## Connect with Digital Ocean Space
@@ -116,6 +116,7 @@ export default createMediaHandler({
     region: 'us-east-1',
   },
   bucket: process.env.NEXT_PUBLIC_SPACE_NAME || '',
+  mediaRoot: 'images',
   authorized: async (req, _res) => {
     if (process.env.NEXT_PUBLIC_USE_LOCAL_CLIENT === "1") {
       return true;

package/dist/handlers.d.ts

@@ -6,6 +6,7 @@ import { NextApiRequest, NextApiResponse } from 'next';
 export interface DOSConfig {
     config: S3ClientConfig;
     bucket: string;
+    mediaRoot?: string;
     authorized: (_req: NextApiRequest, _res: NextApiResponse) => Promise<boolean>;
 }
 export interface DOSOptions {

package/dist/handlers.js

@@ -40,6 +40,15 @@ var mediaHandlerConfig = {
 var createMediaHandler = (config, options) => {
   const client = new import_client_s3.S3Client(config.config);
   const bucket = config.bucket;
+  let mediaRoot = config.mediaRoot || "";
+  if (mediaRoot) {
+    if (!mediaRoot.endsWith("/")) {
+      mediaRoot = mediaRoot + "/";
+    }
+    if (mediaRoot.startsWith("/")) {
+      mediaRoot = mediaRoot.substr(1);
+    }
+  }
   let cdnUrl = (options == null ? void 0 : options.cdnUrl) || config.config.endpoint.toString().replace(/http(s|):\/\//i, `https://${bucket}.`);
   cdnUrl = cdnUrl + (cdnUrl.endsWith("/") ? "" : "/");
   return async (req, res) => {
@@ -50,9 +59,9 @@ var createMediaHandler = (config, options) => {
     }
     switch (req.method) {
       case "GET":
-        return listMedia(req, res, client, bucket, cdnUrl);
+        return listMedia(req, res, client, bucket, mediaRoot, cdnUrl);
       case "POST":
-        return uploadMedia(req, res, client, bucket, cdnUrl);
+        return uploadMedia(req, res, client, bucket, mediaRoot, cdnUrl);
       case "DELETE":
         return deleteAsset(req, res, client, bucket);
       default:
@@ -60,7 +69,7 @@ var createMediaHandler = (config, options) => {
     }
   };
 };
-async function uploadMedia(req, res, client, bucket, cdnUrl) {
+async function uploadMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
   const upload = (0, import_util.promisify)((0, import_multer.default)({
     storage: import_multer.default.diskStorage({
       directory: (req2, file, cb) => {
@@ -81,7 +90,7 @@ async function uploadMedia(req, res, client, bucket, cdnUrl) {
   const filename = import_path.default.basename(filePath);
   const params = {
     Bucket: bucket,
-    Key: prefix + filename,
+    Key: mediaRoot ? import_path.default.join(mediaRoot, prefix + filename) : prefix + filename,
     Body: blob,
     ACL: "public-read"
   };
@@ -93,14 +102,30 @@ async function uploadMedia(req, res, client, bucket, cdnUrl) {
       id: prefix + filename,
       filename,
       directory: prefix,
-      previewSrc: cdnUrl + prefix + filename,
-      src: cdnUrl + prefix + filename
+      previewSrc: cdnUrl + (mediaRoot ? import_path.default.join(mediaRoot, prefix + filename) : prefix + filename),
+      src: cdnUrl + (mediaRoot ? import_path.default.join(mediaRoot, prefix + filename) : prefix + filename)
     });
   } catch (e) {
     res.status(500).send(findErrorMessage(e));
   }
 }
-async function listMedia(req, res, client, bucket, cdnUrl) {
+function stripMediaRoot(mediaRoot, key) {
+  if (!mediaRoot) {
+    return key;
+  }
+  const mediaRootParts = mediaRoot.split("/").filter((part) => part);
+  if (!mediaRootParts || !mediaRootParts[0]) {
+    return key;
+  }
+  const keyParts = key.split("/").filter((part) => part);
+  for (let i = 0; i < mediaRootParts.length; i++) {
+    if (keyParts[0] === mediaRootParts[i]) {
+      keyParts.shift();
+    }
+  }
+  return keyParts.join("/");
+}
+async function listMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
   var _a;
   try {
     const {
@@ -114,20 +139,28 @@ async function listMedia(req, res, client, bucket, cdnUrl) {
     const params = {
       Bucket: bucket,
       Delimiter: "/",
-      Prefix: prefix,
+      Prefix: mediaRoot ? import_path.default.join(mediaRoot, prefix) : prefix,
       Marker: offset == null ? void 0 : offset.toString(),
       MaxKeys: directory && !offset ? +limit + 1 : +limit
     };
-    const command = new import_client_s3.ListObjectsCommand(params);
-    const response = await client.send(command);
+    const response = await client.send(new import_client_s3.ListObjectsCommand(params));
     const items = [];
-    (_a = response.CommonPrefixes) == null ? void 0 : _a.forEach(({ Prefix }) => items.push({
-      id: Prefix,
-      type: "dir",
-      filename: import_path.default.basename(Prefix),
-      directory: import_path.default.dirname(Prefix)
-    }));
-    items.push(...(response.Contents || []).filter((file) => file.Key !== prefix).map(getDOSToTinaFunc(cdnUrl)));
+    (_a = response.CommonPrefixes) == null ? void 0 : _a.forEach(({ Prefix }) => {
+      const strippedPrefix = stripMediaRoot(mediaRoot, Prefix);
+      if (!strippedPrefix) {
+        return;
+      }
+      items.push({
+        id: Prefix,
+        type: "dir",
+        filename: import_path.default.basename(strippedPrefix),
+        directory: import_path.default.dirname(strippedPrefix)
+      });
+    });
+    items.push(...(response.Contents || []).filter((file) => {
+      const strippedKey = stripMediaRoot(mediaRoot, file.Key);
+      return strippedKey !== prefix;
+    }).map(getDOSToTinaFunc(cdnUrl, mediaRoot)));
     res.json({
       items,
       offset: response.NextMarker
@@ -154,9 +187,8 @@ async function deleteAsset(req, res, client, bucket) {
     Bucket: bucket,
     Key: objectKey
   };
-  const command = new import_client_s3.DeleteObjectCommand(params);
   try {
-    const data = await client.send(command);
+    const data = await client.send(new import_client_s3.DeleteObjectCommand(params));
     res.json(data);
   } catch (err) {
     res.status(500).json({
@@ -164,10 +196,11 @@ async function deleteAsset(req, res, client, bucket) {
     });
   }
 }
-function getDOSToTinaFunc(cdnUrl) {
+function getDOSToTinaFunc(cdnUrl, mediaRoot) {
   return function dosToTina(file) {
-    const filename = import_path.default.basename(file.Key);
-    const directory = import_path.default.dirname(file.Key) + "/";
+    const strippedKey = stripMediaRoot(mediaRoot, file.Key);
+    const filename = import_path.default.basename(strippedKey);
+    const directory = import_path.default.dirname(strippedKey) + "/";
     return {
       id: file.Key,
       filename,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-tinacms-dos",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -21,13 +21,13 @@
     "multer": "1.4.5-lts.1"
   },
   "devDependencies": {
-    "@tinacms/toolkit": "1.3.2",
+    "@tinacms/toolkit": "1.3.3",
     "@tinacms/scripts": "1.0.2",
     "@types/crypto-js": "^3.1.47",
     "@types/js-cookie": "^2.2.6",
     "@types/node": "^13.13.1",
     "next": "12.2.4",
-    "tinacms": "1.2.0",
+    "tinacms": "1.2.1",
     "typescript": "4.3.5"
   },
   "publishConfig": {