Merge branch 'next' of github.com:devforth/adminforth into next

Author: yaroslav8765

adminforth/auth.ts

@@ -82,14 +82,21 @@ class AdminForthAuth implements IAdminForthAuth {
     username: string, 
     pk: string | null
   }) {
+    console.log("in days", expireInDays);
     const expiresIn: string = expireInDays ? `${expireInDays}d` : (process.env.ADMINFORTH_AUTH_EXPIRESIN || '24h');
+    console.log("in string", expiresIn);
     // might be h,m,d in string
+
     const expiresInSec = parseTimeToSeconds(expiresIn);
 
+    console.log("expiresInSec", expiresInSec);
+
     const token = this.issueJWT({ username, pk}, 'auth', expiresIn);
+    console.log("token", token);
     const expiresCookieFormat = new Date(Date.now() + expiresInSec * 1000).toUTCString();
-    
+    console.log("expiresCookieFormat", expiresCookieFormat);
     const brandSlug = this.adminforth.config.customization.brandNameSlug;
+    console.log("brandSlug", brandSlug);
     response.setHeader('Set-Cookie', `adminforth_${brandSlug}_jwt=${token}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=${expiresCookieFormat}`);
   }
 

adminforth/spa/src/views/ListView.vue

@@ -412,7 +412,7 @@ async function init() {
     return {
       field,
       operator,
-      value: JSON.parse(decodeURIComponent(route.query[k] as string))
+      value: JSON.parse((route.query[k] as string))
     }
   });
   if (filters.length) {
@@ -494,7 +494,7 @@ watch(() => filtersStore.filters, async (to, from) => {
   const currentQ = currentQuery();
   filtersStore.filters.forEach(f => {
     if (f.value !== undefined && f.value !== null && f.value !== '') {
-      query[`filter__${f.field}__${f.operator}`] = encodeURIComponent(JSON.stringify(f.value));
+      query[`filter__${f.field}__${f.operator}`] = (JSON.stringify(f.value));
     }
   });
   // set every key in currentQ which starts with filter_ to undefined if it is not in query