next-tinacms-cloudinary 3.4.4 → 3.5.2

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # next-tinacms-cloudinary
 
+## 3.5.2
+
+## 3.5.1
+
+## 3.5.0
+
+### Minor Changes
+
+- 4a3990c7e: Cloudinary media store now serves images over `https` by default. This can now be configured though the handler provided.
+
+  To revert to the old behavior:
+
+  ```ts
+  export default createMediaHandler(
+    {
+      // ...
+    },
+    {
+      useHttps: false,
+    }
+  )
+  ```
+
+  The default for `useHttps` is `true`
+
+## 3.4.5
+
+### Patch Changes
+
+- 2a4a23b74: Fixed issue where folders could not have spaces
+
 ## 3.4.4
 
 ## 3.4.3

package/dist/handlers.d.ts

@@ -17,9 +17,12 @@ export interface CloudinaryConfig {
     api_secret: string;
     authorized: (req: NextApiRequest, res: NextApiResponse) => Promise<boolean>;
 }
+export interface CloudinaryOptions {
+    useHttps?: boolean;
+}
 export declare const mediaHandlerConfig: {
     api: {
         bodyParser: boolean;
     };
 };
-export declare const createMediaHandler: (config: CloudinaryConfig) => (req: NextApiRequest, res: NextApiResponse) => Promise<void>;
+export declare const createMediaHandler: (config: CloudinaryConfig, options?: CloudinaryOptions) => (req: NextApiRequest, res: NextApiResponse) => Promise<void>;

package/dist/handlers.js

@@ -22,7 +22,7 @@ var __toModule = (module2) => {
   return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
 };
 
-// pnp:/Users/jeffsee/code/tinacms/packages/next-tinacms-cloudinary/src/handlers.ts
+// pnp:/home/runner/work/tinacms/tinacms/packages/next-tinacms-cloudinary/src/handlers.ts
 __export(exports, {
   createMediaHandler: () => createMediaHandler,
   mediaHandlerConfig: () => mediaHandlerConfig
@@ -36,7 +36,7 @@ var mediaHandlerConfig = {
     bodyParser: false
   }
 };
-var createMediaHandler = (config) => {
+var createMediaHandler = (config, options) => {
   import_cloudinary.v2.config(Object.assign({ secure: true }, config));
   return async (req, res) => {
     const isAuthorized = await config.authorized(req, res);
@@ -46,7 +46,7 @@ var createMediaHandler = (config) => {
     }
     switch (req.method) {
       case "GET":
-        return listMedia(req, res);
+        return listMedia(req, res, options);
       case "POST":
         return uploadMedia(req, res);
       case "DELETE":
@@ -76,7 +76,7 @@ async function uploadMedia(req, res) {
   });
   res.json(result);
 }
-async function listMedia(req, res) {
+async function listMedia(req, res, opts) {
   try {
     const {
       directory = '""',
@@ -84,9 +84,9 @@ async function listMedia(req, res) {
       offset
     } = req.query;
     const useRootDirectory = !directory || directory === "/" || directory === '""';
-    const query = useRootDirectory ? 'folder=""' : `folder=${directory}`;
+    const query = useRootDirectory ? 'folder=""' : `folder="${directory}"`;
     const response = await import_cloudinary.v2.search.expression(query).max_results(limit).next_cursor(offset).execute();
-    const files = response.resources.map(cloudinaryToTina);
+    const files = response.resources.map(getCloudinaryToTinaFunc(opts));
     import_cloudinary.v2.api.folders = (directory2 = '""') => {
       if (useRootDirectory) {
         return import_cloudinary.v2.api.root_folders();
@@ -135,16 +135,23 @@ async function deleteAsset(req, res) {
     });
   });
 }
-function cloudinaryToTina(file) {
-  const filename = import_path.default.basename(file.public_id);
-  const directory = import_path.default.dirname(file.public_id);
-  return {
-    id: file.public_id,
-    filename,
-    directory,
-    src: file.url,
-    previewSrc: transformCloudinaryImage(file.url, "w_75,h_75,c_fill,q_auto"),
-    type: "file"
+function getCloudinaryToTinaFunc(opts) {
+  return function cloudinaryToTina(file) {
+    let useHttps = true;
+    if (typeof opts !== "undefined" && typeof opts.useHttps !== "undefined") {
+      useHttps = opts.useHttps;
+    }
+    const sel = useHttps ? "secure_url" : "url";
+    const filename = import_path.default.basename(file.public_id);
+    const directory = import_path.default.dirname(file.public_id);
+    return {
+      id: file.public_id,
+      filename,
+      directory,
+      src: file[sel],
+      previewSrc: transformCloudinaryImage(file[sel], "w_75,h_75,c_fill,q_auto"),
+      type: "file"
+    };
   };
 }
 function transformCloudinaryImage(url, transformations) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-tinacms-cloudinary",
-  "version": "3.4.4",
+  "version": "3.5.2",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -25,7 +25,7 @@
     "multer": "^1.4.2"
   },
   "devDependencies": {
-    "@tinacms/toolkit": "0.56.5",
+    "@tinacms/toolkit": "0.56.8",
     "@types/crypto-js": "^3.1.47",
     "@types/js-cookie": "^2.2.6",
     "@types/node": "^13.13.1",
@@ -35,7 +35,7 @@
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "styled-components": "^5.2.0",
-    "tinacms": "0.62.0",
+    "tinacms": "0.64.2",
     "typescript": "^4.3.5"
   },
   "peerDependencies": {