@entity-access/server-pages 1.1.548 → 1.1.551

package/dist/ServerPages.js

@@ -70,7 +70,7 @@ import { UrlParser } from "./core/UrlParser.js";
 import Http2IPCProxyReceiver from "./core/Http2IPCProxyReceiver.js";
 import { Readable } from "node:stream";
 import SecureContextService from "./ssl/SecureContextService.js";
-import AuthenticationService from "./services/AuthenticationService.js";
+import AuthorizationService from "./services/AuthorizationService.js";
 import TimeoutTracker from "./core/TimeoutTracker.js";
 import sleep from "./sleep.js";
 export const wsData = Symbol("wsData");
@@ -350,8 +350,8 @@ export default class ServerPages {
             const user = scope.resolve(SessionUser);
             user.resp = resp;
             user.ipAddress = req.remoteIPAddress;
-            const authService = scope.resolve(AuthenticationService);
-            user.authorize = () => authService.authorize(user, { ip: req.remoteIPAddress, cookies: req.cookies });
+            const authService = scope.resolve(AuthorizationService);
+            user.authorize = () => authService.authorizeRequest(user, { ip: req.remoteIPAddress, cookies: req.cookies });
             const acceptJson = req.accepts("json");
             const hostName = req.hostName;
             try {

package/dist/ServerPages.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServerPages.js","sourceRoot":"","sources":["../src/ServerPages.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServerPages.js","sourceRoot":"","sources":["../src/ServerPages.ts"],"names":[],"mappings":"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"}

package/dist/core/SessionUser.d.ts

@@ -1,6 +1,6 @@
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import TokenService, { IAuthCookie } from "../services/TokenService.js";
 import { WrappedResponse } from "./Wrapped.js";
+import { IAuthorizationCookie } from "../services/IAuthorizationCookie.js";
 export type roles = "Administrator" | "Contributor" | "Reader" | "Guest";
 /**
  * Remember to call `await sessionUser.authorize()` or
@@ -40,13 +40,12 @@ export declare class SessionUser {
     get isAdmin(): boolean;
     resp: WrappedResponse;
     private isAuthorized;
-    protected tokenService: TokenService;
     authorize(): Promise<void>;
     isInRole(role: roles): boolean;
     ensureLoggedIn(error?: () => EntityAccessError): void;
     ensureRole(role: roles, error?: () => EntityAccessError): void;
     ensureIsAdmin(error?: () => EntityAccessError): void;
-    setAuthCookie(authCookie: Omit<IAuthCookie, "sign">): Promise<void>;
+    setAuthCookie(authCookie: IAuthorizationCookie): Promise<void>;
     clearAuthCookie(): Promise<void>;
 }
 //# sourceMappingURL=SessionUser.d.ts.map

package/dist/core/SessionUser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionUser.d.ts","sourceRoot":"","sources":["../../src/core/SessionUser.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,OAAO,YAAY,EAAE,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAM/C,MAAM,MAAM,KAAK,GAAG,eAAe,GAAG,aAAa,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEzE;;;GAGG;AACH,qBACa,WAAW;IAEpB;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,GAAG,IAAI,CAE7B;IAED,IAAI,SAAS,CAAC,KAAK,EAAE,GAAG,EAEvB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,GAAG,IAAI,CAE1B;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,GAAG,EAEpB;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,EAEzB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,EAAE,CAEpB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,EAExB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,IAAI,CAEjB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAE9B;IAED;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,SAAS,EAAE,MAAM,CAAC;IAElB,IAAI,OAAO,YAEV;IAEM,IAAI,EAAE,eAAe,CAAC;IAE7B,OAAO,CAAC,YAAY,CAAS;IAG7B,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAExB,SAAS;IAItB,QAAQ,CAAC,IAAI,EAAE,KAAK;IAIpB,cAAc,CAAC,KAAK,GAAE,MAAM,iBAAiE;IAM7F,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,GAAE,MAAM,iBAA8D;IAOnG,aAAa,CAAC,KAAK,GAAE,MAAM,iBAAgE;IAIrF,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC;IAOnD,eAAe;CAMxB"}
+{"version":3,"file":"SessionUser.d.ts","sourceRoot":"","sources":["../../src/core/SessionUser.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAG/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAI3E,MAAM,MAAM,KAAK,GAAG,eAAe,GAAG,aAAa,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEzE;;;GAGG;AACH,qBACa,WAAW;IAEpB;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,GAAG,IAAI,CAE7B;IAED,IAAI,SAAS,CAAC,KAAK,EAAE,GAAG,EAEvB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,GAAG,IAAI,CAE1B;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,GAAG,EAEpB;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,EAEzB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,EAAE,CAEpB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,EAExB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,IAAI,CAEjB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAE9B;IAED;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,SAAS,EAAE,MAAM,CAAC;IAElB,IAAI,OAAO,YAEV;IAEM,IAAI,EAAE,eAAe,CAAC;IAE7B,OAAO,CAAC,YAAY,CAAS;IAEhB,SAAS;IAItB,QAAQ,CAAC,IAAI,EAAE,KAAK;IAIpB,cAAc,CAAC,KAAK,GAAE,MAAM,iBAAiE;IAM7F,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,GAAE,MAAM,iBAA8D;IAOnG,aAAa,CAAC,KAAK,GAAE,MAAM,iBAAgE;IAIrF,aAAa,CAAC,UAAU,EAAE,oBAAoB;IAO9C,eAAe;CAMxB"}

package/dist/core/SessionUser.js

@@ -4,15 +4,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import TokenService from "../services/TokenService.js";
 import { CacheProperty } from "./CacheProperty.js";
-import AuthenticationService from "../services/AuthenticationService.js";
+import AuthorizationService from "../services/AuthorizationService.js";
 const secure = (process.env["SOCIAL_MAIL_AUTH_COOKIE_SECURE"] ?? "true") === "true";
 /**
  * Remember to call `await sessionUser.authorize()` or
@@ -91,22 +87,18 @@ let SessionUser = class SessionUser {
         return this.ensureRole("Administrator", error);
     }
     async setAuthCookie(authCookie) {
-        const authService = ServiceProvider.resolve(this, AuthenticationService);
+        const authService = ServiceProvider.resolve(this, AuthorizationService);
         const cookie = await authService.setAuthCookie(this, authCookie);
         (cookie.options ??= {}).httpOnly = true;
         this.resp?.cookie(cookie.name, cookie.value, cookie.options);
     }
     async clearAuthCookie() {
-        const authService = ServiceProvider.resolve(this, AuthenticationService);
+        const authService = ServiceProvider.resolve(this, AuthorizationService);
         const cookie = await authService.setAuthCookie(this, null);
         (cookie.options ??= {}).httpOnly = true;
         this.resp?.cookie(cookie.name, cookie.value, cookie.options);
     }
 };
-__decorate([
-    Inject,
-    __metadata("design:type", TokenService)
-], SessionUser.prototype, "tokenService", void 0);
 SessionUser = __decorate([
     RegisterScoped
 ], SessionUser);

package/dist/core/SessionUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionUser.js","sourceRoot":"","sources":["../../src/core/SessionUser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SessionUser.js","sourceRoot":"","sources":["../../src/core/SessionUser.ts"],"names":[],"mappings":"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"}

package/dist/services/{AuthenticationService.d.ts → AuthorizationService.d.ts}

@@ -6,11 +6,17 @@ export interface ICookie {
     value: string;
     options?: SerializeOptions;
 }
-export default class AuthenticationService {
-    authorize(user: SessionUser, { ip, cookies }: {
+export default class AuthorizationService {
+    authCookieName: string;
+    keyProvider: any;
+    authorizeRequest(user: SessionUser, { ip, cookies }: {
         ip: string;
         cookies: Record<string, string>;
     }): Promise<void>;
+    loadUserSessionFromCookie(cookie: string, user: SessionUser): Promise<void>;
+    loadSession(sessionID: any, user: SessionUser): Promise<void>;
     setAuthCookie(user: SessionUser, authCookie: IAuthorizationCookie): Promise<ICookie>;
+    decode(cookie: string): Promise<number>;
+    encode(sessionID: any): Promise<string>;
 }
-//# sourceMappingURL=AuthenticationService.d.ts.map
+//# sourceMappingURL=AuthorizationService.d.ts.map

package/dist/services/AuthorizationService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AuthorizationService.d.ts","sourceRoot":"","sources":["../../src/services/AuthorizationService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAM/C,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,gBAAgB,CAAA;CAC7B;AAED,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAErC,cAAc,SAAU;IACxB,WAAW,EAAE,GAAG,CAAC;IAEX,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAC;IAQnG,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW;IAQ3D,WAAW,CAAC,SAAS,KAAA,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAapF,MAAM,CAAC,MAAM,EAAE,MAAM;IAYrB,MAAM,CAAC,SAAS,KAAA;CAMzB"}

package/dist/services/AuthorizationService.js

@@ -0,0 +1,65 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import KeyProvider from "./KeyProvider.js";
+import { privateDecrypt, publicEncrypt } from "node:crypto";
+const secure = (process.env["SOCIAL_MAIL_AUTH_COOKIE_SECURE"] ?? "true") === "true";
+let AuthorizationService = class AuthorizationService {
+    constructor() {
+        this.authCookieName = "ec-1";
+    }
+    async authorizeRequest(user, { ip, cookies }) {
+        const cookie = cookies[this.authCookieName];
+        if (!cookie) {
+            return;
+        }
+        await this.loadUserSessionFromCookie(cookie, user);
+    }
+    async loadUserSessionFromCookie(cookie, user) {
+        const sessionID = await this.decode(cookie);
+        user.sessionID = sessionID;
+        // load session... 
+        await this.loadSession(sessionID, user);
+        user.isAuthorized = true;
+    }
+    async loadSession(sessionID, user) {
+        user.userID = sessionID;
+    }
+    async setAuthCookie(user, authCookie) {
+        const maxAge = ((authCookie?.expiry ? DateTime.from(authCookie.expiry) : null) ?? DateTime.now.addDays(30)).diff(DateTime.now).totalMilliseconds;
+        const name = this.authCookieName;
+        const value = await this.encode(authCookie?.sessionID ?? authCookie?.userID ?? "0");
+        const options = {
+            secure,
+            httpOnly: true,
+            maxAge
+        };
+        return { name, value, options };
+    }
+    async decode(cookie) {
+        this.keyProvider ??= ServiceProvider.resolve(this, KeyProvider, true) ?? new KeyProvider();
+        const keys = await this.keyProvider.getKeys();
+        const [pk, value] = cookie.split(":");
+        for (const key of keys) {
+            if (key.publicKey == pk) {
+                return privateDecrypt(key.privateKey, value);
+            }
+        }
+        throw new Error("no suitable key found");
+    }
+    async encode(sessionID) {
+        this.keyProvider ??= ServiceProvider.resolve(this, KeyProvider, true) ?? new KeyProvider();
+        const [key] = await this.keyProvider.getKeys();
+        return key.publicKey + ":" + publicEncrypt(key.publicKey, sessionID.toString()).toString("base64url");
+    }
+};
+AuthorizationService = __decorate([
+    RegisterSingleton
+], AuthorizationService);
+export default AuthorizationService;
+//# sourceMappingURL=AuthorizationService.js.map

package/dist/services/AuthorizationService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AuthorizationService.js","sourceRoot":"","sources":["../../src/services/AuthorizationService.ts"],"names":[],"mappings":"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"}

package/dist/services/CookieService.d.ts

@@ -1,9 +1,2 @@
-import { SessionUser } from "../core/SessionUser.js";
-export default class CookieService {
-    private tokenService;
-    clearCache: (userID: any, broadcast?: boolean) => void;
-    createSessionUserFromCookie(cookie: string, ip: string): Promise<SessionUser>;
-    private getVerifiedUser;
-    private createUserInfo;
-}
+export {};
 //# sourceMappingURL=CookieService.d.ts.map

package/dist/services/CookieService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CookieService.d.ts","sourceRoot":"","sources":["../../src/services/CookieService.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAoDrD,MAAM,CAAC,OAAO,OAAO,aAAa;IAG9B,OAAO,CAAC,YAAY,CAAe;IAE5B,UAAU,6CAAc;IAEzB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IA+C5D,OAAO,CAAC,eAAe;YA6BT,cAAc;CAgB/B"}
+{"version":3,"file":"CookieService.d.ts","sourceRoot":"","sources":["../../src/services/CookieService.ts"],"names":[],"mappings":""}

package/dist/services/CookieService.js

@@ -1,155 +1,83 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import TokenService from "./TokenService.js";
-import TimedCache from "@entity-access/entity-access/dist/common/cache/TimedCache.js";
-import cluster from "cluster";
-import { SessionUser } from "../core/SessionUser.js";
-import UserSessionProvider from "./UserSessionProvider.js";
-/**
- * This will track userID,cookie pair so we can
- * clear the logged in user's file permissions
- */
-const userCookies = new Map();
-const sessionCache = new TimedCache();
-let cookieName = null;
-const tagForCache = Symbol("tagForCache");
-const cacheFR = new FinalizationRegistry((heldValue) => {
-    userCookies.delete(heldValue);
-});
-const clearCache = (userID, broadcast = true) => {
-    const cookie = userCookies.get(userID);
-    if (cookie) {
-        sessionCache.delete(cookie);
-    }
-    if (!broadcast) {
-        return;
-    }
-    const clearMessage = {
-        type: "cookie-service-clear-cache",
-        userID
-    };
-    if (cluster.isWorker) {
-        process.send(clearMessage);
-    }
-    else {
-        if (cluster.workers) {
-            for (const key in cluster.workers) {
-                if (Object.prototype.hasOwnProperty.call(cluster.workers, key)) {
-                    const element = cluster.workers[key];
-                    element.send(clearMessage);
-                }
-            }
-        }
-    }
-};
-process.on("message", (msg) => {
-    if (msg.type === "cookie-service-clear-cache") {
-        clearCache(msg.userID, false);
-    }
-});
-let CookieService = class CookieService {
-    constructor() {
-        this.clearCache = clearCache;
-    }
-    async createSessionUserFromCookie(cookie, ip) {
-        const user = ServiceProvider.resolve(this, SessionUser);
-        const ua = user;
-        ua.isAuthorized = true;
-        const value = null;
-        const userID = { value, enumerable: true, writable: true };
-        const sessionID = userID;
-        const userName = userID;
-        const expiry = userID;
-        Object.defineProperties(ua, {
-            authorize: {
-                value: () => null
-            },
-            sessionID,
-            userID,
-            userName,
-            expiry,
-            roles: {
-                value: [],
-                enumerable: true,
-                writable: true
-            }
-        });
-        try {
-            user.ipAddress = ip;
-            if (cookie) {
-                const userInfo = await this.getVerifiedUser(cookie);
-                if (userInfo?.sessionID) {
-                    user.sessionID = userInfo.sessionID;
-                }
-                if (userInfo?.userID) {
-                    user[tagForCache] = userInfo;
-                    for (const key in userInfo) {
-                        if (Object.prototype.hasOwnProperty.call(userInfo, key)) {
-                            const element = userInfo[key];
-                            user[key] = element;
-                        }
-                    }
-                }
-            }
-            return user;
-        }
-        catch (error) {
-            console.error(error);
-            return user;
-        }
-    }
-    getVerifiedUser(cookie) {
-        return sessionCache.getOrCreateAsync(cookie, async (k) => {
-            const parsedCookie = JSON.parse(cookie);
-            if (!parsedCookie.id) {
-                return {};
-            }
-            if (typeof parsedCookie.expiry === "string") {
-                parsedCookie.expiry = new Date(parsedCookie.expiry);
-            }
-            if (!await this.tokenService.verifyContent(parsedCookie, false)) {
-                console.warn(`Cookie Verification failed for ${parsedCookie.id}: ${parsedCookie.userID}`);
-                return {};
-            }
-            if (!parsedCookie.active) {
-                return {
-                    sessionID: parsedCookie.id
-                };
-            }
-            const r = await this.createUserInfo(cookie, parsedCookie);
-            return r;
-        });
-    }
-    async createUserInfo(cookie, parsedCookie) {
-        const usp = ServiceProvider.resolve(this, UserSessionProvider, true) ?? new UserSessionProvider();
-        const r = await usp.getUserSession(parsedCookie);
-        if (r === null) {
-            console.warn(`Failed to get userSession for ${parsedCookie.id}: ${parsedCookie.userID}`);
-            return {};
-        }
-        if (r.expiry.getTime() < Date.now() || r.invalid) {
-            console.warn(`Session expired for ${parsedCookie.id}: ${parsedCookie.userID}`);
-            return {};
-        }
-        cacheFR.register(r, r.userID);
-        userCookies.set(r.userID, cookie);
-        return r;
-    }
-};
-__decorate([
-    Inject,
-    __metadata("design:type", TokenService)
-], CookieService.prototype, "tokenService", void 0);
-CookieService = __decorate([
-    RegisterScoped
-], CookieService);
-export default CookieService;
+// import Inject, { RegisterScoped, RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+// import TokenService, { IAuthCookie } from "./TokenService.js";
+// import TimedCache from "@entity-access/entity-access/dist/common/cache/TimedCache.js";
+// import { BaseDriver } from "@entity-access/entity-access/dist/drivers/base/BaseDriver.js";
+// import cluster from "cluster";
+// import { SessionUser } from "../core/SessionUser.js";
+// import UserSessionProvider from "./UserSessionProvider.js";
+// import { WrappedResponse } from "../core/Wrapped.js";
+export {};
+// let cookieName = null;
+// @RegisterScoped
+// export default class CookieService {
+//     @Inject
+//     private tokenService: TokenService;
+//     async createSessionUserFromCookie(cookie: string, ip: string) {
+//         const user = ServiceProvider.resolve(this, SessionUser);
+//         const ua = user as any;
+//         ua.isAuthorized = true;
+//         const value = null;
+//         const userID = { value, enumerable: true, writable: true};
+//         const sessionID = userID;
+//         const userName = userID;
+//         const expiry = userID;
+//         Object.defineProperties(ua, {
+//             authorize: {
+//                 value: () => null
+//             },
+//             sessionID,
+//             userID,
+//             userName,
+//             expiry,
+//             roles: {
+//                 value: [],
+//                 enumerable: true,
+//                 writable: true
+//             }
+//         });
+//         try {
+//             user.ipAddress = ip;
+//             if (cookie) {
+//                 const userInfo = await this.getVerifiedUser(cookie);
+//                 if (userInfo?.sessionID) {
+//                     (user as any).sessionID = userInfo.sessionID;
+//                 }
+//                 if (userInfo?.userID) {
+//                     for (const key in userInfo) {
+//                         if (Object.prototype.hasOwnProperty.call(userInfo, key)) {
+//                             const element = userInfo[key];
+//                             user[key] = element;
+//                         }
+//                     }
+//                 }
+//             }
+//             return user;
+//         } catch (error) {
+//             console.error(error);
+//             return user;
+//         }
+//     }
+//     private getVerifiedUser(cookie: string): Promise<Partial<SessionUser>> {
+//         return sessionCache.getOrCreateAsync(cookie, async (k) => {
+//             const parsedCookie = await this.tokenService.decryptContent(cookie);
+//             const r = await this.createUserInfo(cookie, parsedCookie);
+//             return r;
+//         });
+//     }
+//     private async createUserInfo(cookie: string, parsedCookie: IAuthCookie) {
+//         const usp = ServiceProvider.resolve(this, UserSessionProvider, true) ?? new UserSessionProvider();
+//         const r = await usp.getUserSession(parsedCookie);
+//         if (r === null) {
+//             console.warn(`Failed to get userSession for ${parsedCookie.id}: ${parsedCookie.userID}`);
+//             return {};
+//         }
+//         if (r.expiry.getTime() < Date.now() || r.invalid) {
+//             console.warn(`Session expired for ${parsedCookie.id}: ${parsedCookie.userID}`);
+//             return {};
+//         }
+//         cacheFR.register(r, r.userID);
+//         userCookies.set(r.userID, cookie);
+//         return r;
+//     }
+// }
 //# sourceMappingURL=CookieService.js.map

package/dist/services/CookieService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CookieService.js","sourceRoot":"","sources":["../../src/services/CookieService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CookieService.js","sourceRoot":"","sources":["../../src/services/CookieService.ts"],"names":[],"mappings":"AAAA,2HAA2H;AAC3H,iEAAiE;AACjE,yFAAyF;AACzF,6FAA6F;AAC7F,iCAAiC;AACjC,wDAAwD;AACxD,8DAA8D;AAC9D,wDAAwD;;AAExD,yBAAyB;AAEzB,kBAAkB;AAClB,uCAAuC;AAEvC,cAAc;AACd,0CAA0C;AAE1C,sEAAsE;AACtE,mEAAmE;AACnE,kCAAkC;AAClC,kCAAkC;AAClC,8BAA8B;AAC9B,qEAAqE;AACrE,oCAAoC;AACpC,mCAAmC;AACnC,iCAAiC;AACjC,wCAAwC;AACxC,2BAA2B;AAC3B,oCAAoC;AACpC,iBAAiB;AACjB,yBAAyB;AACzB,sBAAsB;AACtB,wBAAwB;AACxB,sBAAsB;AACtB,uBAAuB;AACvB,6BAA6B;AAC7B,oCAAoC;AACpC,iCAAiC;AACjC,gBAAgB;AAChB,cAAc;AACd,gBAAgB;AAChB,mCAAmC;AACnC,4BAA4B;AAC5B,uEAAuE;AACvE,6CAA6C;AAC7C,oEAAoE;AACpE,oBAAoB;AACpB,0CAA0C;AAC1C,oDAAoD;AACpD,qFAAqF;AACrF,6DAA6D;AAC7D,mDAAmD;AACnD,4BAA4B;AAC5B,wBAAwB;AACxB,oBAAoB;AACpB,gBAAgB;AAChB,2BAA2B;AAC3B,4BAA4B;AAC5B,oCAAoC;AACpC,2BAA2B;AAC3B,YAAY;AACZ,QAAQ;AAER,+EAA+E;AAE/E,sEAAsE;AACtE,mFAAmF;AACnF,yEAAyE;AACzE,wBAAwB;AACxB,cAAc;AACd,QAAQ;AAER,gFAAgF;AAChF,6GAA6G;AAC7G,4DAA4D;AAC5D,4BAA4B;AAC5B,wGAAwG;AACxG,yBAAyB;AACzB,YAAY;AACZ,8DAA8D;AAC9D,8FAA8F;AAC9F,yBAAyB;AACzB,YAAY;AACZ,yCAAyC;AACzC,6CAA6C;AAC7C,oBAAoB;AACpB,QAAQ;AAER,IAAI"}

package/dist/services/IAuthKey.d.ts

@@ -0,0 +1,7 @@
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+export interface IAuthKey {
+    publicKey: string;
+    privateKey: string;
+    expires: DateTime;
+}
+//# sourceMappingURL=IAuthKey.d.ts.map

package/dist/services/IAuthKey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"IAuthKey.d.ts","sourceRoot":"","sources":["../../src/services/IAuthKey.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,MAAM,WAAW,QAAQ;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,QAAQ,CAAA;CACpB"}

package/dist/services/IAuthKey.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=IAuthKey.js.map

package/dist/services/IAuthKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IAuthKey.js","sourceRoot":"","sources":["../../src/services/IAuthKey.ts"],"names":[],"mappings":""}

package/dist/services/IAuthorizationCookie.d.ts

@@ -1,8 +1,6 @@
 export interface IAuthorizationCookie {
-    id: number;
-    userID: number;
+    sessionID: number;
+    userID: any;
     expiry: Date;
-    version: string;
-    active?: boolean;
 }
 //# sourceMappingURL=IAuthorizationCookie.d.ts.map

package/dist/services/IAuthorizationCookie.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IAuthorizationCookie.d.ts","sourceRoot":"","sources":["../../src/services/IAuthorizationCookie.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,IAAI,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB"}
+{"version":3,"file":"IAuthorizationCookie.d.ts","sourceRoot":"","sources":["../../src/services/IAuthorizationCookie.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,IAAI,CAAC;CAChB"}

package/dist/socket/SocketService.d.ts

@@ -1,6 +1,5 @@
 import { Server } from "socket.io";
 export default abstract class SocketService {
-    private tokenService;
     protected server: Server;
     constructor();
     protected init(): Promise<void>;

package/dist/socket/SocketService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SocketService.d.ts","sourceRoot":"","sources":["../../src/socket/SocketService.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,MAAM,EAAU,MAAM,WAAW,CAAC;AAQ3C,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,aAAa;IAGvC,OAAO,CAAC,YAAY,CAAe;IAEnC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;;cAMT,IAAI;YAIN,MAAM;IA0BpB,OAAO,CAAC,eAAe;CA+C1B"}
+{"version":3,"file":"SocketService.d.ts","sourceRoot":"","sources":["../../src/socket/SocketService.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAU,MAAM,WAAW,CAAC;AAM3C,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,aAAa;IAEvC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;;cAMT,IAAI;YAIN,MAAM;IA0BpB,OAAO,CAAC,eAAe;CA+C1B"}