@social-mail/social-mail-web-server 1.8.403 → 1.8.405

package/src/server/services/message-events/MessagingService.ts

@@ -27,6 +27,8 @@ export default class MessagingService extends ServiceObject {
 
     clearDnsCache: IMessageChannel;
 
+    removeUserLoginSessions: IMessageChannel<{ userID }>;
+
     @Inject
     private pgEvents: PgEvents;
 
@@ -34,6 +36,7 @@ export default class MessagingService extends ServiceObject {
         this.channelRefresh = this.segment(`web-site-channel-host-clear-${globalEnv.serverID}`);
         this.refreshDns = this.segment("refresh-dns");
         this.restartDns = this.segment("restart-dns");
+        this.removeUserLoginSessions = this.segment(`remove-user-login-sessions-${globalEnv.serverID}`);
         this.snapshotRefresh = this.segment(`snapshot-refresh-${globalEnv.serverID}`);
         this.reputationCleared = this.segment(`reputation-cleared-${globalEnv.serverID}`);
         this.certificateIssued = this.segment(`certificate-issued`);

package/src/wwwroot/routes/callback/smtp/data/index.ts

@@ -4,20 +4,21 @@ import { SmtpStatusCodes } from "../../../../../server/smtp/client/SmtpStatusCod
 import { createPublicKey } from "node:crypto";
 import Content from "@entity-access/server-pages/dist/Content.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
-import TokenService from "@entity-access/server-pages/dist/services/TokenService.js";
 import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
+import TokenService from "../../../../../server/services/encryption/TokenService.js";
 
 let publicKey: any;
 
 @Prepare.parseForm
 export default class extends Page {
 
-    @Inject
-    private tokenService: TokenService;
 
     @Inject
     private mailReceiverService: MailReceiverService;
 
+    @Inject
+    private tokenService: TokenService;
+
     async run() {
 
         publicKey ??= createPublicKey({

package/src/wwwroot/routes/callback/smtp/rcpt/index.ts

@@ -4,9 +4,9 @@ import { SmtpStatusCodes } from "../../../../../server/smtp/client/SmtpStatusCod
 import { createPublicKey } from "node:crypto";
 import Content from "@entity-access/server-pages/dist/Content.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
-import TokenService from "@entity-access/server-pages/dist/services/TokenService.js";
 import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
 import { globalEnv } from "../../../../../common/globalEnv.js";
+import TokenService from "../../../../../server/services/encryption/TokenService.js";
 
 let publicKey:any;
 
@@ -15,12 +15,11 @@ export default class extends Page {
 
     maxUploadSize = 50*1024*1024;
 
-    @Inject
-    private tokenService: TokenService;
-
     @Inject
     private mailReceiverService: MailReceiverService;
 
+    @Inject
+    private tokenService: TokenService;
 
     async run() {
 

package/src/wwwroot/routes/social-mail/site/signup/post.tsx

@@ -237,10 +237,8 @@ export default class ExternalSignup extends Page {
 
         await this.sessionUser.setAuthCookie({
             userID: loginSession.userID,
-            id: loginSession.sessionID,
+            sessionID: loginSession.sessionID,
             expiry: expiry.asJSDate,
-            version: "1.1",
-            active: true
         });
 
         return this.json(model);

package/src/wwwroot/routes/social-mail/user/signup/post.tsx

@@ -217,10 +217,8 @@ export default class extends Page {
         });
         await this.sessionUser.setAuthCookie({
             userID: session.userID,
-            id: session.sessionID,
+            sessionID: session.sessionID,
             expiry: session.expiry.asJSDate,
-            version: "1.1",
-            active: true
         });
 
         return this.json(model);

package/dist/server/services/UserInfoProvider.d.ts

@@ -1,17 +0,0 @@
-import { IAuthCookie } from "@entity-access/server-pages/dist/services/TokenService.js";
-import USP from "@entity-access/server-pages/dist/services/UserSessionProvider.js";
-export default class UserSessionProvider extends USP {
-    getUserSession({ userID, id: sessionID, expiry }: IAuthCookie): Promise<{
-        userID: number;
-        sessionID: number;
-        userName: string;
-        expiry: Date;
-        roles: string[];
-        fileAccessList: {
-            type: "create" | "read" | "write" | "delegate";
-            path: string;
-        }[];
-        invalid: boolean;
-    }>;
-}
-//# sourceMappingURL=UserInfoProvider.d.ts.map

package/dist/server/services/UserInfoProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"UserInfoProvider.d.ts","sourceRoot":"","sources":["../../../src/server/services/UserInfoProvider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2DAA2D,CAAC;AACxF,OAAO,GAAG,MAAM,kEAAkE,CAAC;AAKnF,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,GAAG;IAE1C,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,WAAW;;;;;;;;;;;;CAoCtE"}

package/dist/server/services/UserInfoProvider.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"UserInfoProvider.js","sourceRoot":"","sources":["../../../src/server/services/UserInfoProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAEhG,OAAO,GAAG,MAAM,kEAAkE,CAAC;AACnF,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAGhD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,GAAG;IAEhD,KAAK,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAe;;;YAE/D,mFAAmF;YAEnF,MAAM,KAAK,kCAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,QAAA,CAAC;YAChD,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAE5C,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;mBAChG,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC;iBACrD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBACZ,CAAC,CAAC,IAAI,CAAC,KAAK;gBACZ,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC5C,gFAAgF;aACnF,CAAC;iBACD,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;gBACjB,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,oBAAoB;YACpB,MAAM,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC;iBAChF,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC3B,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;aACxC,CAAC,CAAC,CAAC;YAER,OAAO;gBACH,MAAM;gBACN,SAAS;gBACT,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ;gBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ;gBAC/B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE;gBACvD,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC/F,OAAO,EAAE,KAAK;aACjB,CAAC;;;;;;;;;KACL;CAEJ,CAAA;AAtCoB,mBAAmB;IADvC,iBAAiB;GACG,mBAAmB,CAsCvC;eAtCoB,mBAAmB"}

package/src/server/services/UserInfoProvider.ts

@@ -1,46 +0,0 @@
-import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import { IAuthCookie } from "@entity-access/server-pages/dist/services/TokenService.js";
-import USP from "@entity-access/server-pages/dist/services/UserSessionProvider.js";
-import SocialMailContext from "../model/SocialMailContext.js";
-import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
-
-@RegisterSingleton
-export default class UserSessionProvider extends USP {
-
-    async getUserSession({ userID, id: sessionID, expiry }: IAuthCookie) {
-
-        /** The new scope will not interfere with existing DbContext for current request */
-
-        using scope = ServiceProvider.createScope(this);
-        const db = scope.resolve(SocialMailContext);
-
-        const session = await db.loginSessions.where({ userID, sessionID }, (p) => (x) => x.userID === p.userID
-            && x.sessionID === p.sessionID && x.invalid === false)
-            .include((x) => [
-                x.user.roles,
-                x.user.fileAccessList.forEach((f) => f.file),
-                // x.user.groups.forEach((g) => g.group.fileAccessList.forEach((gf) => gf.file))
-            ])
-            .first();
-        if (!session?.user) {
-            return null;
-        }
-
-        // extend session...
-        await db.loginSessions.where({ sessionID }, (p) => (x)=> x.sessionID === p.sessionID)
-            .update(void 0, (p) => (x) => ({
-                expiry: Sql.date.addDays(x.expiry, 7)
-            }));
-
-        return {
-            userID,
-            sessionID,
-            userName: session.user.userName,
-            expiry: session.expiry.asJSDate,
-            roles: session.user.roles?.map((x) => x.roleName) ?? [],
-            fileAccessList: session.user.fileAccessList?.map(({ type, file: { path }}) => ({ type, path })),
-            invalid: false
-        };
-    }
-
-}