@social-mail/social-mail-web-server 1.8.407 → 1.8.411

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.8.407",
+  "version": "1.8.411",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/WebServer.ts

@@ -257,7 +257,7 @@ export default class WebServer {
         ServiceCollection.register("Scoped", ReadOnlySocialMailContext);
 
         ServiceCollection.registerMultiple("Scoped", [ AppDbContext, SocialMailContext], SocialMailContext);
-        ServiceCollection.registerMultiple("Scoped", [UserInfoProvider, AuthorizationService], UserInfoProvider);
+        ServiceCollection.registerMultiple("Singleton", [UserInfoProvider, AuthorizationService], UserInfoProvider);
         ServiceCollection.registerMultiple("Singleton", [AppSocketService, SocketService], AppSocketService);
         ServiceCollection.registerMultiple("Singleton", [AppKeyProvider, KeyProvider],  AppKeyProvider);
         ServiceCollection.registerMultiple("Singleton", [ ContextEvents ], SocialMailContextEvents);

package/src/server/services/UserAuthorizationService.ts

@@ -3,7 +3,6 @@ import AuthorizationService, { ICookie } from "@entity-access/server-pages/dist/
 import SocialMailContext from "../model/SocialMailContext.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
-import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import BaseDiskCache from "../../common/BaseDiskCache.js";
 import { join } from "path";
 import { globalEnv } from "../../common/globalEnv.js";
@@ -36,6 +35,11 @@ export default class UserAuthorizationService extends AuthorizationService {
             return await this.loadSessionFromDb(sessionID);
         });
         user.sessionID = info.sessionID;
+        if (!info.userID) {
+            // delete cache. cache is invalid...
+            await this.diskCache.deleteAt(keyPath);
+            return;
+        }
         user.userID = info.userID;
         user.roles = info.roles;
         user.expiry = info.expiry;
@@ -72,7 +76,7 @@ export default class UserAuthorizationService extends AuthorizationService {
             ])
             .first();
         if (!session?.user) {
-            throw new EntityAccessError(`Session not found for session id ${sessionID}`);
+            return { sessionID };
         }
 
         // extend session...