tinacms 0.66.7 → 0.66.8

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # tinacms
 
+## 0.66.8
+
+### Patch Changes
+
+- 4923a2d66: Checks isAuthenticated() before making requests to the GraphQL client
+- Updated dependencies [106549814]
+- Updated dependencies [4923a2d66]
+- Updated dependencies [a07ff39bb]
+  - @tinacms/toolkit@0.56.17
+
 ## 0.66.7
 
 ### Patch Changes

package/dist/admin/api.d.ts

@@ -17,8 +17,10 @@ export declare class TinaAdminApi {
         request: (query: string, { variables }: {
             variables: object;
         }) => any;
+        isAuthenticated: () => boolean;
     };
     constructor(cms: TinaCMS);
+    isAuthenticated(): Promise<boolean>;
     fetchCollections(): Promise<{
         getCollections: Collection[];
     }>;

package/dist/index.es.js

@@ -1161,6 +1161,9 @@ class TinaAdminApi {
   constructor(cms) {
     this.api = cms.api.tina;
   }
+  async isAuthenticated() {
+    return await this.api.isAuthenticated();
+  }
   async fetchCollections() {
     const response = await this.api.request(`#graphql
       query{ 
@@ -2293,16 +2296,18 @@ const useGetCollections = (cms) => {
   const [error, setError] = useState(void 0);
   useEffect(() => {
     const fetchCollections = async () => {
-      try {
-        const response = await api.fetchCollections();
-        setCollections(response.getCollections);
-      } catch (error2) {
-        cms.alerts.error(`[${error2.name}] GetCollections failed: ${error2.message}`, 30 * 1e3);
-        console.error(error2);
-        setCollections([]);
-        setError(error2);
+      if (await api.isAuthenticated()) {
+        try {
+          const response = await api.fetchCollections();
+          setCollections(response.getCollections);
+        } catch (error2) {
+          cms.alerts.error(`[${error2.name}] GetCollections failed: ${error2.message}`, 30 * 1e3);
+          console.error(error2);
+          setCollections([]);
+          setError(error2);
+        }
+        setLoading(false);
       }
-      setLoading(false);
     };
     setLoading(true);
     fetchCollections();
@@ -2591,16 +2596,18 @@ const useGetCollection = (cms, collectionName, includeDocuments = true) => {
   const [error, setError] = useState(void 0);
   useEffect(() => {
     const fetchCollection = async () => {
-      try {
-        const response = await api.fetchCollection(collectionName, includeDocuments);
-        setCollection(response.getCollection);
-      } catch (error2) {
-        cms.alerts.error(`[${error2.name}] GetCollection failed: ${error2.message}`, 30 * 1e3);
-        console.error(error2);
-        setCollection(void 0);
-        setError(error2);
+      if (await api.isAuthenticated()) {
+        try {
+          const response = await api.fetchCollection(collectionName, includeDocuments);
+          setCollection(response.getCollection);
+        } catch (error2) {
+          cms.alerts.error(`[${error2.name}] GetCollection failed: ${error2.message}`, 30 * 1e3);
+          console.error(error2);
+          setCollection(void 0);
+          setError(error2);
+        }
+        setLoading(false);
       }
-      setLoading(false);
     };
     setLoading(true);
     fetchCollection();
@@ -2614,13 +2621,11 @@ const GetCollection = ({
   children
 }) => {
   const { collection, loading, error } = useGetCollection(cms, collectionName, includeDocuments);
-  if (!collection) {
-    if (loading) {
-      return /* @__PURE__ */ React.createElement(LoadingPage, null);
-    }
-    if (error) {
-      return null;
-    }
+  if (error) {
+    return null;
+  }
+  if (loading) {
+    return /* @__PURE__ */ React.createElement(LoadingPage, null);
   }
   return /* @__PURE__ */ React.createElement(React.Fragment, null, children(collection, loading));
 };
@@ -2740,37 +2745,39 @@ const useGetDocumentFields = (cms, collectionName, templateName) => {
   const [error, setError] = useState(void 0);
   useEffect(() => {
     const fetchDocumentFields = async () => {
-      try {
-        const response = await api.fetchDocumentFields();
-        const documentFields = response.getDocumentFields;
-        const collection = documentFields[collectionName].collection;
-        const mutationInfo = documentFields[collectionName].mutationInfo;
-        let fields = void 0;
-        let template = void 0;
-        if (templateName && documentFields[collectionName].templates && documentFields[collectionName].templates[templateName]) {
-          template = documentFields[collectionName].templates[templateName].template;
-          fields = documentFields[collectionName].templates[templateName].fields;
-        } else {
-          fields = documentFields[collectionName].fields;
+      if (await api.isAuthenticated()) {
+        try {
+          const response = await api.fetchDocumentFields();
+          const documentFields = response.getDocumentFields;
+          const collection = documentFields[collectionName].collection;
+          const mutationInfo = documentFields[collectionName].mutationInfo;
+          let fields = void 0;
+          let template = void 0;
+          if (templateName && documentFields[collectionName].templates && documentFields[collectionName].templates[templateName]) {
+            template = documentFields[collectionName].templates[templateName].template;
+            fields = documentFields[collectionName].templates[templateName].fields;
+          } else {
+            fields = documentFields[collectionName].fields;
+          }
+          setInfo({
+            collection,
+            template,
+            fields,
+            mutationInfo
+          });
+        } catch (error2) {
+          cms.alerts.error(`[${error2.name}] GetDocumentFields failed: ${error2.message}`, 30 * 1e3);
+          console.error(error2);
+          setInfo({
+            collection: void 0,
+            template: void 0,
+            fields: void 0,
+            mutationInfo: void 0
+          });
+          setError(error2);
         }
-        setInfo({
-          collection,
-          template,
-          fields,
-          mutationInfo
-        });
-      } catch (error2) {
-        cms.alerts.error(`[${error2.name}] GetDocumentFields failed: ${error2.message}`, 30 * 1e3);
-        console.error(error2);
-        setInfo({
-          collection: void 0,
-          template: void 0,
-          fields: void 0,
-          mutationInfo: void 0
-        });
-        setError(error2);
+        setLoading(false);
       }
-      setLoading(false);
     };
     setLoading(true);
     fetchDocumentFields();
@@ -2784,13 +2791,11 @@ const GetDocumentFields = ({
   children
 }) => {
   const { collection, template, fields, mutationInfo, loading, error } = useGetDocumentFields(cms, collectionName, templateName);
-  if (!collection) {
-    if (loading) {
-      return /* @__PURE__ */ React.createElement(LoadingPage, null);
-    }
-    if (error) {
-      return null;
-    }
+  if (error) {
+    return null;
+  }
+  if (loading) {
+    return /* @__PURE__ */ React.createElement(LoadingPage, null);
   }
   return /* @__PURE__ */ React.createElement(React.Fragment, null, children({ collection, template, fields, mutationInfo, loading }));
 };
@@ -2805,7 +2810,14 @@ const createDocument = async (cms, collection, template, mutationInfo, values) =
     includeCollection,
     includeTemplate
   });
-  await api.createDocument(collection.name, relativePath, params);
+  if (await api.isAuthenticated()) {
+    await api.createDocument(collection.name, relativePath, params);
+  } else {
+    const authMessage = `[Error] CreateDocument failed: User is no longer authenticated; please login and try again.`;
+    cms.alerts.error(authMessage, 30 * 1e3);
+    console.error(authMessage);
+    return false;
+  }
 };
 const CollectionCreatePage = () => {
   const { collectionName, templateName } = useParams();
@@ -2892,16 +2904,18 @@ const useGetDocument = (cms, collectionName, relativePath) => {
   const [error, setError] = useState(void 0);
   useEffect(() => {
     const fetchDocument = async () => {
-      try {
-        const response = await api.fetchDocument(collectionName, relativePath);
-        setDocument(response.getDocument);
-      } catch (error2) {
-        cms.alerts.error(`[${error2.name}] GetDocument failed: ${error2.message}`, 30 * 1e3);
-        console.error(error2);
-        setDocument(void 0);
-        setError(error2);
+      if (api.isAuthenticated()) {
+        try {
+          const response = await api.fetchDocument(collectionName, relativePath);
+          setDocument(response.getDocument);
+        } catch (error2) {
+          cms.alerts.error(`[${error2.name}] GetDocument failed: ${error2.message}`, 30 * 1e3);
+          console.error(error2);
+          setDocument(void 0);
+          setError(error2);
+        }
+        setLoading(false);
       }
-      setLoading(false);
     };
     setLoading(true);
     fetchDocument();
@@ -2915,13 +2929,11 @@ const GetDocument = ({
   children
 }) => {
   const { document, loading, error } = useGetDocument(cms, collectionName, relativePath);
-  if (!document) {
-    if (loading) {
-      return /* @__PURE__ */ React.createElement(LoadingPage, null);
-    }
-    if (error) {
-      return null;
-    }
+  if (error) {
+    return null;
+  }
+  if (loading) {
+    return /* @__PURE__ */ React.createElement(LoadingPage, null);
   }
   return /* @__PURE__ */ React.createElement(React.Fragment, null, children(document, loading));
 };
@@ -2932,7 +2944,14 @@ const updateDocument = async (cms, relativePath, collection, mutationInfo, value
     includeCollection,
     includeTemplate
   });
-  await api.updateDocument(collection.name, relativePath, params);
+  if (await api.isAuthenticated()) {
+    await api.updateDocument(collection.name, relativePath, params);
+  } else {
+    const authMessage = `[Error] UpdateDocument failed: User is no longer authenticated; please login and try again.`;
+    cms.alerts.error(authMessage, 30 * 1e3);
+    console.error(authMessage);
+    return false;
+  }
 };
 const CollectionUpdatePage = () => {
   const { collectionName, filename } = useParams();

package/dist/index.js

@@ -1181,6 +1181,9 @@ mutation addPendingDocumentMutation(
     constructor(cms) {
       this.api = cms.api.tina;
     }
+    async isAuthenticated() {
+      return await this.api.isAuthenticated();
+    }
     async fetchCollections() {
       const response = await this.api.request(`#graphql
       query{ 
@@ -2313,16 +2316,18 @@ This will work when developing locally but NOT when deployed to production.
     const [error, setError] = React.useState(void 0);
     React.useEffect(() => {
       const fetchCollections = async () => {
-        try {
-          const response = await api.fetchCollections();
-          setCollections(response.getCollections);
-        } catch (error2) {
-          cms.alerts.error(`[${error2.name}] GetCollections failed: ${error2.message}`, 30 * 1e3);
-          console.error(error2);
-          setCollections([]);
-          setError(error2);
+        if (await api.isAuthenticated()) {
+          try {
+            const response = await api.fetchCollections();
+            setCollections(response.getCollections);
+          } catch (error2) {
+            cms.alerts.error(`[${error2.name}] GetCollections failed: ${error2.message}`, 30 * 1e3);
+            console.error(error2);
+            setCollections([]);
+            setError(error2);
+          }
+          setLoading(false);
         }
-        setLoading(false);
       };
       setLoading(true);
       fetchCollections();
@@ -2611,16 +2616,18 @@ This will work when developing locally but NOT when deployed to production.
     const [error, setError] = React.useState(void 0);
     React.useEffect(() => {
       const fetchCollection = async () => {
-        try {
-          const response = await api.fetchCollection(collectionName, includeDocuments);
-          setCollection(response.getCollection);
-        } catch (error2) {
-          cms.alerts.error(`[${error2.name}] GetCollection failed: ${error2.message}`, 30 * 1e3);
-          console.error(error2);
-          setCollection(void 0);
-          setError(error2);
+        if (await api.isAuthenticated()) {
+          try {
+            const response = await api.fetchCollection(collectionName, includeDocuments);
+            setCollection(response.getCollection);
+          } catch (error2) {
+            cms.alerts.error(`[${error2.name}] GetCollection failed: ${error2.message}`, 30 * 1e3);
+            console.error(error2);
+            setCollection(void 0);
+            setError(error2);
+          }
+          setLoading(false);
         }
-        setLoading(false);
       };
       setLoading(true);
       fetchCollection();
@@ -2634,13 +2641,11 @@ This will work when developing locally but NOT when deployed to production.
     children
   }) => {
     const { collection, loading, error } = useGetCollection(cms, collectionName, includeDocuments);
-    if (!collection) {
-      if (loading) {
-        return /* @__PURE__ */ React__default["default"].createElement(LoadingPage, null);
-      }
-      if (error) {
-        return null;
-      }
+    if (error) {
+      return null;
+    }
+    if (loading) {
+      return /* @__PURE__ */ React__default["default"].createElement(LoadingPage, null);
     }
     return /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, children(collection, loading));
   };
@@ -2760,37 +2765,39 @@ This will work when developing locally but NOT when deployed to production.
     const [error, setError] = React.useState(void 0);
     React.useEffect(() => {
       const fetchDocumentFields = async () => {
-        try {
-          const response = await api.fetchDocumentFields();
-          const documentFields = response.getDocumentFields;
-          const collection = documentFields[collectionName].collection;
-          const mutationInfo = documentFields[collectionName].mutationInfo;
-          let fields = void 0;
-          let template = void 0;
-          if (templateName && documentFields[collectionName].templates && documentFields[collectionName].templates[templateName]) {
-            template = documentFields[collectionName].templates[templateName].template;
-            fields = documentFields[collectionName].templates[templateName].fields;
-          } else {
-            fields = documentFields[collectionName].fields;
+        if (await api.isAuthenticated()) {
+          try {
+            const response = await api.fetchDocumentFields();
+            const documentFields = response.getDocumentFields;
+            const collection = documentFields[collectionName].collection;
+            const mutationInfo = documentFields[collectionName].mutationInfo;
+            let fields = void 0;
+            let template = void 0;
+            if (templateName && documentFields[collectionName].templates && documentFields[collectionName].templates[templateName]) {
+              template = documentFields[collectionName].templates[templateName].template;
+              fields = documentFields[collectionName].templates[templateName].fields;
+            } else {
+              fields = documentFields[collectionName].fields;
+            }
+            setInfo({
+              collection,
+              template,
+              fields,
+              mutationInfo
+            });
+          } catch (error2) {
+            cms.alerts.error(`[${error2.name}] GetDocumentFields failed: ${error2.message}`, 30 * 1e3);
+            console.error(error2);
+            setInfo({
+              collection: void 0,
+              template: void 0,
+              fields: void 0,
+              mutationInfo: void 0
+            });
+            setError(error2);
           }
-          setInfo({
-            collection,
-            template,
-            fields,
-            mutationInfo
-          });
-        } catch (error2) {
-          cms.alerts.error(`[${error2.name}] GetDocumentFields failed: ${error2.message}`, 30 * 1e3);
-          console.error(error2);
-          setInfo({
-            collection: void 0,
-            template: void 0,
-            fields: void 0,
-            mutationInfo: void 0
-          });
-          setError(error2);
+          setLoading(false);
         }
-        setLoading(false);
       };
       setLoading(true);
       fetchDocumentFields();
@@ -2804,13 +2811,11 @@ This will work when developing locally but NOT when deployed to production.
     children
   }) => {
     const { collection, template, fields, mutationInfo, loading, error } = useGetDocumentFields(cms, collectionName, templateName);
-    if (!collection) {
-      if (loading) {
-        return /* @__PURE__ */ React__default["default"].createElement(LoadingPage, null);
-      }
-      if (error) {
-        return null;
-      }
+    if (error) {
+      return null;
+    }
+    if (loading) {
+      return /* @__PURE__ */ React__default["default"].createElement(LoadingPage, null);
     }
     return /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, children({ collection, template, fields, mutationInfo, loading }));
   };
@@ -2825,7 +2830,14 @@ This will work when developing locally but NOT when deployed to production.
       includeCollection,
       includeTemplate
     });
-    await api.createDocument(collection.name, relativePath, params);
+    if (await api.isAuthenticated()) {
+      await api.createDocument(collection.name, relativePath, params);
+    } else {
+      const authMessage = `[Error] CreateDocument failed: User is no longer authenticated; please login and try again.`;
+      cms.alerts.error(authMessage, 30 * 1e3);
+      console.error(authMessage);
+      return false;
+    }
   };
   const CollectionCreatePage = () => {
     const { collectionName, templateName } = reactRouterDom.useParams();
@@ -2912,16 +2924,18 @@ This will work when developing locally but NOT when deployed to production.
     const [error, setError] = React.useState(void 0);
     React.useEffect(() => {
       const fetchDocument = async () => {
-        try {
-          const response = await api.fetchDocument(collectionName, relativePath);
-          setDocument(response.getDocument);
-        } catch (error2) {
-          cms.alerts.error(`[${error2.name}] GetDocument failed: ${error2.message}`, 30 * 1e3);
-          console.error(error2);
-          setDocument(void 0);
-          setError(error2);
+        if (api.isAuthenticated()) {
+          try {
+            const response = await api.fetchDocument(collectionName, relativePath);
+            setDocument(response.getDocument);
+          } catch (error2) {
+            cms.alerts.error(`[${error2.name}] GetDocument failed: ${error2.message}`, 30 * 1e3);
+            console.error(error2);
+            setDocument(void 0);
+            setError(error2);
+          }
+          setLoading(false);
         }
-        setLoading(false);
       };
       setLoading(true);
       fetchDocument();
@@ -2935,13 +2949,11 @@ This will work when developing locally but NOT when deployed to production.
     children
   }) => {
     const { document, loading, error } = useGetDocument(cms, collectionName, relativePath);
-    if (!document) {
-      if (loading) {
-        return /* @__PURE__ */ React__default["default"].createElement(LoadingPage, null);
-      }
-      if (error) {
-        return null;
-      }
+    if (error) {
+      return null;
+    }
+    if (loading) {
+      return /* @__PURE__ */ React__default["default"].createElement(LoadingPage, null);
     }
     return /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, children(document, loading));
   };
@@ -2952,7 +2964,14 @@ This will work when developing locally but NOT when deployed to production.
       includeCollection,
       includeTemplate
     });
-    await api.updateDocument(collection.name, relativePath, params);
+    if (await api.isAuthenticated()) {
+      await api.updateDocument(collection.name, relativePath, params);
+    } else {
+      const authMessage = `[Error] UpdateDocument failed: User is no longer authenticated; please login and try again.`;
+      cms.alerts.error(authMessage, 30 * 1e3);
+      console.error(authMessage);
+      return false;
+    }
   };
   const CollectionUpdatePage = () => {
     const { collectionName, filename } = reactRouterDom.useParams();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.66.7",
+  "version": "0.66.8",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -25,7 +25,7 @@
     "@headlessui/react": "^1.4.1",
     "@heroicons/react": "^1.0.4",
     "@tinacms/sharedctx": "0.1.0",
-    "@tinacms/toolkit": "0.56.16",
+    "@tinacms/toolkit": "0.56.17",
     "crypto-js": "^4.0.0",
     "final-form": "4.20.1",
     "graphql": "^15.1.0",