@ditojs/server 1.4.0 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.4.0",
+  "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,15 +21,15 @@
     "node >= 16"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.4.0",
-    "@ditojs/router": "^1.4.0",
-    "@ditojs/utils": "^1.4.0",
+    "@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",
-    "ajv": "^8.10.0",
+    "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
-    "aws-sdk": "^2.1095.0",
+    "aws-sdk": "^2.1098.0",
     "axios": "^0.26.1",
     "bcryptjs": "^2.4.3",
     "bytes": "^3.1.2",
@@ -61,7 +61,7 @@
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
-    "pino": "^7.9.1",
+    "pino": "^7.9.2",
     "pino-pretty": "^7.5.4",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
@@ -81,5 +81,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.2"
   },
-  "gitHead": "0b308cb3bd1513d78894c7ccdc0c8716339f55a1"
+  "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,38 +216,34 @@ export class QueryBuilder extends objection.QueryBuilder {
       this._allowScopes = query._allowScopes ? { ...query._allowScopes } : null
       this._ignoreScopes = { ...query._ignoreScopes }
     }
-    // If he target is a child query of a graph query, copy all scopes, graph
+    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$/)
-    this._scopes = this._filterScopes(query._scopes, (scope, graph) =>
-      copyAllScopes || graph)
-  }
-
-  _filterScopes(scopes, callback) {
-    return Object.entries(scopes).reduce(
-      (scopes, [scope, graph]) => {
-        if (callback(scope, graph)) {
-          scopes[scope] = graph
-        }
-        return scopes
-      },
-      {}
-    )
+    this._scopes = copyAllScopes
+      ? scopes
+      : filterScopes(scopes, (scope, graph) => graph) // copy graph-scopes only.
   }
 
   _applyScope(scope, graph) {
     if (!this._ignoreScopes[SYMBOL_ALL] && !this._ignoreScopes[scope]) {
       // Prevent multiple application of scopes. This can easily occur
       // with the nesting and eager-application of graph-scopes, see below.
-      if (!this._appliedScopes[scope]) {
+      // NOTE: The boolean values indicate the `graph` settings, not whether the
+      // scopes were applied or not.
+      if (!(scope in this._appliedScopes)) {
         // Only apply graph-scopes that are actually defined on the model:
         const func = this.modelClass().getScope(scope)
         if (func) {
           func.call(this, this)
         }
-        this._appliedScopes[scope] = true
+        this._appliedScopes[scope] = graph
       }
       if (graph) {
         // Also bake the scope into any graph expression that may have been
@@ -255,12 +251,12 @@ export class QueryBuilder extends objection.QueryBuilder {
         const expr = this.graphExpressionObject()
         if (expr) {
           // Add a new modifier to the existing graph expression that
-          // recursively applies the graph-scope to the resulting queries.
-          // This even works if nested scopes expand the graph expression,
-          // because it re-applies itself to the result.
+          // recursively adds the graph-scope to the resulting queries. This
+          // even works if nested scopes expand the graph expression, because it
+          // re-applies itself to the result.
           const name = `^${scope}`
           const modifiers = {
-            [name]: query => query._applyScope(scope, graph)
+            [name]: query => query.withScope(name)
           }
           this.withGraph(
             addGraphScope(this.modelClass(), expr, [name], modifiers, true)
@@ -796,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 = {