tinacms-authjs 10.0.6 → 10.0.8

package/dist/index.js

@@ -45,10 +45,9 @@ var TINA_CREDENTIALS_PROVIDER_NAME = "TinaCredentials";
 
 // src/index.ts
 var authenticate = async (databaseClient, username, password) => {
-  var _a;
   try {
     const result = await databaseClient.authenticate({ username, password });
-    return ((_a = result.data) == null ? void 0 : _a.authenticate) || null;
+    return result.data?.authenticate || null;
   } catch (e) {
     console.error(e);
   }
@@ -64,17 +63,16 @@ var TinaAuthJSOptions = ({
 }) => ({
   callbacks: {
     jwt: async ({ token: jwt, account }) => {
-      var _a, _b, _c, _d;
       if (account) {
         if (debug) {
           console.table(jwt);
         }
         try {
-          if (jwt == null ? void 0 : jwt[uidProp]) {
+          if (jwt?.[uidProp]) {
             const sub = jwt[uidProp];
             const result = await databaseClient.authorize({ sub });
-            jwt.role = !!((_a = result.data) == null ? void 0 : _a.authorize) ? "user" : "guest";
-            jwt.passwordChangeRequired = ((_d = (_c = (_b = result.data) == null ? void 0 : _b.authorize) == null ? void 0 : _c._password) == null ? void 0 : _d.passwordChangeRequired) || false;
+            jwt.role = !!result.data?.authorize ? "user" : "guest";
+            jwt.passwordChangeRequired = result.data?.authorize?._password?.passwordChangeRequired || false;
           } else if (debug) {
             console.log(`jwt missing specified uidProp: ${uidProp}`);
           }
@@ -118,8 +116,7 @@ var AuthJsBackendAuthProvider = ({
 }) => {
   const authProvider = {
     initialize: async () => {
-      var _a;
-      if (!((_a = authOptions.providers) == null ? void 0 : _a.length)) {
+      if (!authOptions.providers?.length) {
         throw new Error("No auth providers specified");
       }
       const [provider, ...rest] = authOptions.providers;
@@ -137,14 +134,14 @@ var AuthJsBackendAuthProvider = ({
           writable: false
         });
       }
-      if (!(session == null ? void 0 : session.user)) {
+      if (!session?.user) {
         return {
           errorCode: 401,
           errorMessage: "Unauthorized",
           isAuthorized: false
         };
       }
-      if ((session == null ? void 0 : session.user).role !== "user") {
+      if ((session?.user).role !== "user") {
         return {
           errorCode: 403,
           errorMessage: "Forbidden",
@@ -157,12 +154,11 @@ var AuthJsBackendAuthProvider = ({
       auth: {
         secure: false,
         handler: async (req, res, opts) => {
-          var _a, _b, _c;
           const url = new URL(
             req.url,
-            `http://${((_a = req.headers) == null ? void 0 : _a.host) || "localhost"}`
+            `http://${req.headers?.host || "localhost"}`
           );
-          const authSubRoutes = (_c = (_b = url.pathname) == null ? void 0 : _b.replace(`${opts.basePath}auth/`, "")) == null ? void 0 : _c.split("/");
+          const authSubRoutes = url.pathname?.replace(`${opts.basePath}auth/`, "")?.split("/");
           req.query.nextauth = authSubRoutes;
           await (0, import_next_auth.default)(authOptions)(req, res);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms-authjs",
-  "version": "10.0.6",
+  "version": "10.0.8",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "files": [
@@ -18,7 +18,7 @@
     ]
   },
   "dependencies": {
-    "@tinacms/schema-tools": "1.7.3"
+    "@tinacms/schema-tools": "1.7.4"
   },
   "devDependencies": {
     "next": "14.2.10",
@@ -26,16 +26,16 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.7.3",
-    "@tinacms/scripts": "1.3.4",
-    "@tinacms/datalayer": "1.3.17",
-    "tinacms": "2.7.6"
+    "@tinacms/datalayer": "1.3.18",
+    "@tinacms/scripts": "1.3.5",
+    "tinacms": "2.7.8"
   },
   "peerDependencies": {
     "next": "^12.2.5 || ^13 || ^14",
     "next-auth": "^4.22.1",
     "react": "^17.0.2 || ^18",
     "react-dom": "^17.0.2 || ^18",
-    "tinacms": "2.7.6"
+    "tinacms": "2.7.8"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"