@dnax/core 0.16.5 → 0.16.7

package/app/hono.ts

@@ -92,14 +92,10 @@ function HonoInstance(): typeof app {
       var token = jwt.getToken("Bearer", c.req.header()["authorization"]) || "";
       var { decode, valid, error } = jwt.verify(token);
       let sessionData = {};
-      if (valid && decode) {
-        await localSession
-          .get(decode?.sessionId)
-          .then((data) => {
-            //console.log("Data", data);
-            sessionData = data;
-          })
-          .catch();
+      if (valid && decode && decode?.session) {
+        sessionData = decode?.session;
+      } else {
+        // console.log("No valid token", error);
       }
 
       let _v = {

package/lib/asyncLocalStorage.ts

@@ -39,26 +39,15 @@ const sessionStorage = () => ({
       id: "",
       state: {},
       _v: {},
-      generateToken: true,
     }
   ): any {
-    input.generateToken = input?.generateToken ?? true;
     let store = asyncLocalStorage.getStore() as InstanceType<typeof Map>;
     if (!input?.id) {
       input.id = v4();
     }
 
-    if (input?.generateToken) {
-      input.token =
-        input.token ||
-        jwt.sign(input.id, {
-          expiresIn: input?.expiresIn || "7d",
-        });
-    }
-
     let data = {
-      token: input?.token || null,
-      state: input?.state,
+      state: input?.state || {},
       role: input?.role || null,
       _v: {
         ...(input?._v || {}),
@@ -66,11 +55,28 @@ const sessionStorage = () => ({
       },
     };
 
-    if (input?.generateToken) {
-      localSession.set(input?.id, data);
-    }
+    input.token =
+      input.token ||
+      jwt.sign(
+        {
+          id: input.id,
+          state: input?.state,
+          role: input?.role || null,
+          _v: {
+            ...(input?._v || {}),
+            setAt: new Date().toString(),
+          },
+        },
+        {
+          expiresIn: input?.expiresIn || "7d",
+        }
+      );
+
+    store.set(key, {
+      ...data,
+      token: input.token,
+    });
 
-    store.set(key, data);
     return {
       state: input.state,
       _v: input._v,

package/lib/schema.ts

@@ -33,7 +33,7 @@ function buildSchema(col: Collection) {
       propertySchema[f.name] = v.string().optional();
     }
 
-    if (f?.type.match(/(string|richText|textarea)/)) {
+    if (f?.type.match(/(string|richText|textarea|markdown)/)) {
       propertySchema[f.name] = v.string();
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.16.5",
+  "version": "0.16.7",
   "module": "index.ts",
   "type": "module",
   "bin": {

package/types/index.ts

@@ -60,6 +60,7 @@ export type Field = {
     | "ipv4"
     | "ipv6"
     | "url"
+    | "markdown"
     | "date"
     | "datetime-local"
     | "email"

package/utils/index.ts

@@ -59,7 +59,7 @@ const jwt = {
   ) => {
     // console.log("payload", payload, options);
 
-    return jwto.sign({ sessionId: payload }, JWT_SECRET, {
+    return jwto.sign({ session: payload }, JWT_SECRET, {
       ...options,
     });
   },