@ditojs/server 1.4.2 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "type": "module",
   "description": "Dito.js Server – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/server",
@@ -21,9 +21,9 @@
     "node >= 16"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.4.2",
-    "@ditojs/router": "^1.4.1",
-    "@ditojs/utils": "^1.4.1",
+    "@ditojs/admin": "^1.4.3",
+    "@ditojs/router": "^1.4.3",
+    "@ditojs/utils": "^1.4.3",
     "@koa/cors": "^3.2.0",
     "@koa/multer": "^3.0.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -81,5 +81,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.2"
   },
-  "gitHead": "1790e50f979322b47a53421e9facddb86f6eff86"
+  "gitHead": "f2a544aef8ab0a12c7019650cd86558f8365b007"
 }

package/src/middleware/handleUser.js

@@ -17,6 +17,10 @@ export function handleUser() {
       const { user } = ctx.state
       await user?.$emit('before:logout', options)
       await logout.call(this) // No options in passport's logout()
+      // Clear the session after logout, apparently koa-passport doesn't take
+      // care of this itself:
+      // https://stackoverflow.com/questions/55818887/koa-passport-logout-is-not-clearing-session
+      ctx.session = null
       await user?.$emit('after:logout', options)
     }
 

package/src/query/QueryBuilder.js

@@ -216,24 +216,19 @@ export class QueryBuilder extends objection.QueryBuilder {
       this._allowScopes = query._allowScopes ? { ...query._allowScopes } : null
       this._ignoreScopes = { ...query._ignoreScopes }
     }
+    const scopes = isChildQuery
+      // When copying scopes for child-queries, we also need to take the already
+      // applied scopes into account and copy those too.
+      ? { ...query._appliedScopes, ...query._scopes }
+      : { ...query._scopes }
     // If the target is a child query of a graph query, copy all scopes, graph
     // and non-graph. If it is a child query of a related or eager query,
     // copy only the graph scopes.
     const copyAllScopes =
       isSameModelClass && isChildQuery && query.has(/GraphAndFetch$/)
-    // When copying scopes for child-queries, we also need to take the already
-    // applied scopes into account and copy those too.
-    const scopes = isChildQuery
-      ? { ...query._appliedScopes, ...query._scopes }
-      : query._scopes
-    this._scopes = this._filterScopes(scopes, (scope, graph) =>
-      copyAllScopes || graph)
-  }
-
-  _filterScopes(scopes, callback) {
-    return Object.fromEntries(Object.entries(scopes).filter(
-      ([scope, graph]) => callback(scope, graph)
-    ))
+    this._scopes = copyAllScopes
+      ? scopes
+      : filterScopes(scopes, (scope, graph) => graph) // copy graph-scopes only.
   }
 
   _applyScope(scope, graph) {
@@ -797,6 +792,12 @@ for (const key of [
   }
 }
 
+function filterScopes(scopes, callback) {
+  return Object.fromEntries(Object.entries(scopes).filter(
+    ([scope, graph]) => callback(scope, graph)
+  ))
+}
+
 // The default options for insertDitoGraph(), upsertDitoGraph(),
 // updateDitoGraph() and patchDitoGraph()
 const insertDitoGraphOptions = {